build(deps): bump the opentelemetry group with 2 updates (#3607)

* build(deps): bump the opentelemetry group with 2 updates

Bumps the opentelemetry group with 2 updates: [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) and [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust).


Updates `opentelemetry` from 0.27.1 to 0.28.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry-0.27.1...opentelemetry-0.28.0)

Updates `opentelemetry_sdk` from 0.27.1 to 0.28.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases)
- [Commits](open-telemetry/opentelemetry-rust@opentelemetry_sdk-0.27.1...opentelemetry_sdk-0.28.0)

---
updated-dependencies:
- dependency-name: opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
- dependency-name: opentelemetry_sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: opentelemetry
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix(deps): Fix build breakages from opentelemetry-sdk 0.28

The changes here are fairly small, with the main two being a change to an import path and replacing a privated `new` function with a builder.

Signed-off-by: Scott Fleener <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Scott Fleener <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Scott Fleener <[email protected]>

Author: dependabot[bot]

Cargo.lock

@@ -1273,7 +1273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -2983,15 +2983,15 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7"
+checksum = "236e667b670a5cdf90c258f5a55794ec5ac5027e960c224bff8367a59e1e6426"
 dependencies = [
  "futures-core",
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tracing",
 ]
 
@@ -3008,17 +3008,17 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8"
+checksum = "84dfad6042089c7fc1f6118b7040dc2eb4ab520abbf410b79dc481032af39570"
 dependencies = [
  "futures-channel",
  "futures-executor",
  "futures-util",
  "opentelemetry",
  "percent-encoding",
  "rand 0.8.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]

linkerd/opentelemetry/Cargo.toml

@@ -13,8 +13,8 @@ http-body = { workspace = true }
 linkerd-error = { path = "../error" }
 linkerd-metrics = { path = "../metrics" }
 linkerd-trace-context = { path = "../trace-context" }
-opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
-opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
+opentelemetry = { version = "0.28", default-features = false, features = ["trace"] }
+opentelemetry_sdk = { version = "0.28", default-features = false, features = ["trace"] }
 opentelemetry-proto = { path = "../../opentelemetry-proto" }
 tonic = { workspace = true, default-features = false, features = [
     "prost",

linkerd/opentelemetry/src/lib.rs

@@ -24,7 +24,7 @@ use opentelemetry_proto::{
     transform::{common::ResourceAttributesWithSchema, trace::group_spans_by_resource_and_scope},
 };
 pub use opentelemetry_sdk as sdk;
-pub use opentelemetry_sdk::export::trace::SpanData;
+pub use opentelemetry_sdk::trace::SpanData;
 use opentelemetry_sdk::trace::SpanLinks;
 use tokio::{sync::mpsc, time};
 use tonic::{self as grpc, body::BoxBody, client::GrpcService};

opentelemetry-proto/Cargo.toml

@@ -14,11 +14,11 @@ Vendored from https://github.com/open-telemetry/opentelemetry-rust/.
 [dependencies]
 tonic = { workspace = true, features = ["codegen", "prost", "transport"] }
 prost = { workspace = true }
-opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
-opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
+opentelemetry = { version = "0.28", default-features = false, features = ["trace"] }
+opentelemetry_sdk = { version = "0.28", default-features = false, features = ["trace"] }
 
 [dev-dependencies]
-opentelemetry = { version = "0.27", default-features = false, features = ["trace", "testing"] }
+opentelemetry = { version = "0.28", default-features = false, features = ["trace", "testing"] }
 tonic-build = { workspace = true, default-features = false, features = ["prost"] }
 
 [lib]

opentelemetry-proto/src/transform/trace.rs

@@ -1,9 +1,15 @@
-use crate::proto::resource::v1::Resource;
-use crate::proto::trace::v1::{span, status, ResourceSpans, ScopeSpans, Span, Status};
-use crate::transform::common::{to_nanos, Attributes, ResourceAttributesWithSchema};
-use opentelemetry::trace;
-use opentelemetry::trace::{Link, SpanId, SpanKind};
-use opentelemetry_sdk::export::trace::SpanData;
+use crate::{
+    proto::{
+        resource::v1::Resource,
+        trace::v1::{span, status, ResourceSpans, ScopeSpans, Span, Status},
+    },
+    transform::common::{to_nanos, Attributes, ResourceAttributesWithSchema},
+};
+use opentelemetry::{
+    trace,
+    trace::{Link, SpanId, SpanKind},
+};
+use opentelemetry_sdk::trace::SpanData;
 use std::collections::HashMap;
 
 impl From<SpanKind> for span::SpanKind {
@@ -40,8 +46,8 @@ impl From<Link> for span::Link {
         }
     }
 }
-impl From<opentelemetry_sdk::export::trace::SpanData> for Span {
-    fn from(source_span: opentelemetry_sdk::export::trace::SpanData) -> Self {
+impl From<opentelemetry_sdk::trace::SpanData> for Span {
+    fn from(source_span: opentelemetry_sdk::trace::SpanData) -> Self {
         let span_kind: span::SpanKind = source_span.span_kind.into();
         Span {
             trace_id: source_span.span_context.trace_id().to_bytes().to_vec(),
@@ -185,17 +191,21 @@ pub fn group_spans_by_resource_and_scope(
 
 #[cfg(test)]
 mod tests {
-    use crate::proto::common::v1::any_value::Value;
-    use crate::transform::common::ResourceAttributesWithSchema;
-    use opentelemetry::trace::{
-        SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState,
+    use crate::{
+        proto::common::v1::any_value::Value, transform::common::ResourceAttributesWithSchema,
+    };
+    use opentelemetry::{
+        trace::{SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState},
+        InstrumentationScope, KeyValue,
+    };
+    use opentelemetry_sdk::{
+        resource::Resource,
+        trace::{SpanData, SpanEvents, SpanLinks},
+    };
+    use std::{
+        borrow::Cow,
+        time::{Duration, SystemTime},
     };
-    use opentelemetry::{InstrumentationScope, KeyValue};
-    use opentelemetry_sdk::export::trace::SpanData;
-    use opentelemetry_sdk::resource::Resource;
-    use opentelemetry_sdk::trace::{SpanEvents, SpanLinks};
-    use std::borrow::Cow;
-    use std::time::{Duration, SystemTime};
 
     fn create_test_span_data(instrumentation_name: &'static str) -> SpanData {
         let span_context = SpanContext::new(
@@ -224,7 +234,9 @@ mod tests {
 
     #[test]
     fn test_group_spans_by_resource_and_scope_single_scope() {
-        let resource = Resource::new(vec![KeyValue::new("resource_key", "resource_value")]);
+        let resource = Resource::builder_empty()
+            .with_attribute(KeyValue::new("resource_key", "resource_value"))
+            .build();
         let span_data = create_test_span_data("lib1");
 
         let spans = vec![span_data.clone()];
@@ -269,7 +281,9 @@ mod tests {
 
     #[test]
     fn test_group_spans_by_resource_and_scope_multiple_scopes() {
-        let resource = Resource::new(vec![KeyValue::new("resource_key", "resource_value")]);
+        let resource = Resource::builder_empty()
+            .with_attribute(KeyValue::new("resource_key", "resource_value"))
+            .build();
         let span_data1 = create_test_span_data("lib1");
         let span_data2 = create_test_span_data("lib1");
         let span_data3 = create_test_span_data("lib2");