Skip to content

Commit

Permalink
Merge branch 'master' into andrea.marziali/mulesoft
Browse files Browse the repository at this point in the history
  • Loading branch information
@amarziali
amarziali authored Dec 2, 2024
2 parents 73e5753 + d7a0014 commit e18d572
Show file tree
Hide file tree
Showing 66 changed files with 3,065 additions and 214 deletions.
9 changes: 8 additions & 1 deletion ...tstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import datadog.trace.api.cache.QualifiedClassNameCache;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import java.lang.reflect.Method;
import java.net.Inet4Address;
Expand Down Expand Up @@ -86,8 +87,14 @@ public AgentScope onError(final AgentScope scope, final Throwable throwable) {
}

public AgentSpan onError(final AgentSpan span, final Throwable throwable) {
return onError(span, throwable, ErrorPriorities.DEFAULT);
}

public AgentSpan onError(final AgentSpan span, final Throwable throwable, byte errorPriority) {
if (throwable != null) {
span.addThrowable(throwable instanceof ExecutionException ? throwable.getCause() : throwable);
span.addThrowable(
throwable instanceof ExecutionException ? throwable.getCause() : throwable,
errorPriority);
}
return span;
}
Expand Down
7 changes: 2 additions & 5 deletions ...rc/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package datadog.trace.bootstrap.instrumentation.decorator


import datadog.trace.bootstrap.instrumentation.api.AgentSpan
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities
import datadog.trace.bootstrap.instrumentation.api.Tags
import datadog.trace.test.util.DDSpecification
import spock.lang.Shared
Expand Down Expand Up @@ -62,11 +63,7 @@ class BaseDecoratorTest extends DDSpecification {

then:
if (error) {
if (errorPriority != null) {
1 * span.addThrowable(error, errorPriority)
} else {
1 * span.addThrowable(error)
}
1 * span.addThrowable(error, errorPriority != null ? errorPriority : ErrorPriorities.DEFAULT)
}
0 * _

Expand Down
6 changes: 4 additions & 2 deletions .../src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import datadog.trace.api.cache.DDCaches;
import datadog.trace.api.naming.SpanNaming;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes;
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.bootstrap.instrumentation.decorator.ServerDecorator;
Expand Down Expand Up @@ -102,7 +103,8 @@ public <RespT, ReqT> AgentSpan onCall(final AgentSpan span, ServerCall<ReqT, Res
public AgentSpan onStatus(final AgentSpan span, final Status status) {
span.setTag("status.code", status.getCode().name());
span.setTag("status.description", status.getDescription());
return span.setError(SERVER_ERROR_STATUSES.get(status.getCode().value()));
return span.setError(
SERVER_ERROR_STATUSES.get(status.getCode().value()), ErrorPriorities.HTTP_SERVER_DECORATOR);
}

public AgentSpan onClose(final AgentSpan span, final Status status) {
Expand All @@ -114,7 +116,7 @@ public AgentSpan onClose(final AgentSpan span, final Status status) {

@Override
public AgentSpan onError(AgentSpan span, Throwable throwable) {
super.onError(span, throwable);
super.onError(span, throwable, ErrorPriorities.HTTP_SERVER_DECORATOR);
if (throwable instanceof StatusRuntimeException) {
onStatus(span, ((StatusRuntimeException) throwable).getStatus());
} else if (throwable instanceof StatusException) {
Expand Down
52 changes: 26 additions & 26 deletions dd-java-agent/instrumentation/aws-java-eventbridge-2.0/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,83 +186,83 @@ org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntim
org.xmlresolver:xmlresolver:4.4.3=spotbugs
software.amazon.awssdk:annotations:2.27.19=compileClasspath
software.amazon.awssdk:annotations:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:annotations:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:annotations:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:apache-client:2.27.23=testRuntimeClasspath
software.amazon.awssdk:apache-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:apache-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:auth:2.27.19=compileClasspath
software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-core:2.27.19=compileClasspath
software.amazon.awssdk:aws-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.27.19=compileClasspath
software.amazon.awssdk:aws-json-protocol:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-json-protocol:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:aws-query-protocol:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.27.19=compileClasspath
software.amazon.awssdk:checksums-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums:2.27.19=compileClasspath
software.amazon.awssdk:checksums:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:checksums:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:checksums:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.27.19=compileClasspath
software.amazon.awssdk:endpoints-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:endpoints-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:eventbridge:2.27.19=compileClasspath
software.amazon.awssdk:eventbridge:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:eventbridge:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:eventbridge:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws-eventstream:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-aws:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-aws:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.27.19=compileClasspath
software.amazon.awssdk:http-auth-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth:2.27.19=compileClasspath
software.amazon.awssdk:http-auth:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-auth:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-auth:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.27.19=compileClasspath
software.amazon.awssdk:http-client-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:http-client-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:identity-spi:2.27.19=compileClasspath
software.amazon.awssdk:identity-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:identity-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:identity-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:json-utils:2.27.19=compileClasspath
software.amazon.awssdk:json-utils:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:json-utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:json-utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.27.19=compileClasspath
software.amazon.awssdk:metrics-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:metrics-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.29.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:netty-nio-client:2.29.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:profiles:2.27.19=compileClasspath
software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:profiles:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:profiles:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:protocol-core:2.27.19=compileClasspath
software.amazon.awssdk:protocol-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:protocol-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:protocol-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:regions:2.27.19=compileClasspath
software.amazon.awssdk:regions:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:regions:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:regions:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries-spi:2.27.19=compileClasspath
software.amazon.awssdk:retries-spi:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries-spi:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries-spi:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries:2.27.19=compileClasspath
software.amazon.awssdk:retries:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:retries:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:retries:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sdk-core:2.27.19=compileClasspath
software.amazon.awssdk:sdk-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sdk-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sdk-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:sns:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:sqs:2.27.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.27.19=compileClasspath
software.amazon.awssdk:third-party-jackson-core:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:third-party-jackson-core:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:utils:2.27.19=compileClasspath
software.amazon.awssdk:utils:2.27.23=testCompileClasspath,testRuntimeClasspath
software.amazon.awssdk:utils:2.29.20=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.awssdk:utils:2.29.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
xml-apis:xml-apis:1.4.01=spotbugs
empty=spotbugsPlugins
Loading

0 comments on commit e18d572

Please sign in to comment.