fix(tracing): Remove opentelemetry vendoring (#4025)

* fix(tracing): Remove opentelemetry vendoring

We used to vendor the opentelemetry protobufs because we relied on a version of tonic that `opentelemetry-sdk` didn't support. Now that we've upgraded tonic, we can remove the vendoring and use the official APIs.

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

* chore(deps): Update opentelemetry deps to 0.30

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

* chore(otel): Remove opentelemetry proto generation

OpenTelemetry protos are no longer vendored, so we no longer need to generate them.

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

---------

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

Author: sfleen

Cargo.lock

@@ -265,9 +265,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
@@ -2971,13 +2971,17 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.1.0"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc"
 dependencies = [
+ "base64 0.22.1",
+ "hex",
  "opentelemetry",
  "opentelemetry_sdk",
  "prost 0.13.5",
+ "serde",
  "tonic",
- "tonic-build",
 ]
 
 [[package]]
@@ -2992,6 +2996,7 @@ dependencies = [
  "opentelemetry",
  "percent-encoding",
  "rand 0.9.2",
+ "serde_json",
  "thiserror 2.0.16",
 ]
 
@@ -3024,7 +3029,7 @@ version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
 dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
  "serde",
 ]
 
@@ -4048,7 +4053,7 @@ checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
 dependencies = [
  "async-trait",
  "axum",
- "base64 0.22.0",
+ "base64 0.22.1",
  "bytes",
  "h2",
  "http",

Cargo.toml

@@ -86,7 +86,6 @@ members = [
     "linkerd/workers",
     "linkerd2-proxy",
     "opencensus-proto",
-    "opentelemetry-proto",
     "spiffe-proto",
     "tools",
 ]

linkerd/app/src/trace_collector/otel_collector.rs

@@ -5,8 +5,8 @@ use linkerd_app_core::{
 use linkerd_opentelemetry::{
     self as opentelemetry, metrics,
     proto::{
-        proto::common::v1::{any_value, AnyValue, KeyValue},
-        transform::common::ResourceAttributesWithSchema,
+        tonic::common::v1::{any_value, AnyValue, KeyValue},
+        transform::common::tonic::ResourceAttributesWithSchema,
     },
 };
 use std::{

linkerd/opentelemetry/Cargo.toml

@@ -14,7 +14,7 @@ linkerd-metrics = { path = "../metrics" }
 linkerd-trace-context = { path = "../trace-context" }
 opentelemetry = { version = "0.30", default-features = false, features = ["trace"] }
 opentelemetry_sdk = { version = "0.30", default-features = false, features = ["trace"] }
-opentelemetry-proto = { path = "../../opentelemetry-proto" }
+opentelemetry-proto = { version = "0.30" }
 tonic = { workspace = true, default-features = false, features = [
     "prost",
     "codegen",

linkerd/opentelemetry/src/lib.rs

@@ -15,16 +15,19 @@ use opentelemetry::{
 };
 pub use opentelemetry_proto as proto;
 use opentelemetry_proto::{
-    proto::{
+    tonic::{
         collector::trace::v1::{
             trace_service_client::TraceServiceClient, ExportTraceServiceRequest,
         },
         trace::v1::ResourceSpans,
     },
-    transform::{common::ResourceAttributesWithSchema, trace::group_spans_by_resource_and_scope},
+    transform::{
+        common::tonic::ResourceAttributesWithSchema,
+        trace::tonic::group_spans_by_resource_and_scope,
+    },
 };
-use opentelemetry_sdk::trace::SpanLinks;
-pub use opentelemetry_sdk::{self as sdk, trace::SpanData};
+use opentelemetry_sdk::trace::{SpanData, SpanLinks};
+pub use opentelemetry_sdk::{self as sdk};
 use tokio::{sync::mpsc, time};
 use tonic::{self as grpc, body::Body as TonicBody, client::GrpcService};
 use tracing::{debug, info, trace};