diff --git a/Cargo.lock b/Cargo.lock index a763e1c..0abe1a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -372,21 +372,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - [[package]] name = "deranged" version = "0.3.11" @@ -1095,9 +1080,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" dependencies = [ "futures-core", "futures-sink", @@ -1105,14 +1090,13 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", - "urlencoding", ] [[package]] name = "opentelemetry-http" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7690dc77bf776713848c4faa6501157469017eaf332baccd4eb1cea928743d94" +checksum = "b0ba633e55c5ea6f431875ba55e71664f2fa5d3a90bd34ec9302eecc41c865dd" dependencies = [ "async-trait", "bytes", @@ -1125,9 +1109,9 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" dependencies = [ "async-trait", "futures-core", @@ -1135,7 +1119,6 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", "thiserror", @@ -1145,9 +1128,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -1155,17 +1138,28 @@ dependencies = [ "tonic", ] +[[package]] +name = "opentelemetry-resource-detectors" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5cd98b7277913e22e95b6fd3a5f7413438005471a6e33e8a4ae7b9a20be36ad" +dependencies = [ + "opentelemetry", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", +] + [[package]] name = "opentelemetry-semantic-conventions" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" +checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" [[package]] name = "opentelemetry-zipkin" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6943c09b1b7c17b403ae842b00f23e6d5fc6f5ec06cccb3f39aca97094a899a" +checksum = "b6ef6ac37be83507328641e625d68cefd1d262f57222f3358705a07fd4afc432" dependencies = [ "async-trait", "futures-core", @@ -1200,16 +1194,16 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" dependencies = [ "async-trait", - "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", "glob", + "lazy_static", "once_cell", "opentelemetry", "ordered-float", @@ -1752,6 +1746,7 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-otlp", + "opentelemetry-resource-detectors", "opentelemetry-semantic-conventions", "opentelemetry-zipkin", "opentelemetry_api", @@ -2051,9 +2046,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", @@ -2069,9 +2064,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry-instrumentation-sdk" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a276058193f1b03d8279356215ec4c8c1bb21e40e5554bb239aa94fb2d8e189" +checksum = "a7065f4c337874edb2ba504cb1e487b3bb4f1533a5bb6fcdf72da1575564814c" dependencies = [ "http 1.1.0", "opentelemetry", diff --git a/Cargo.toml b/Cargo.toml index 87600fa..2798b29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", @@ -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" diff --git a/src/lib.rs b/src/lib.rs index ac389c5..b9fbadc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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; diff --git a/src/otlp.rs b/src/otlp.rs index 5f34064..c83be63 100644 --- a/src/otlp.rs +++ b/src/otlp.rs @@ -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() @@ -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 {