Skip to content

chore(deps): remove unused opencensus, opentelemetry dependencies #3708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 6, 2025
+4 −12
Merged

chore(deps): remove unused opencensus, opentelemetry dependencies #3708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eda8e59
chore(opentelemetry): remove unused `http` dependency
cratelyn Mar 4, 2025
1702508
nit(opentelemetry): tidy imports
cratelyn Mar 4, 2025
d1563ad
chore(opentelemetry): remove unused `tokio-stream` dependency
cratelyn Mar 4, 2025
92ca3e0
chore(opencensus): remove unused `http` dependency
cratelyn Mar 4, 2025
999ff2d
nit(opencensus): use self prefix in import
cratelyn Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,7 +2057,6 @@ name = "linkerd-opencensus"
version = "0.1.0"
dependencies = [
"futures",
"http",
"http-body",
"linkerd-error",
"linkerd-metrics",
Expand All @@ -2074,7 +2073,6 @@ name = "linkerd-opentelemetry"
version = "0.1.0"
dependencies = [
"futures",
"http",
"http-body",
"linkerd-error",
"linkerd-metrics",
Expand All @@ -2083,7 +2081,6 @@ dependencies = [
"opentelemetry-proto",
"opentelemetry_sdk",
"tokio",
"tokio-stream",
"tonic",
"tracing",
]
Expand Down
1 change: 0 additions & 1 deletion linkerd/opencensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/opencensus/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 0 additions & 2 deletions linkerd/opentelemetry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -21,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"
8 changes: 3 additions & 5 deletions linkerd/opentelemetry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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<T, S>(
Expand Down
Loading