From 539f147c14dc5fd6b0f730e8b1a882cf52ba1f18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 14:25:51 +0000 Subject: [PATCH 1/6] fix(deps): update opentelemetry --- Cargo.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 87600fa..23e1aad 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.24", 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.25" +opentelemetry-http = { version = "0.13", features = ["hyper", "tokio"] } +opentelemetry-otlp = { version = "0.17", features = ["http-proto"] } +opentelemetry-zipkin = { version = "0.22", features = [], optional = true } +opentelemetry_sdk = { version = "0.24", default-features = false, features = [ "rt-tokio", ] } -opentelemetry-semantic-conventions = "0.14" -tracing-opentelemetry-instrumentation-sdk = { version = "0.18", features = ["http"] } +opentelemetry-semantic-conventions = "0.16" +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", From 4471fa197802c5f4dbb1c959a14b3d7efca27e4d Mon Sep 17 00:00:00 2001 From: Leonid Beschastny Date: Fri, 9 Aug 2024 16:30:09 +0200 Subject: [PATCH 2/6] Downgrade incompatible dependencies --- Cargo.lock | 65 +++++++++++++++++++++++------------------------------- Cargo.toml | 12 +++++----- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a763e1c..af047b5 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", @@ -1157,15 +1140,21 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.14.0" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" +checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" [[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", @@ -1173,7 +1162,7 @@ dependencies = [ "once_cell", "opentelemetry", "opentelemetry-http", - "opentelemetry-semantic-conventions", + "opentelemetry-semantic-conventions 0.15.0", "opentelemetry_sdk", "reqwest", "serde", @@ -1200,16 +1189,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,7 +1741,7 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-otlp", - "opentelemetry-semantic-conventions", + "opentelemetry-semantic-conventions 0.16.0", "opentelemetry-zipkin", "opentelemetry_api", "opentelemetry_sdk", @@ -2051,9 +2040,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 +2058,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 23e1aad..a621816 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,14 +7,14 @@ description = "Open Telemetry fox Axum and Tracing" [dependencies] http = "1.1.0" -opentelemetry = { version = "0.24", default-features = false, features = [ +opentelemetry = { version = "0.23", default-features = false, features = [ "trace", ] } -tracing-opentelemetry = "0.25" -opentelemetry-http = { version = "0.13", features = ["hyper", "tokio"] } -opentelemetry-otlp = { version = "0.17", features = ["http-proto"] } -opentelemetry-zipkin = { version = "0.22", features = [], optional = true } -opentelemetry_sdk = { version = "0.24", 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.16" From 589dcf1b5ccd830890b6343a2bb8dba64662336a Mon Sep 17 00:00:00 2001 From: Leonid Beschastny Date: Fri, 9 Aug 2024 15:44:58 +0200 Subject: [PATCH 3/6] Install opentelemetry_resource_detectors --- Cargo.lock | 12 ++++++++++++ Cargo.toml | 1 + src/lib.rs | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index af047b5..eaefd62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1138,6 +1138,17 @@ 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 0.15.0", + "opentelemetry_sdk", +] + [[package]] name = "opentelemetry-semantic-conventions" version = "0.15.0" @@ -1741,6 +1752,7 @@ dependencies = [ "opentelemetry", "opentelemetry-http", "opentelemetry-otlp", + "opentelemetry-resource-detectors", "opentelemetry-semantic-conventions 0.16.0", "opentelemetry-zipkin", "opentelemetry_api", diff --git a/Cargo.toml b/Cargo.toml index a621816..ed9d541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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; From 42146d8fa82f25a326f7736176691de4ae06c539 Mon Sep 17 00:00:00 2001 From: Leonid Beschastny Date: Fri, 9 Aug 2024 15:52:54 +0200 Subject: [PATCH 4/6] Update semantic conventions --- src/lib.rs | 6 +++--- src/middleware/aws/operations/dynamodb.rs | 6 +++--- src/middleware/aws/operations/firehose.rs | 2 +- src/middleware/aws/operations/sns.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b9fbadc..60db972 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ use tracing_subscriber::layer::SubscriberExt; pub use opentelemetry::{Array, Context, Key, KeyValue, StringValue, Value}; pub use opentelemetry_sdk::trace::TracerProvider; -pub use opentelemetry_semantic_conventions::{resource, trace as semconv}; +pub use opentelemetry_semantic_conventions::attribute as semconv; pub use tracing_opentelemetry::OpenTelemetrySpanExt; pub mod middleware; @@ -96,12 +96,12 @@ impl ResourceDetector for ServiceInfoDetector { .or_else(|| util::env_var("SERVICE_NAME")) .or_else(|| util::env_var("APP_NAME")) .or_else(|| Some(self.fallback_service_name.to_string())) - .map(|v| KeyValue::new(resource::SERVICE_NAME, v)); + .map(|v| KeyValue::new(semconv::SERVICE_NAME, v)); let service_version = util::env_var("OTEL_SERVICE_VERSION") .or_else(|| util::env_var("SERVICE_VERSION")) .or_else(|| util::env_var("APP_VERSION")) .or_else(|| Some(self.fallback_service_version.to_string())) - .map(|v| KeyValue::new(resource::SERVICE_VERSION, v)); + .map(|v| KeyValue::new(semconv::SERVICE_VERSION, v)); Resource::new(vec![service_name, service_version].into_iter().flatten()) } } diff --git a/src/middleware/aws/operations/dynamodb.rs b/src/middleware/aws/operations/dynamodb.rs index ee40268..5a779a2 100644 --- a/src/middleware/aws/operations/dynamodb.rs +++ b/src/middleware/aws/operations/dynamodb.rs @@ -14,13 +14,13 @@ impl<'a> AwsSpanBuilder<'a> { table_names.into_iter().map(|item| item.into()).collect(); let mut attributes = vec![ KeyValue::new(semconv::DB_SYSTEM, "dynamodb"), - KeyValue::new(semconv::DB_OPERATION, method.clone()), + KeyValue::new(semconv::DB_OPERATION_NAME, method.clone()), ]; match table_names.len() { 0 => {} 1 => { attributes.extend([ - KeyValue::new(semconv::DB_NAME, table_names[0].clone()), + KeyValue::new(semconv::DB_NAMESPACE, table_names[0].clone()), Key::new(semconv::AWS_DYNAMODB_TABLE_NAMES).array(table_names), ]); } @@ -68,7 +68,7 @@ macro_rules! dynamodb_table_arn_operation { stringify_camel!($op), std::iter::empty::(), ) - .attribute(KeyValue::new(semconv::DB_NAME, table_arn.into())) + .attribute(KeyValue::new(semconv::DB_NAMESPACE, table_arn.into())) } } }; diff --git a/src/middleware/aws/operations/firehose.rs b/src/middleware/aws/operations/firehose.rs index 2a99a62..e313b73 100644 --- a/src/middleware/aws/operations/firehose.rs +++ b/src/middleware/aws/operations/firehose.rs @@ -12,7 +12,7 @@ impl<'a> AwsSpanBuilder<'a> { ) -> Self { let mut attributes = vec![ KeyValue::new(semconv::MESSAGING_SYSTEM, "aws_firehose"), - KeyValue::new(semconv::MESSAGING_OPERATION, operation_kind.as_str()), + KeyValue::new(semconv::MESSAGING_OPERATION_TYPE, operation_kind.as_str()), ]; if let Some(stream_name) = stream_name { attributes.push(KeyValue::new( diff --git a/src/middleware/aws/operations/sns.rs b/src/middleware/aws/operations/sns.rs index 9b18579..8d9a2da 100644 --- a/src/middleware/aws/operations/sns.rs +++ b/src/middleware/aws/operations/sns.rs @@ -12,7 +12,7 @@ impl<'a> AwsSpanBuilder<'a> { ) -> Self { let mut attributes = vec![ KeyValue::new(semconv::MESSAGING_SYSTEM, "aws_sns"), - KeyValue::new(semconv::MESSAGING_OPERATION, operation_kind.as_str()), + KeyValue::new(semconv::MESSAGING_OPERATION_TYPE, operation_kind.as_str()), ]; if let Some(topic_arn) = topic_arn { attributes.push(KeyValue::new( From 0778dfeb339b971e5c864b13509ad855d153ea80 Mon Sep 17 00:00:00 2001 From: Leonid Beschastny Date: Fri, 9 Aug 2024 16:41:31 +0200 Subject: [PATCH 5/6] Fix clippy errors --- src/otlp.rs | 2 ++ 1 file changed, 2 insertions(+) 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 { From 8ebf2a095f55e664049054c14be1b78bf52b5222 Mon Sep 17 00:00:00 2001 From: Leonid Beschastny Date: Fri, 9 Aug 2024 19:31:56 +0200 Subject: [PATCH 6/6] Downgrade opentelemetry-semantic-conventions --- Cargo.lock | 12 +++--------- Cargo.toml | 2 +- src/lib.rs | 6 +++--- src/middleware/aws/operations/dynamodb.rs | 6 +++--- src/middleware/aws/operations/firehose.rs | 2 +- src/middleware/aws/operations/sns.rs | 2 +- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eaefd62..0abe1a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1145,7 +1145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5cd98b7277913e22e95b6fd3a5f7413438005471a6e33e8a4ae7b9a20be36ad" dependencies = [ "opentelemetry", - "opentelemetry-semantic-conventions 0.15.0", + "opentelemetry-semantic-conventions", "opentelemetry_sdk", ] @@ -1155,12 +1155,6 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1869fb4bb9b35c5ba8a1e40c9b128a7b4c010d07091e864a29da19e4fe2ca4d7" -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" - [[package]] name = "opentelemetry-zipkin" version = "0.21.0" @@ -1173,7 +1167,7 @@ dependencies = [ "once_cell", "opentelemetry", "opentelemetry-http", - "opentelemetry-semantic-conventions 0.15.0", + "opentelemetry-semantic-conventions", "opentelemetry_sdk", "reqwest", "serde", @@ -1753,7 +1747,7 @@ dependencies = [ "opentelemetry-http", "opentelemetry-otlp", "opentelemetry-resource-detectors", - "opentelemetry-semantic-conventions 0.16.0", + "opentelemetry-semantic-conventions", "opentelemetry-zipkin", "opentelemetry_api", "opentelemetry_sdk", diff --git a/Cargo.toml b/Cargo.toml index ed9d541..2798b29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ opentelemetry-zipkin = { version = "0.21", features = [], optional = true } opentelemetry_sdk = { version = "0.23", default-features = false, features = [ "rt-tokio", ] } -opentelemetry-semantic-conventions = "0.16" +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 = [ diff --git a/src/lib.rs b/src/lib.rs index 60db972..b9fbadc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ use tracing_subscriber::layer::SubscriberExt; pub use opentelemetry::{Array, Context, Key, KeyValue, StringValue, Value}; pub use opentelemetry_sdk::trace::TracerProvider; -pub use opentelemetry_semantic_conventions::attribute as semconv; +pub use opentelemetry_semantic_conventions::{resource, trace as semconv}; pub use tracing_opentelemetry::OpenTelemetrySpanExt; pub mod middleware; @@ -96,12 +96,12 @@ impl ResourceDetector for ServiceInfoDetector { .or_else(|| util::env_var("SERVICE_NAME")) .or_else(|| util::env_var("APP_NAME")) .or_else(|| Some(self.fallback_service_name.to_string())) - .map(|v| KeyValue::new(semconv::SERVICE_NAME, v)); + .map(|v| KeyValue::new(resource::SERVICE_NAME, v)); let service_version = util::env_var("OTEL_SERVICE_VERSION") .or_else(|| util::env_var("SERVICE_VERSION")) .or_else(|| util::env_var("APP_VERSION")) .or_else(|| Some(self.fallback_service_version.to_string())) - .map(|v| KeyValue::new(semconv::SERVICE_VERSION, v)); + .map(|v| KeyValue::new(resource::SERVICE_VERSION, v)); Resource::new(vec![service_name, service_version].into_iter().flatten()) } } diff --git a/src/middleware/aws/operations/dynamodb.rs b/src/middleware/aws/operations/dynamodb.rs index 5a779a2..ee40268 100644 --- a/src/middleware/aws/operations/dynamodb.rs +++ b/src/middleware/aws/operations/dynamodb.rs @@ -14,13 +14,13 @@ impl<'a> AwsSpanBuilder<'a> { table_names.into_iter().map(|item| item.into()).collect(); let mut attributes = vec![ KeyValue::new(semconv::DB_SYSTEM, "dynamodb"), - KeyValue::new(semconv::DB_OPERATION_NAME, method.clone()), + KeyValue::new(semconv::DB_OPERATION, method.clone()), ]; match table_names.len() { 0 => {} 1 => { attributes.extend([ - KeyValue::new(semconv::DB_NAMESPACE, table_names[0].clone()), + KeyValue::new(semconv::DB_NAME, table_names[0].clone()), Key::new(semconv::AWS_DYNAMODB_TABLE_NAMES).array(table_names), ]); } @@ -68,7 +68,7 @@ macro_rules! dynamodb_table_arn_operation { stringify_camel!($op), std::iter::empty::(), ) - .attribute(KeyValue::new(semconv::DB_NAMESPACE, table_arn.into())) + .attribute(KeyValue::new(semconv::DB_NAME, table_arn.into())) } } }; diff --git a/src/middleware/aws/operations/firehose.rs b/src/middleware/aws/operations/firehose.rs index e313b73..2a99a62 100644 --- a/src/middleware/aws/operations/firehose.rs +++ b/src/middleware/aws/operations/firehose.rs @@ -12,7 +12,7 @@ impl<'a> AwsSpanBuilder<'a> { ) -> Self { let mut attributes = vec![ KeyValue::new(semconv::MESSAGING_SYSTEM, "aws_firehose"), - KeyValue::new(semconv::MESSAGING_OPERATION_TYPE, operation_kind.as_str()), + KeyValue::new(semconv::MESSAGING_OPERATION, operation_kind.as_str()), ]; if let Some(stream_name) = stream_name { attributes.push(KeyValue::new( diff --git a/src/middleware/aws/operations/sns.rs b/src/middleware/aws/operations/sns.rs index 8d9a2da..9b18579 100644 --- a/src/middleware/aws/operations/sns.rs +++ b/src/middleware/aws/operations/sns.rs @@ -12,7 +12,7 @@ impl<'a> AwsSpanBuilder<'a> { ) -> Self { let mut attributes = vec![ KeyValue::new(semconv::MESSAGING_SYSTEM, "aws_sns"), - KeyValue::new(semconv::MESSAGING_OPERATION_TYPE, operation_kind.as_str()), + KeyValue::new(semconv::MESSAGING_OPERATION, operation_kind.as_str()), ]; if let Some(topic_arn) = topic_arn { attributes.push(KeyValue::new(