Skip to content

chore(tracing): Use upstream tracing batch exporter #4279

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(tracing): Use upstream tracing batch exporter #4279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 26 additions & 75 deletions linkerd/app/src/trace_collector/otel_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
use super::EnabledCollector;
use linkerd_app_core::{control::ControlAddr, proxy::http::Body, Error};
use linkerd_opentelemetry::{
self as opentelemetry, metrics,
proto::{
tonic::common::v1::{any_value, AnyValue, KeyValue},
transform::common::tonic::ResourceAttributesWithSchema,
},
semconv,
};
use linkerd_opentelemetry::{self as opentelemetry, metrics, otel::KeyValue, sdk, semconv};
use std::{
collections::HashMap,
time::{SystemTime, UNIX_EPOCH},
Expand All @@ -29,7 +22,7 @@ pub(super) fn create_collector<S>(
legacy_metrics: metrics::Registry,
) -> EnabledCollector
where
S: GrpcService<TonicBody> + Clone + Send + 'static,
S: GrpcService<TonicBody> + Clone + Send + Sync + 'static,
S::Error: Into<Error>,
S::Future: Send,
S::ResponseBody: Body<Data = tonic::codegen::Bytes> + Send + 'static,
Expand All @@ -38,37 +31,33 @@ where
let (span_sink, spans_rx) = mpsc::channel(crate::trace_collector::SPAN_BUFFER_CAPACITY);
let spans_rx = ReceiverStream::new(spans_rx);

let mut resources = ResourceAttributesWithSchema::default();

resources
.attributes
.0
.push((std::process::id() as i64).with_key(semconv::attribute::PROCESS_PID));

resources.attributes.0.push(
SystemTime::now()
.duration_since(UNIX_EPOCH)
.map(|d| d.as_secs() as i64)
.unwrap_or_else(|e| -(e.duration().as_secs() as i64))
.with_key("process.start_timestamp"),
);
resources.attributes.0.push(
attributes
.hostname
.unwrap_or_default()
.with_key(semconv::attribute::HOST_NAME),
);

resources.attributes.0.extend(
attributes
.extra
.into_iter()
.map(|(key, value)| value.with_key(&key)),
);
let resource = sdk::Resource::builder()
.with_attribute(KeyValue::new(
semconv::attribute::PROCESS_PID,
std::process::id() as i64,
Copy link
Member

@unleashed unleashed Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlikely to happen anytime soon, but easy to future-proof potential pid space growth.

Suggested change
std::process::id() as i64,
i64::from(std::process::id()),

))
.with_attribute(KeyValue::new(
"process.start_timestamp",
SystemTime::now()
.duration_since(UNIX_EPOCH)
.map(|d| d.as_secs() as i64)
.unwrap_or_else(|e| -(e.duration().as_secs() as i64)),
))
.with_attribute(KeyValue::new(
semconv::attribute::HOST_NAME,
attributes.hostname.unwrap_or_default(),
))
.with_attributes(
attributes
.extra
.into_iter()
.map(|(k, v)| KeyValue::new(k, v)),
)
.build();

let addr = addr.clone();
let task = Box::pin(
opentelemetry::export_spans(svc, spans_rx, resources, legacy_metrics)
opentelemetry::export_spans(svc, spans_rx, resource, legacy_metrics)
.instrument(tracing::debug_span!("opentelemetry", peer.addr = %addr).or_current()),
);

Expand All @@ -78,41 +67,3 @@ where
span_sink,
}
}

trait IntoAnyValue
where
Self: Sized,
{
fn into_any_value(self) -> AnyValue;

fn with_key(self, key: &str) -> KeyValue {
KeyValue {
key: key.to_string(),
value: Some(self.into_any_value()),
}
}
}

impl IntoAnyValue for String {
fn into_any_value(self) -> AnyValue {
AnyValue {
value: Some(any_value::Value::StringValue(self)),
}
}
}

impl IntoAnyValue for &str {
fn into_any_value(self) -> AnyValue {
AnyValue {
value: Some(any_value::Value::StringValue(self.to_string())),
}
}
}

impl IntoAnyValue for i64 {
fn into_any_value(self) -> AnyValue {
AnyValue {
value: Some(any_value::Value::IntValue(self)),
}
}
}
Loading
Loading