Skip to content

Bump dd-trace and fix check #3276

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 1 commit into from
Nov 25, 2025
Merged

Bump dd-trace and fix check #3276

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@
<jakarta-annotation-version>2.1.0</jakarta-annotation-version>
<scribejava-version>8.3.1</scribejava-version>
<junit-version>4.13.2</junit-version>
<dd-java-agent-version>1.45.2</dd-java-agent-version>
<dd-java-agent-version>1.56.0</dd-java-agent-version>
<cucumber-version>7.2.3</cucumber-version>
<project.scm.id>github</project.scm.id>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/datadog/api/ClientSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public void setupVersion(Scenario scenario) {
world.scenario = scenario;
apiVersion = world.getVersion();
final Span span = GlobalTracer.get().activeSpan();
if (span != null) {
if (span != null && span instanceof MutableSpan) {
ArrayList<String> codeowners = new ArrayList<String>();
for (String tag : scenario.getSourceTagNames()) {
if (tag.startsWith("@team:")) {
codeowners.add("@" + tag.substring(6));
}
}
// if the agent container is not running, span is null
// if the agent container is not running or tracer not initialized, span is null or noop
MutableSpan localRootSpan = ((MutableSpan) span).getLocalRootSpan();
localRootSpan.setTag(TEST_CODEOWNERS_TAG, new Gson().toJson(codeowners));
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/datadog/api/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ public void setupClock() throws IOException {
@Before
public void setTracingTags() {
final Span span = GlobalTracer.get().activeSpan();
if (span != null) {
// if the agent container is not running, span is null
if (span != null && span instanceof MutableSpan) {
// if the agent container is not running or tracer not initialized, span is null or noop
MutableSpan localRootSpan = ((MutableSpan) span).getLocalRootSpan();
localRootSpan.setTag(TRACING_TAG_ENDPOINT, getTracingEndpoint());
localRootSpan.setOperationName(TRACING_SPAN_TYPE);
Expand Down
Loading