Merge remote-tracking branch 'origin/master' into implicit-wasm-feature

Author: hanabi1224

Cargo.lock

@@ -76,11 +76,11 @@ edition = "2021"
 [workspace.dependencies]
 libp2p = { version = "0.57.0", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.6.0", path = "misc/allow-block-list" }
-libp2p-autonat = { version = "0.15.0", path = "protocols/autonat" }
+libp2p-autonat = { version = "0.16.0", path = "protocols/autonat" }
 libp2p-connection-limits = { version = "0.6.0", path = "misc/connection-limits" }
 libp2p-core = { version = "0.43.2", path = "core" }
 libp2p-dcutr = { version = "0.14.1", path = "protocols/dcutr" }
-libp2p-dns = { version = "0.44.0", path = "transports/dns" }
+libp2p-dns = { version = "0.45.0", path = "transports/dns" }
 libp2p-floodsub = { version = "0.47.0", path = "protocols/floodsub" }
 libp2p-gossipsub = { version = "0.50.0", path = "protocols/gossipsub" }
 libp2p-identify = { version = "0.47.0", path = "protocols/identify" }
@@ -98,8 +98,8 @@ libp2p-plaintext = { version = "0.43.0", path = "transports/plaintext" }
 libp2p-pnet = { version = "0.26.0", path = "transports/pnet" }
 libp2p-quic = { version = "0.13.0", path = "transports/quic" }
 libp2p-relay = { version = "0.21.1", path = "protocols/relay" }
-libp2p-rendezvous = { version = "0.17.0", path = "protocols/rendezvous" }
-libp2p-request-response = { version = "0.29.0", path = "protocols/request-response" }
+libp2p-rendezvous = { version = "0.18.0", path = "protocols/rendezvous" }
+libp2p-request-response = { version = "0.30.0", path = "protocols/request-response" }
 libp2p-server = { version = "0.12.7", path = "misc/server" }
 libp2p-stream = { version = "0.4.0-alpha", path = "protocols/stream" }
 libp2p-swarm = { version = "0.48.0", path = "swarm" }
@@ -125,7 +125,7 @@ futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 futures-timer = { version = "3" }
 getrandom = { version = "0.2", features = ["js"] }
-hashlink = "0.10.0"
+hashlink = "0.11.0"
 hickory-proto = { version = "0.25.2", default-features = false }
 hickory-resolver = { version = "0.25.2", default-features = false }
 if-watch = "3.2.1"
@@ -139,7 +139,7 @@ rcgen = "0.13"
 ring = "0.17.12"
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
 thiserror = "2"
-tokio = { version = "1.38", default-features = false }
+tokio = { version = "1.50", default-features = false }
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 unsigned-varint = { version = "0.8.0" }

Cargo.toml

@@ -78,6 +78,7 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 
 (In alphabetical order.)
 
+- Elena Frank ([@elenaf9](https://github.com/elenaf9))
 - João Oliveira ([@jxs](https://github.com/jxs))
 
 ## Notable users

README.md

@@ -17,20 +17,22 @@ name = "autonatv2_server"
 [dependencies]
 libp2p = { workspace = true, features = ["macros", "tokio", "tcp", "noise", "yamux", "autonat", "identify", "dns", "quic"] }
 clap = { version = "4.4.18", features = ["derive"] }
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.50.0", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.40"
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 rand = "0.8.5"
-opentelemetry_sdk = { version = "0.21.1", optional = true, features = ["rt-tokio"] }
-tracing-opentelemetry = { version = "0.22.0", optional = true }
-opentelemetry-jaeger = { version = "0.20.0", optional = true, features = ["rt-tokio"] }
+opentelemetry = { version = "0.27.0", optional = true }
+opentelemetry_sdk = { version = "0.27.0", optional = true, features = ["rt-tokio"] }
+opentelemetry-otlp = { version = "0.27.0", optional = true }
+tracing-opentelemetry = { version = "0.28.0", optional = true }
 cfg-if = "1.0.0"
 
 [features]
-jaeger = ["opentelemetry_sdk", "tracing-opentelemetry", "opentelemetry-jaeger"]
+jaeger = ["opentelemetry", "opentelemetry_sdk", "opentelemetry-otlp", "tracing-opentelemetry"]
+opentelemetry = ["dep:opentelemetry"]
 opentelemetry_sdk = ["dep:opentelemetry_sdk"]
+opentelemetry-otlp = ["dep:opentelemetry-otlp"]
 tracing-opentelemetry = ["dep:tracing-opentelemetry"]
-opentelemetry-jaeger = ["dep:opentelemetry-jaeger"]
 
 [lints]
 workspace = true

examples/autonatv2/Cargo.toml

@@ -1,16 +1,18 @@
-version: '3'
-
 services:
     autonatv2:
         build:
             context: ../..
             dockerfile: examples/autonatv2/Dockerfile
+        environment:
+            - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4317
         ports:
-            - 4884:4884
+            - "4884:4884"
+        depends_on:
+            - jaeger
     jaeger:
         image: jaegertracing/all-in-one
+        environment:
+            - COLLECTOR_OTLP_ENABLED=true
         ports:
-            - 6831:6831/udp
-            - 6832:6832/udp
-            - 16686:16686
-            - 14268:14268
+            - "4317:4317"
+            - "16686:16686"

examples/autonatv2/docker-compose.yml

@@ -24,13 +24,24 @@ struct Opt {
 async fn main() -> Result<(), Box<dyn Error>> {
     cfg_if! {
         if #[cfg(feature = "jaeger")] {
+            use opentelemetry::trace::TracerProvider as _;
+            use opentelemetry::KeyValue;
+            use opentelemetry_otlp::SpanExporter;
+            use opentelemetry_sdk::{runtime, trace::TracerProvider};
             use tracing_subscriber::layer::SubscriberExt;
-            use opentelemetry_sdk::runtime::Tokio;
-            let tracer = opentelemetry_jaeger::new_agent_pipeline()
-                .with_endpoint("jaeger:6831")
-                .with_service_name("autonatv2")
-                .install_batch(Tokio)?;
-            let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
+
+            let provider = TracerProvider::builder()
+                .with_batch_exporter(
+                    SpanExporter::builder().with_tonic().build()?,
+                    runtime::Tokio,
+                )
+                .with_resource(opentelemetry_sdk::Resource::new(vec![KeyValue::new(
+                    "service.name",
+                    "autonatv2",
+                )]))
+                .build();
+            let telemetry = tracing_opentelemetry::layer()
+                .with_tracer(provider.tracer("autonatv2"));
             let subscriber = tracing_subscriber::Registry::default()
                 .with(telemetry);
         } else {

examples/autonatv2/src/bin/autonatv2_server.rs

@@ -16,7 +16,7 @@ release = false
 crate-type = ["cdylib"]
 
 [dependencies]
-anyhow = "1.0.86"
+anyhow = "1.0.102"
 futures = { workspace = true }
 rand = "0.8"
 tracing = { workspace = true }
@@ -26,7 +26,7 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
 axum = "0.7.5"
 libp2p = { path = "../../libp2p", features = [ "ed25519", "macros", "ping", "tokio"] }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
-rust-embed = { version = "8.4.0", features = ["include-exclude", "interpolate-folder-path"] }
+rust-embed = { version = "8.11.0", features = ["include-exclude", "interpolate-folder-path"] }
 tokio = { workspace = true, features = ["macros", "net", "rt", "signal"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tower = "0.4"

examples/browser-webrtc/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT"
 release = false
 
 [dependencies]
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { version = "1.50.0", features = ["full"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["identify", "noise", "tcp", "tokio", "yamux"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }

examples/identify/Cargo.toml

@@ -12,7 +12,7 @@ release = false
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 clap = { version = "4.5.6", features = ["derive"] }
 futures = { workspace = true }
-anyhow = "1.0.86"
+anyhow = "1.0.102"
 libp2p = { path = "../../libp2p", features = [ "tokio", "dns", "kad", "noise", "tcp", "yamux", "rsa"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 

examples/ipfs-kad/Cargo.toml

@@ -10,7 +10,7 @@ release = false
 
 [dependencies]
 clap = { version = "4.5.6", features = ["derive"] }
-tokio = { version = "1.37.0", features = ["full"] }
+tokio = { version = "1.50.0", features = ["full"] }
 futures = { workspace = true }
 libp2p = { path = "../../libp2p", features = ["tokio", "noise", "macros", "ping", "tcp", "identify", "yamux", "relay", "quic"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }