Merge branch 'main' into copilot/fix-3045

Author: lalitb

Cargo.toml

@@ -45,11 +45,11 @@ tonic = { version = "0.13", default-features = false }
 tonic-build = "0.13"
 tokio = { version = "1", default-features = false }
 tokio-stream = "0.1"
-# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros, 
+# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
 # required for OpenTelemetry's internal logging macros.
 tracing = { version = ">=0.1.40", default-features = false }
 # `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
-tracing-core = { version = ">=0.1.33", default-features = false } 
+tracing-core = { version = ">=0.1.33", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false }
 url = { version = "2.5", default-features = false }
 anyhow = "1.0.94"
@@ -59,7 +59,7 @@ ctor = "0.2.9"
 ctrlc = "3.2.5"
 futures-channel = "0.3"
 futures-sink = "0.3"
-hex = "0.4.3"
+const-hex = "1.14.1"
 lazy_static = "1.4.0"
 num-format = "0.4.4"
 num_cpus = "1.15.0"

README.md

@@ -192,17 +192,17 @@ For more information about the maintainer role, see the [community repository](h
 
 * [Anton Grübel](https://github.com/gruebel), Baz
 * [Björn Antonsson](https://github.com/bantonsson), Datadog
-* [Shaun Cox](https://github.com/shaun-cox), Microsoft
 * [Scott Gerring](https://github.com/scottgerring), Datadog
+* [Shaun Cox](https://github.com/shaun-cox), Microsoft
 
 For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
 ### Emeritus
 
 * [Dirkjan Ochtman](https://github.com/djc)
+* [Isobel Redelmeier](https://github.com/iredelmeier)
 * [Jan Kühle](https://github.com/frigus02)
 * [Julian Tescher](https://github.com/jtescher)
-* [Isobel Redelmeier](https://github.com/iredelmeier)
 * [Mike Goldsmith](https://github.com/MikeGoldsmith)
 
 For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).

opentelemetry-http/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## vNext
 
 - Implementation of `Extractor::get_all` for `HeaderExtractor`
+- Support `HttpClient` implementation for `HyperClient<C>` with custom connectors beyond `HttpConnector`, enabling Unix Domain Socket connections and other custom transports
 
 ## 0.30.0
 

opentelemetry-http/src/lib.rs

@@ -179,7 +179,11 @@ pub mod hyper {
     }
 
     #[async_trait]
-    impl HttpClient for HyperClient {
+    impl<C> HttpClient for HyperClient<C>
+    where
+        C: Connect + Clone + Send + Sync + 'static,
+        HyperClient<C>: Debug,
+    {
         async fn send_bytes(&self, request: Request<Bytes>) -> Result<Response<Bytes>, HttpError> {
             otel_debug!(name: "HyperClient.Send");
             let (parts, body) = request.into_parts();

opentelemetry-proto/Cargo.toml

@@ -48,15 +48,15 @@ testing = ["opentelemetry/testing"]
 # add ons
 internal-logs = ["opentelemetry/internal-logs"]
 with-schemars = ["schemars"]
-with-serde = ["serde", "hex", "base64"]
+with-serde = ["serde", "const-hex", "base64"]
 
 [dependencies]
 tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
 prost = { workspace = true, optional = true }
 opentelemetry = { version = "0.30", default-features = false, path = "../opentelemetry" }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true, features = ["serde_derive", "std"] }
-hex = { workspace = true, optional = true }
+const-hex = { workspace = true, optional = true }
 base64 = { workspace = true, optional = true }
 
 [dev-dependencies]

opentelemetry-proto/src/proto.rs

@@ -16,7 +16,7 @@ pub(crate) mod serializers {
     where
         S: Serializer,
     {
-        let hex_string = hex::encode(bytes);
+        let hex_string = const_hex::encode(bytes);
         serializer.serialize_str(&hex_string)
     }
 
@@ -37,7 +37,7 @@ pub(crate) mod serializers {
             where
                 E: de::Error,
             {
-                hex::decode(value).map_err(E::custom)
+                const_hex::decode(value).map_err(E::custom)
             }
         }
 

opentelemetry-proto/tests/json_serde.rs

@@ -61,10 +61,11 @@ mod json_serde {
                                 dropped_attributes_count: 0,
                             }),
                             spans: vec![Span {
-                                trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
-                                span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
+                                trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
+                                    .unwrap(),
+                                span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
                                 trace_state: String::new(),
-                                parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
+                                parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
                                 flags: 0,
                                 name: String::from("I'm a server span"),
                                 kind: 2,
@@ -267,10 +268,11 @@ mod json_serde {
                                 dropped_attributes_count: 1,
                             }),
                             spans: vec![Span {
-                                trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
-                                span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
+                                trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
+                                    .unwrap(),
+                                span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
                                 trace_state: String::from("browser=firefox,os=linux"),
-                                parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
+                                parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
                                 flags: 1,
                                 name: String::from("I'm a server span"),
                                 kind: 2,
@@ -308,9 +310,9 @@ mod json_serde {
                                 }],
                                 dropped_events_count: 1,
                                 links: vec![Link {
-                                    trace_id: hex::decode("5b8efff798038103d269b633813fc60b")
+                                    trace_id: const_hex::decode("5b8efff798038103d269b633813fc60b")
                                         .unwrap(),
-                                    span_id: hex::decode("eee19b7ec3c1b172").unwrap(),
+                                    span_id: const_hex::decode("eee19b7ec3c1b172").unwrap(),
                                     trace_state: String::from("food=pizza,color=red"),
                                     attributes: vec![KeyValue {
                                         key: String::from("my.link.attr"),
@@ -1272,8 +1274,9 @@ mod json_serde {
                                 ],
                                 dropped_attributes_count: 0,
                                 flags: 0,
-                                trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
-                                span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
+                                trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
+                                    .unwrap(),
+                                span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
                             }],
                             schema_url: String::new(),
                         }],