update salvo version

Author: chrislearn

Cargo.toml

@@ -14,41 +14,43 @@ Salvo is a powerful and simple Rust web server framework.
 
 [workspace.dependencies]
 anyhow = "1"
-rbatis = "4.3"
-rbdc = "4.3"
-rbdc-mysql = "4.3"
-rbs = "4.3"
+rbatis = "4.5"
+rbdc = "4.5"
+rbdc-mysql = "4.5"
+rbs = "4.5"
 async-std = "1.12"
 async-trait = "0.1"
-sea-orm = "0.12"
-sea-orm-migration = "0.12"
+sea-orm = "1"
+sea-orm-migration = "1"
 eyre = "0.6"
 tera = "1.3"
 futures = "0.3"
-opentelemetry = "0.24.0"
-opentelemetry-http = "0.13.0"
-opentelemetry-otlp = "0.17.0"
-opentelemetry-prometheus = "0.16.0"
-opentelemetry_sdk = "0.24.0"
-utoipa = "4.1.0"
-utoipa-swagger-ui = "*"
+
+opentelemetry = "0.27.0"
+opentelemetry-http = "0.27.0"
+opentelemetry-otlp = "0.27.0"
+opentelemetry-prometheus = "0.17.0"
+opentelemetry_sdk = "0.27.0"
+opentelemetry-semantic-conventions = "0.27.0"
+tracing-opentelemetry = "0.28.0"
+
 tokio-stream = "0.1.14"
 async-stream = "0.3.5"
 futures-util = { version = "0.3", default-features = true }
 jsonwebtoken = "9"
-once_cell = "1"
 parking_lot = "0.12"
 reqwest = "0.12"
-salvo = { version = "0.72.0", git="https://github.com/salvo-rs/salvo.git", default-features = true }
+salvo = { version = "0.74.2", git = "https://github.com/salvo-rs/salvo.git", branch="main", default-features = true }
 serde = "1"
 serde_json = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = "1"
-tracing-subscriber = { version = "0.3" }
 tracing = "0.1"
+tracing-appender = "0.2"
+tracing-subscriber = "0.3"
 tracing-test = "0.2.1"
 url = "2"
 chrono = "0.4"
-sqlx = "0.7"
+sqlx = "0.8"
 rust-embed = "8"
 time = "0.3"

codes/acme-http01-quinn/src/main.rs

@@ -14,7 +14,7 @@ async fn main() {
         .acme()
         .cache_path("temp/letsencrypt")
         .add_domain("test.salvo.rs")
-        .http01_challege(&mut router)
+        .http01_challenge(&mut router)
         .quinn("0.0.0.0:443");
     let acceptor = listener.join(TcpListener::new("0.0.0.0:80")).bind().await;
     Server::new(acceptor).serve(router).await;

codes/acme-http01/src/main.rs

@@ -15,7 +15,7 @@ async fn main() {
         // .directory("letsencrypt", salvo::conn::acme::LETS_ENCRYPT_STAGING)
         .cache_path("/temp/letsencrypt")
         .add_domain("test.salvo.rs")
-        .http01_challege(&mut router);
+        .http01_challenge(&mut router);
     let acceptor = listener.join(TcpListener::new("0.0.0.0:80")).bind().await;
     Server::new(acceptor).serve(router).await;
 }

codes/otel-jaeger/Cargo.toml

@@ -21,11 +21,10 @@ salvo = { workspace = true, features = ["affix-state", "otel"] }
 tokio = { workspace = true, features = ["macros"] }
 tracing.workspace = true
 tracing-subscriber.workspace = true
-opentelemetry = { workspace = true, features = ["metrics"] }
+opentelemetry = { workspace = true, features = ["metrics"]  }
 reqwest = { workspace = true }
 prometheus = "0.13"
 opentelemetry-prometheus.workspace = true
 opentelemetry-http.workspace = true
 opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] }
-opentelemetry-otlp = { workspace = true, features = ["http-proto", "trace", "reqwest"] }
- 
+opentelemetry-otlp = { workspace = true, features = ["http-proto", "trace", "reqwest"] }

codes/otel-jaeger/src/client.rs

@@ -8,19 +8,20 @@ use opentelemetry::{
 use opentelemetry_http::HeaderInjector;
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::propagation::TraceContextPropagator;
+use opentelemetry_sdk::runtime;
+use opentelemetry_sdk::trace::TracerProvider;
 use reqwest::{Client, Method, Url};
 
 fn init_tracer() {
     global::set_text_map_propagator(TraceContextPropagator::new());
-    let provider = opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_exporter(
-            opentelemetry_otlp::new_exporter()
-                .http()
-                .with_endpoint("http://localhost:14268/api/traces"),
-        )
-        .install_batch(opentelemetry_sdk::runtime::Tokio)
-        .unwrap();
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .with_endpoint("http://localhost:14268/api/traces")
+        .build()
+        .expect("failed to create exporter");
+    let provider = TracerProvider::builder()
+        .with_batch_exporter(exporter, runtime::Tokio)
+        .build();
     let _ = global::set_tracer_provider(provider);
 }
 

codes/otel-jaeger/src/exporter.rs

@@ -23,8 +23,8 @@ impl Exporter {
         let mut body = Vec::new();
         match encoder.encode(&metric_families, &mut body) {
             Ok(()) => {
-                res.add_header(header::CONTENT_TYPE, "text/javascript; charset=utf-8", true)
-                    .ok();
+                let _ =
+                    res.add_header(header::CONTENT_TYPE, "text/javascript; charset=utf-8", true);
                 res.body(body);
             }
             Err(_) => {

codes/otel-jaeger/src/server1.rs

@@ -6,8 +6,9 @@ use opentelemetry::trace::{
 };
 use opentelemetry::{global, KeyValue};
 use opentelemetry_http::HeaderInjector;
+use opentelemetry_sdk::propagation::TraceContextPropagator;
 use opentelemetry_sdk::trace::{Tracer, TracerProvider};
-use opentelemetry_sdk::{propagation::TraceContextPropagator, Resource};
+use opentelemetry_sdk::{runtime, Resource};
 use reqwest::{Client, Method, Url};
 use salvo::otel::{Metrics, Tracing};
 use salvo::prelude::*;
@@ -17,14 +18,18 @@ use exporter::Exporter;
 
 fn init_tracer_provider() -> TracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
-    opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
-            Resource::new(vec![KeyValue::new("service.name", "server1")]),
-        ))
-        .with_exporter(opentelemetry_otlp::new_exporter().tonic())
-        .install_batch(opentelemetry_sdk::runtime::Tokio)
-        .unwrap()
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .build()
+        .expect("failed to create exporter");
+    TracerProvider::builder()
+        .with_batch_exporter(exporter, runtime::Tokio)
+        .with_config(
+            opentelemetry_sdk::trace::Config::default().with_resource(Resource::new(vec![
+                KeyValue::new("service.name", "server1"),
+            ])),
+        )
+        .build()
 }
 
 #[handler]

codes/otel-jaeger/src/server2.rs

@@ -1,5 +1,7 @@
 use opentelemetry::{global, trace::TracerProvider as _, KeyValue};
-use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::TracerProvider, Resource};
+use opentelemetry_sdk::{
+    propagation::TraceContextPropagator, runtime, trace::TracerProvider, Resource,
+};
 use salvo::otel::{Metrics, Tracing};
 use salvo::prelude::*;
 
@@ -8,14 +10,18 @@ use exporter::Exporter;
 
 fn init_tracer_provider() -> TracerProvider {
     global::set_text_map_propagator(TraceContextPropagator::new());
-    opentelemetry_otlp::new_pipeline()
-        .tracing()
-        .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
-            Resource::new(vec![KeyValue::new("service.name", "server2")]),
-        ))
-        .with_exporter(opentelemetry_otlp::new_exporter().tonic())
-        .install_batch(opentelemetry_sdk::runtime::Tokio)
-        .unwrap()
+    let exporter = opentelemetry_otlp::SpanExporter::builder()
+        .with_tonic()
+        .build()
+        .expect("failed to create exporter");
+    opentelemetry_sdk::trace::TracerProvider::builder()
+        .with_config(
+            opentelemetry_sdk::trace::Config::default().with_resource(Resource::new(vec![
+                KeyValue::new("service.name", "server2"),
+            ])),
+        )
+        .with_batch_exporter(exporter, runtime::Tokio)
+        .build()
 }
 
 #[handler]

codes/webtransport-acme-http01/src/main.rs

@@ -127,7 +127,7 @@ async fn main() {
         .acme()
         .cache_path("temp/letsencrypt")
         .add_domain("test.salvo.rs")
-        .http01_challege(&mut router)
+        .http01_challenge(&mut router)
         .quinn("0.0.0.0:443");
     let acceptor = listener.join(TcpListener::new("0.0.0.0:80")).bind().await;
     Server::new(acceptor).serve(router).await;