From eda8e595cc655c46ded899179cd15c023364d827 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 4 Mar 2025 00:00:00 +0000 Subject: [PATCH 1/5] chore(opentelemetry): remove unused `http` dependency Signed-off-by: katelyn martin --- Cargo.lock | 1 - linkerd/opentelemetry/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 144f108696..b34d28e558 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2074,7 +2074,6 @@ name = "linkerd-opentelemetry" version = "0.1.0" dependencies = [ "futures", - "http", "http-body", "linkerd-error", "linkerd-metrics", diff --git a/linkerd/opentelemetry/Cargo.toml b/linkerd/opentelemetry/Cargo.toml index 6eb1f93fb4..435cb78c61 100644 --- a/linkerd/opentelemetry/Cargo.toml +++ b/linkerd/opentelemetry/Cargo.toml @@ -8,7 +8,6 @@ publish = false [dependencies] futures = { version = "0.3", default-features = false } -http = "0.2" http-body = { workspace = true } linkerd-error = { path = "../error" } linkerd-metrics = { path = "../metrics" } From 1702508e32578d8a8199fd03cffa821ce0ab4216 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 4 Mar 2025 00:00:00 +0000 Subject: [PATCH 2/5] nit(opentelemetry): tidy imports this groups imports at the crate level, and directly imports some imports from their respective crates rather than through an alias of said crate. a `self` prefix is added to clarify imports from submodules of this crate. Signed-off-by: katelyn martin --- linkerd/opentelemetry/src/lib.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/linkerd/opentelemetry/src/lib.rs b/linkerd/opentelemetry/src/lib.rs index 1759fa4a71..86a32bea0b 100644 --- a/linkerd/opentelemetry/src/lib.rs +++ b/linkerd/opentelemetry/src/lib.rs @@ -3,11 +3,11 @@ pub mod metrics; +use self::metrics::Registry; use futures::stream::{Stream, StreamExt}; use http_body::Body; use linkerd_error::Error; -use linkerd_trace_context as trace_context; -use metrics::Registry; +use linkerd_trace_context::{self as trace_context, export::ExportSpan}; pub use opentelemetry as otel; use opentelemetry::{ trace::{SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState}, @@ -23,12 +23,10 @@ use opentelemetry_proto::{ }, transform::{common::ResourceAttributesWithSchema, trace::group_spans_by_resource_and_scope}, }; -pub use opentelemetry_sdk as sdk; -pub use opentelemetry_sdk::trace::SpanData; use opentelemetry_sdk::trace::SpanLinks; +pub use opentelemetry_sdk::{self as sdk, trace::SpanData}; use tokio::{sync::mpsc, time}; use tonic::{self as grpc, body::BoxBody, client::GrpcService}; -use trace_context::export::ExportSpan; use tracing::{debug, info, trace}; pub async fn export_spans( From d1563ad6a58e17b618c37c2427fb976025a0bdc0 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 4 Mar 2025 00:00:00 +0000 Subject: [PATCH 3/5] chore(opentelemetry): remove unused `tokio-stream` dependency Signed-off-by: katelyn martin --- Cargo.lock | 1 - linkerd/opentelemetry/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b34d28e558..5a7e8a1eb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2082,7 +2082,6 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk", "tokio", - "tokio-stream", "tonic", "tracing", ] diff --git a/linkerd/opentelemetry/Cargo.toml b/linkerd/opentelemetry/Cargo.toml index 435cb78c61..09d6747238 100644 --- a/linkerd/opentelemetry/Cargo.toml +++ b/linkerd/opentelemetry/Cargo.toml @@ -20,5 +20,4 @@ tonic = { workspace = true, default-features = false, features = [ "codegen", ] } tokio = { version = "1", features = ["macros", "sync", "time"] } -tokio-stream = { version = "0.1", features = ["sync"] } tracing = "0.1" From 92ca3e0c2e432ac685fa673e4d3c75192866cdfe Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 4 Mar 2025 00:00:00 +0000 Subject: [PATCH 4/5] chore(opencensus): remove unused `http` dependency Signed-off-by: katelyn martin --- Cargo.lock | 1 - linkerd/opencensus/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a7e8a1eb4..8045391f57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2057,7 +2057,6 @@ name = "linkerd-opencensus" version = "0.1.0" dependencies = [ "futures", - "http", "http-body", "linkerd-error", "linkerd-metrics", diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml index bd29ae156a..37086afab7 100644 --- a/linkerd/opencensus/Cargo.toml +++ b/linkerd/opencensus/Cargo.toml @@ -8,7 +8,6 @@ publish = false [dependencies] futures = { version = "0.3", default-features = false } -http = { workspace = true } http-body = { workspace = true } linkerd-error = { path = "../error" } linkerd-metrics = { path = "../metrics" } From 999ff2dc15b6e34bfb904b0bceab4ad69a6e0c4a Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 4 Mar 2025 00:00:00 +0000 Subject: [PATCH 5/5] nit(opencensus): use self prefix in import Signed-off-by: katelyn martin --- linkerd/opencensus/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkerd/opencensus/src/lib.rs b/linkerd/opencensus/src/lib.rs index fe63f8e336..68ac4b6451 100644 --- a/linkerd/opencensus/src/lib.rs +++ b/linkerd/opencensus/src/lib.rs @@ -3,11 +3,11 @@ pub mod metrics; +use self::metrics::Registry; use futures::stream::{Stream, StreamExt}; use http_body::Body; use linkerd_error::Error; use linkerd_trace_context::export::{ExportSpan, SpanKind}; -use metrics::Registry; pub use opencensus_proto as proto; use opencensus_proto::{ agent::{