Skip to content

Fix missing link attributes when using the Java agent #15143

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 4 commits into from
Oct 26, 2025
+101 −7
Merged

Fix missing link attributes when using the Java agent #15143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c0e814
Add test
trask Oct 25, 2025
298bfb6
fix
trask Oct 25, 2025
0d8536a
fix
trask Oct 25, 2025
b8cf0da
Merge branch 'main' into links
trask Oct 26, 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: 2 additions & 1 deletion ...pentelemetry/javaagent/instrumentation/opentelemetryapi/trace/ApplicationSpanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public SpanBuilder addLink(SpanContext applicationSpanContext) {
@Override
@CanIgnoreReturnValue
public SpanBuilder addLink(SpanContext applicationSpanContext, Attributes applicationAttributes) {
agentBuilder.addLink(Bridging.toAgent(applicationSpanContext));
agentBuilder.addLink(
Bridging.toAgent(applicationSpanContext), Bridging.toAgent(applicationAttributes));
return this;
}

Expand Down
93 changes: 93 additions & 0 deletions ...src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/TracerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
import io.opentelemetry.sdk.trace.data.LinkData;
import io.opentelemetry.sdk.trace.data.StatusData;
import java.io.PrintWriter;
import java.io.StringWriter;
Expand Down Expand Up @@ -322,4 +324,95 @@ void testTracerBuilder() {
.hasInstrumentationScopeInfo(
InstrumentationScopeInfo.builder("test").setVersion("1.2.3").build())));
}

@Test
@DisplayName("capture span link without attributes")
void captureSpanLinkWithoutAttributes() {
// When
Tracer tracer = GlobalOpenTelemetry.getTracer("test");
Span linkedSpan = tracer.spanBuilder("linked").startSpan();
linkedSpan.end();
SpanContext linkedSpanContext = linkedSpan.getSpanContext();

Span testSpan = tracer.spanBuilder("test").addLink(linkedSpanContext).startSpan();
testSpan.end();

// Then
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("linked").hasNoParent().hasTotalAttributeCount(0)),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("test")
.hasNoParent()
.hasTotalAttributeCount(0)
.hasLinksSatisfying(
links -> {
assertThat(links).hasSize(1);
LinkData link = links.get(0);
assertThat(link.getSpanContext().getTraceId())
.isEqualTo(linkedSpanContext.getTraceId());
assertThat(link.getSpanContext().getSpanId())
.isEqualTo(linkedSpanContext.getSpanId());
assertThat(link.getSpanContext().getTraceFlags().asByte())
.isEqualTo(linkedSpanContext.getTraceFlags().asByte());
assertThat(link.getSpanContext().isRemote())
.isEqualTo(linkedSpanContext.isRemote());
assertThat(link.getAttributes().size()).isEqualTo(0);
})));
}

@Test
@DisplayName("capture span link with attributes")
void captureSpanLinkWithAttributes() {
// When
Tracer tracer = GlobalOpenTelemetry.getTracer("test");
Span linkedSpan = tracer.spanBuilder("linked").startSpan();
linkedSpan.end();
SpanContext linkedSpanContext = linkedSpan.getSpanContext();

Attributes linkAttributes =
Attributes.builder()
.put("string", "1")
.put("long", 2L)
.put("double", 3.0)
.put("boolean", true)
.build();
Span testSpan =
tracer.spanBuilder("test").addLink(linkedSpanContext, linkAttributes).startSpan();
testSpan.end();

// Then
testing.waitAndAssertTraces(
trace ->
trace.hasSpansSatisfyingExactly(
span -> span.hasName("linked").hasNoParent().hasTotalAttributeCount(0)),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("test")
.hasNoParent()
.hasTotalAttributeCount(0)
.hasLinksSatisfying(
links -> {
assertThat(links).hasSize(1);
LinkData link = links.get(0);
assertThat(link.getSpanContext().getTraceId())
.isEqualTo(linkedSpanContext.getTraceId());
assertThat(link.getSpanContext().getSpanId())
.isEqualTo(linkedSpanContext.getSpanId());
assertThat(link.getSpanContext().getTraceFlags().asByte())
.isEqualTo(linkedSpanContext.getTraceFlags().asByte());
assertThat(link.getSpanContext().isRemote())
.isEqualTo(linkedSpanContext.isRemote());
assertThat(link.getTotalAttributeCount()).isEqualTo(4);
Attributes attrs = link.getAttributes();
assertThat(attrs.get(stringKey("string"))).isEqualTo("1");
assertThat(attrs.get(longKey("long"))).isEqualTo(2L);
assertThat(attrs.get(doubleKey("double"))).isEqualTo(3.0);
assertThat(attrs.get(booleanKey("boolean"))).isEqualTo(true);
})));
}
}
12 changes: 6 additions & 6 deletions ...n/src/main/java/io/opentelemetry/instrumentation/testing/internal/TelemetryConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static List<SpanData> getSpanData(Collection<ResourceSpans> allResourceSp
SpanContext.create(
traceId,
bytesToHex(span.getSpanId().toByteArray()),
TraceFlags.getDefault(),
TraceFlags.fromByte((byte) span.getFlags()),
extractTraceState(span.getTraceState())))
// TODO is it ok to use default trace flags and default trace state here?
.setParentSpanContext(
Expand Down Expand Up @@ -152,7 +152,7 @@ public static List<SpanData> getSpanData(Collection<ResourceSpans> allResourceSp
SpanContext.create(
bytesToHex(link.getTraceId().toByteArray()),
bytesToHex(link.getSpanId().toByteArray()),
TraceFlags.getDefault(),
TraceFlags.fromByte((byte) link.getFlags()),
extractTraceState(link.getTraceState())),
fromProto(link.getAttributesList()),
link.getDroppedAttributesCount() + link.getAttributesCount()))
Expand Down Expand Up @@ -307,8 +307,8 @@ private static LogRecordData createLogData(
SpanContext.create(
bytesToHex(logRecord.getTraceId().toByteArray()),
bytesToHex(logRecord.getSpanId().toByteArray()),
TraceFlags.getDefault(),
TraceState.getDefault()))
TraceFlags.fromByte((byte) logRecord.getFlags()),
TraceState.getDefault())) // logs proto doesn't have trace state
.setSeverity(fromProto(logRecord.getSeverityNumber()))
.setSeverityText(logRecord.getSeverityText())
.setAttributes(fromProto(logRecord.getAttributesList()));
Expand All @@ -333,8 +333,8 @@ private static LogRecordData createExtendedLogData(
SpanContext.create(
bytesToHex(logRecord.getTraceId().toByteArray()),
bytesToHex(logRecord.getSpanId().toByteArray()),
TraceFlags.getDefault(),
TraceState.getDefault()))
TraceFlags.fromByte((byte) logRecord.getFlags()),
TraceState.getDefault())) // logs proto doesn't have trace state
.setSeverity(fromProto(logRecord.getSeverityNumber()))
.setSeverityText(logRecord.getSeverityText())
.setEventName(logRecord.getEventName())
Expand Down
Loading