Skip to content

Remove default methods from CoreSpan; implement them in test doubles #11782

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
dougqh wants to merge 3 commits into
base: master
Choose a base branch
from
+60 −14
Open

Remove default methods from CoreSpan; implement them in test doubles #11782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e79d6f6
Exclude CoreSpan from coverage — all default methods are overridden b…
dougqh Jun 29, 2026
d1117c7
Remove default methods from CoreSpan; implement them in test doubles
dougqh Jun 29, 2026
132b919
fix: implement CoreSpan methods in traceAgentTest
bric3 Jun 30, 2026
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
18 changes: 4 additions & 14 deletions dd-trace-core/src/main/java/datadog/trace/core/CoreSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package datadog.trace.core;

import datadog.trace.api.DDTraceId;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import java.util.Map;

public interface CoreSpan<T extends CoreSpan<T>> {
Expand All @@ -10,9 +9,7 @@ public interface CoreSpan<T extends CoreSpan<T>> {

String getServiceName();

default CharSequence getServiceNameSource() {
return null;
}
CharSequence getServiceNameSource();
Comment thread
mcculls marked this conversation as resolved.

CharSequence getOperationName();

Expand Down Expand Up @@ -62,13 +59,9 @@ default CharSequence getServiceNameSource() {

<U> U getTag(CharSequence name);

default <U> U unsafeGetTag(CharSequence name, U defaultValue) {
return getTag(name, defaultValue);
}
<U> U unsafeGetTag(CharSequence name, U defaultValue);

default <U> U unsafeGetTag(CharSequence name) {
return getTag(name);
}
<U> U unsafeGetTag(CharSequence name);

boolean hasSamplingPriority();

Expand All @@ -81,10 +74,7 @@ default <U> U unsafeGetTag(CharSequence name) {

boolean isForceKeep();

default boolean isKind(SpanKindFilter filter) {
Object kind = unsafeGetTag(Tags.SPAN_KIND);
return filter.matches(kind == null ? null : kind.toString());
}
boolean isKind(SpanKindFilter filter);

CharSequence getType();

Expand Down
10 changes: 10 additions & 0 deletions dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@ class SimpleSpan implements CoreSpan<SimpleSpan> {
return getTag(name, null)
}

@Override
<U> U unsafeGetTag(CharSequence name, U defaultValue) {
return getTag(name, defaultValue)
}

@Override
<U> U unsafeGetTag(CharSequence name) {
return getTag(name)
}

@Override
boolean hasSamplingPriority() {
return false
Expand Down
23 changes: 23 additions & 0 deletions dd-trace-core/src/test/java/datadog/trace/common/writer/TraceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
import datadog.trace.api.TagMap;
import datadog.trace.api.sampling.PrioritySampling;
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.core.CoreSpan;
import datadog.trace.core.Metadata;
import datadog.trace.core.MetadataConsumer;
import datadog.trace.core.SpanKindFilter;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
Expand Down Expand Up @@ -502,5 +504,26 @@ public PojoSpan setMetaStruct(String field, Object value) {
public int getLongRunningVersion() {
return 0;
}

@Override
public CharSequence getServiceNameSource() {
return null;
}

@Override
public boolean isKind(SpanKindFilter filter) {
Object kind = unsafeGetTag(Tags.SPAN_KIND);
return filter.matches(kind == null ? null : kind.toString());
}

@Override
public <U> U unsafeGetTag(CharSequence name, U defaultValue) {
return getTag(name, defaultValue);
}

@Override
public <U> U unsafeGetTag(CharSequence name) {
return getTag(name);
}
}
}
23 changes: 23 additions & 0 deletions dd-trace-core/src/traceAgentTest/groovy/TraceGenerator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import static datadog.trace.api.ProcessTags.tagsForSerialization
import static datadog.trace.api.TagMap.fromMap
import static datadog.trace.api.sampling.PrioritySampling.UNSET
import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND
import static java.lang.Thread.currentThread
import static java.util.Collections.emptyList

Expand All @@ -13,6 +14,7 @@ import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString
import datadog.trace.core.CoreSpan
import datadog.trace.core.Metadata
import datadog.trace.core.MetadataConsumer
import datadog.trace.core.SpanKindFilter
import java.util.concurrent.ThreadLocalRandom
import java.util.concurrent.TimeUnit

Expand Down Expand Up @@ -173,6 +175,11 @@ class TraceGenerator {
return serviceName
}

@Override
CharSequence getServiceNameSource() {
return null
}

@Override
CharSequence getOperationName() {
return operationName
Expand Down Expand Up @@ -298,6 +305,12 @@ class TraceGenerator {
return false
}

@Override
boolean isKind(SpanKindFilter filter) {
Object kind = unsafeGetTag(SPAN_KIND)
return filter.matches(kind == null ? null : kind.toString())
}

Map<String, String> getBaggage() {
return metadata.getBaggage()
}
Expand Down Expand Up @@ -394,6 +407,16 @@ class TraceGenerator {
return value as U
}

@Override
<U> U unsafeGetTag(CharSequence name, U defaultValue) {
return getTag(name, defaultValue)
}

@Override
<U> U unsafeGetTag(CharSequence name) {
return getTag(name)
}

@Override
boolean hasSamplingPriority() {
return false
Expand Down