Update to http 1.0 (#35)

Updates to [http 1](https://docs.rs/http/1.1.0).

Author: akrantz01

Cargo.toml

@@ -14,13 +14,13 @@ publish = ["wafflehacks"]
 async-graphql = { version = "7", default-features = false, optional = true }
 async-trait = { version = "0.1", optional = true }
 eyre = "0.6"
-http = { version = "0.2", optional = true }
+http = { version = "1", optional = true }
 opentelemetry = { version = "0.22", features = ["trace"], optional = true }
 opentelemetry-http = { version = "0.11", optional = true }
 opentelemetry-otlp = { version = "0.15", default-features = false, features = ["grpc-tonic", "http-proto", "reqwest-client", "reqwest-rustls", "tls", "tls-roots", "trace"], optional = true }
 opentelemetry_sdk = { version = "0.22", features = ["rt-tokio"], optional = true }
 tower = { version = "0.4", default-features = false, optional = true }
-tower-http = { version = "0.4", default-features = false, features = ["trace"], optional = true }
+tower-http = { version = "0.5", default-features = false, features = ["trace"], optional = true }
 tracing = "0.1"
 tracing-error = "0.2"
 tracing-opentelemetry = { version = "0.23", default-features = false, features = ["tracing-log"], optional = true }

src/http.rs

@@ -39,7 +39,6 @@ impl<B> trace::MakeSpan<B> for MakeSpan {
         #[cfg(feature = "opentelemetry")]
         {
             use opentelemetry::propagation::TextMapPropagator;
-            use opentelemetry_http::HeaderExtractor;
             use opentelemetry_sdk::propagation::{BaggagePropagator, TraceContextPropagator};
             use tracing_opentelemetry::OpenTelemetrySpanExt;
 
@@ -130,3 +129,22 @@ fn record_headers(direction: &'static str, headers: &HeaderMap, span: &Span) {
         span.record(format!("http.{direction}.header.{header}").as_str(), value);
     }
 }
+
+/// Re-implementation of [`opentelemetry_http::HeaderExtractor`] pending
+/// <https://github.com/open-telemetry/opentelemetry-rust/issues/1427>
+#[cfg(feature = "opentelemetry")]
+struct HeaderExtractor<'a>(pub &'a HeaderMap);
+
+#[cfg(feature = "opentelemetry")]
+impl<'a> opentelemetry::propagation::Extractor for HeaderExtractor<'a> {
+    fn get(&self, key: &str) -> Option<&str> {
+        self.0.get(key).and_then(|value| value.to_str().ok())
+    }
+
+    fn keys(&self) -> Vec<&str> {
+        self.0
+            .keys()
+            .map(|value| value.as_str())
+            .collect::<Vec<_>>()
+    }
+}