Skip to content

Commit 3ab5e7e

Browse files
committed
Add ErrorPriorities for manual instrumentation and tag interceptor
1 parent 33422a3 commit 3ab5e7e

File tree

5 files changed

+9
-4
lines changed
  • dd-java-agent/instrumentation/opentracing
    • api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31
    • api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32
  • dd-trace-core/src/main/java/datadog/trace/core/taginterceptor
  • dd-trace-ot/src/main/java/datadog/opentracing
  • internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api

5 files changed

+9
-4
lines changed

dd-java-agent/instrumentation/opentracing/api-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import datadog.trace.api.interceptor.MutableSpan;
44
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
5+
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
56
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
67
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
78
import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -73,7 +74,7 @@ public boolean isError() {
7374

7475
@Override
7576
public OTSpan setError(final boolean value) {
76-
delegate.setError(value);
77+
delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
7778
return this;
7879
}
7980

dd-java-agent/instrumentation/opentracing/api-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import datadog.trace.api.interceptor.MutableSpan;
44
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
5+
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
56
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
67
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
78
import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -74,7 +75,7 @@ public boolean isError() {
7475

7576
@Override
7677
public OTSpan setError(final boolean value) {
77-
delegate.setError(value);
78+
delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
7879
return this;
7980
}
8081

dd-trace-core/src/main/java/datadog/trace/core/taginterceptor/TagInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private boolean interceptDbStatement(DDSpanContext span, Object value) {
217217
}
218218

219219
private boolean interceptError(DDSpanContext span, Object value) {
220-
span.setErrorFlag(asBoolean(value), ErrorPriorities.DEFAULT);
220+
span.setErrorFlag(asBoolean(value), ErrorPriorities.TAG_INTERCEPTOR);
221221
return true;
222222
}
223223

dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import datadog.trace.api.interceptor.MutableSpan;
44
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
5+
import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
56
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
67
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
78
import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -73,7 +74,7 @@ public boolean isError() {
7374

7475
@Override
7576
public OTSpan setError(final boolean value) {
76-
delegate.setError(value);
77+
delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
7778
return this;
7879
}
7980

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ErrorPriorities.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ public class ErrorPriorities {
55
public static final byte HTTP_SERVER_DECORATOR = -1;
66

77
public static final byte DEFAULT = 0;
8+
public static final byte TAG_INTERCEPTOR = 1;
9+
public static final byte MANUAL_INSTRUMENTATION = 2;
810
}

0 commit comments

Comments
 (0)