Merge pull request #91 from recmo/dzejkop/update-fork

Use new version of `tracing-opentelemetry` + server example
recmo · Jul 18, 2023 · fc1186d · fc1186d
2 parents b8f350d + 654859a
commit fc1186d
Show file tree

Hide file tree

Showing 12 changed files with 2,524 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -86,15 +86,12 @@ num_cpus = { version = "1.13.1", optional = true }
 prometheus = { version = "0.13", features = [ "process" ], optional = true }
 hyper = { version = "^0.14.17", features = [ "server", "tcp", "http1", "http2" ], optional = true }
 
-# OpenTelemetry
+# Serde
 serde = { version = "1.0", optional = true }
 serde_json = { version = "1.0", 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
+tracing-opentelemetry = { version = "0.19", 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 }

diff --git a/example/Cargo.lock → examples/basic-cli/Cargo.lock b/example/Cargo.lock → examples/basic-cli/Cargo.lock
diff --git a/example/Cargo.toml → examples/basic-cli/Cargo.toml b/example/Cargo.toml → examples/basic-cli/Cargo.toml
@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cli-batteries = { path = "..", features = [ "rand", "rayon", "prometheus", "datadog" ] }
+cli-batteries = { path = "../..", features = [ "rand", "rayon", "prometheus", "datadog" ] }
 tokio = { version = "1.17", features = [ "fs" ] }
 tracing = "0.1.34"
 clap = { version = "4.0", features = [ "derive" ] }
 http = "0.2.8"
 
 [build-dependencies]
-cli-batteries = { path = ".." }
+cli-batteries = { path = "../.." }
diff --git a/example/Readme.md → examples/basic-cli/Readme.md b/example/Readme.md → examples/basic-cli/Readme.md
diff --git a/example/build.rs → examples/basic-cli/build.rs b/example/build.rs → examples/basic-cli/build.rs
diff --git a/example/src/main.rs → examples/basic-cli/src/main.rs b/example/src/main.rs → examples/basic-cli/src/main.rs