Merge pull request #89 from Dzejkop/feature/explicit-datadog-support

Feature/explicit datadog support

Cargo.toml

@@ -12,7 +12,7 @@ readme = "Readme.md"
 license = "MIT"
 
 [features]
-default = [ ]
+default = []
 signals = [ "tokio/signal" ]
 mock-shutdown = []
 metered-allocator = [ "prometheus" ]
@@ -22,16 +22,23 @@ rand = [ "dep:rand", "dep:rand_chacha" ]
 rayon = [ "dep:rayon", "dep:num_cpus" ]
 prometheus = [ "dep:prometheus", "dep:hyper", "dep:url" ]
 otlp = [
+    "opentelemetry",
+    "dep:opentelemetry-otlp",
+]
+datadog = [
+    "opentelemetry",
+    "dep:opentelemetry-datadog"
+]
+opentelemetry = [
     "dep:url",
+    "dep:heck",
     "dep:http",
     "dep:serde",
     "dep:serde_json",
     "dep:tracing-opentelemetry",
     "dep:opentelemetry",
-    "dep:opentelemetry-otlp",
     "dep:opentelemetry-http",
     "dep:opentelemetry-semantic-conventions",
-    "dep:heck",
 ]
 
 [dependencies]
@@ -54,7 +61,7 @@ tracing-serde = "0.1"
 tracing-log = { version = "0.1.3", features = [ "interest-cache" ] }
 tracing-error = "0.2"
 tracing-futures = "0.2"
-tracing-subscriber = { version = "0.3.15", features = [ "env-filter", "json", "tracing-log", "smallvec", "parking_lot" ] }
+tracing-subscriber = { version = "0.3.17", features = [ "env-filter", "json", "tracing-log", "smallvec", "parking_lot" ] }
 tracing-flame = "0.2.0"
 users = "0.11"
 
@@ -80,17 +87,26 @@ prometheus = { version = "0.13", features = [ "process" ], optional = true }
 hyper = { version = "^0.14.17", features = [ "server", "tcp", "http1", "http2" ], optional = true }
 
 # OpenTelemetry
-# Using an older version because `tracing-opentelemetry` does not support 0.19.
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }
-tracing-opentelemetry = { version = "0.18", optional = true }
-opentelemetry = { version = "0.18", features = ["rt-tokio"], optional = true }
-opentelemetry-otlp = { version = "0.11", optional = true }
-opentelemetry-semantic-conventions = { version = "0.10", optional = true }
-opentelemetry-http = { version = "0.7", optional = true }
+
+# A fork by the author of the following PRs which update tracing-opentelemetry to support 0.19
+# https://github.com/tokio-rs/tracing-opentelemetry/pull/12
+# https://github.com/tokio-rs/tracing-opentelemetry/pull/9
+# Without 0.19 the opentelemetry-datadog crate is broken (missing Datadog-Meta-Tracer-Version header, but could be more issues)
+tracing-opentelemetry = { git = "https://github.com/jaysonsantos/tracing-opentelemetry", rev="76b0a0fe45fd53c352e8bfdcdfad775aed727e4c", optional = true }
+opentelemetry = { version = "0.19", features = ["rt-tokio"], optional = true }
+opentelemetry-semantic-conventions = { version = "0.11", optional = true }
+opentelemetry-http = { version = "0.8", optional = true }
 heck = { version = "0.4", optional = true }
 http = { version = "0.2.8", optional = true }
 
+# Opentelemetry Otlp
+opentelemetry-otlp = { version = "0.12", optional = true }
+
+# Opentelemetry Datadog
+opentelemetry-datadog = { version = "0.7.0", features = [ "reqwest-client" ], optional = true }
+
 # TODO: Do we need this?
 time = { version = "0.3.5", features = [ "formatting", "parsing" ] }