Skip to content

Fix missing attributes in OpenTelemetry traces #3609

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
sfleen merged 1 commit into from
Feb 11, 2025
Merged

Fix missing attributes in OpenTelemetry traces #3609

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
23 changes: 15 additions & 8 deletions linkerd/opentelemetry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@
use linkerd_trace_context as trace_context;
use metrics::Registry;
pub use opentelemetry as otel;
use opentelemetry::trace::{
SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState,
use opentelemetry::{
trace::{SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState},
KeyValue,
};
use opentelemetry::KeyValue;
pub use opentelemetry_proto as proto;
use opentelemetry_proto::proto::collector::trace::v1::trace_service_client::TraceServiceClient;
use opentelemetry_proto::proto::collector::trace::v1::ExportTraceServiceRequest;
use opentelemetry_proto::proto::trace::v1::ResourceSpans;
use opentelemetry_proto::transform::common::ResourceAttributesWithSchema;
use opentelemetry_proto::transform::trace::group_spans_by_resource_and_scope;
use opentelemetry_proto::{
proto::{
collector::trace::v1::{
trace_service_client::TraceServiceClient, ExportTraceServiceRequest,
},
trace::v1::ResourceSpans,
},
transform::{common::ResourceAttributesWithSchema, trace::group_spans_by_resource_and_scope},
};
pub use opentelemetry_sdk as sdk;
pub use opentelemetry_sdk::export::trace::SpanData;
use opentelemetry_sdk::trace::SpanLinks;
Expand Down Expand Up @@ -235,6 +239,9 @@
for (k, v) in labels.iter() {
attributes.push(KeyValue::new(k.clone(), v.clone()));
}
for (k, v) in span.labels.iter() {
attributes.push(KeyValue::new(*k, v.clone()));

Check warning on line 243 in linkerd/opentelemetry/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

linkerd/opentelemetry/src/lib.rs#L242-L243 

Added lines #L242 - L243 were not covered by tests
}
let is_remote = kind != trace_context::export::SpanKind::Client;
Ok(SpanData {
parent_span_id: SpanId::from_bytes(span.parent_id.into_bytes()?),
Expand Down
Loading