Skip to content

Commit

Permalink
fix(deps): update opentelemetry (#51)
Browse files Browse the repository at this point in the history
* fix(deps): update opentelemetry

* Downgrade incompatible dependencies

* Install opentelemetry_resource_detectors

* Fix clippy errors

* Downgrade opentelemetry-semantic-conventions

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Leonid Beschastny <Leonid.Beschastny@viaplaygroup.com>
  • Loading branch information
renovate[bot] and lbeschastny authored Aug 12, 2024
1 parent 7c33572 commit b2b2201
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 45 deletions.
67 changes: 31 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ description = "Open Telemetry fox Axum and Tracing"

[dependencies]
http = "1.1.0"
opentelemetry = { version = "0.22", default-features = false, features = [
opentelemetry = { version = "0.23", default-features = false, features = [
"trace",
] }
tracing-opentelemetry = "0.23"
opentelemetry-http = { version = "0.11", features = ["hyper", "tokio"] }
opentelemetry-otlp = { version = "0.15", features = ["http-proto"] }
opentelemetry-zipkin = { version = "0.20", features = [], optional = true }
opentelemetry_sdk = { version = "0.22", default-features = false, features = [
tracing-opentelemetry = "0.24"
opentelemetry-http = { version = "0.12", features = ["hyper", "tokio"] }
opentelemetry-otlp = { version = "0.16", features = ["http-proto"] }
opentelemetry-zipkin = { version = "0.21", features = [], optional = true }
opentelemetry_sdk = { version = "0.23", default-features = false, features = [
"rt-tokio",
] }
opentelemetry-semantic-conventions = "0.14"
tracing-opentelemetry-instrumentation-sdk = { version = "0.18", features = ["http"] }
opentelemetry-semantic-conventions = "0.15"
tracing-opentelemetry-instrumentation-sdk = { version = "0.19", features = ["http"] }
tracing = { version = "0.1.40", default-features = false }
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
"env-filter",
Expand All @@ -40,6 +40,7 @@ http-body-util = { version = "0.1.1", optional = true }
aws-types = { version = "1", optional = true }
lambda_runtime = { version = "0", optional = true }
paste = { version = "1.0.14", optional = true }
opentelemetry-resource-detectors = "0.2.0"

[dev-dependencies]
assert2 = "0.3"
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
// which is licensed under CC0 1.0 Universal
// https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk/blob/d3609ac2cc699d3a24fbf89754053cc8e938e3bf/LICENSE

use opentelemetry_resource_detectors::OsResourceDetector;
use opentelemetry_sdk::{
resource::{EnvResourceDetector, OsResourceDetector, ResourceDetector},
resource::{EnvResourceDetector, ResourceDetector},
Resource,
};
use tracing::level_filters::LevelFilter;
Expand Down
2 changes: 2 additions & 0 deletions src/otlp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ where
.tonic()
.with_export_config(export_config)
.into(),
Protocol::HttpJson => unreachable!("HttpJson protocol is not supported"),
};

let mut pipeline = opentelemetry_otlp::new_pipeline()
Expand Down Expand Up @@ -155,6 +156,7 @@ fn infer_export_config(
let endpoint = match protocol {
Protocol::HttpBinary => maybe_endpoint.unwrap_or("http://localhost:4318"),
Protocol::Grpc => maybe_endpoint.unwrap_or("http://localhost:4317"),
Protocol::HttpJson => unreachable!("HttpJson protocol is not supported"),
};

let timeout = match maybe_timeout {
Expand Down

0 comments on commit b2b2201

Please sign in to comment.