Add ErrorPriorities for manual instrumentation and tag interceptor

Author: deejgregor

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

@@ -2,6 +2,7 @@
 
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -73,7 +74,7 @@ public boolean isError() {
 
   @Override
   public OTSpan setError(final boolean value) {
-    delegate.setError(value);
+    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
     return this;
   }
 

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

@@ -2,6 +2,7 @@
 
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -74,7 +75,7 @@ public boolean isError() {
 
   @Override
   public OTSpan setError(final boolean value) {
-    delegate.setError(value);
+    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
     return this;
   }
 

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

@@ -262,7 +262,7 @@ private boolean interceptDbStatement(DDSpanContext span, Object value) {
   }
 
   private boolean interceptError(DDSpanContext span, Object value) {
-    span.setErrorFlag(asBoolean(value), ErrorPriorities.DEFAULT);
+    span.setErrorFlag(asBoolean(value), ErrorPriorities.TAG_INTERCEPTOR);
     return true;
   }
 

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

@@ -2,6 +2,7 @@
 
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
 import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
@@ -73,7 +74,7 @@ public boolean isError() {
 
   @Override
   public OTSpan setError(final boolean value) {
-    delegate.setError(value);
+    delegate.setError(value, ErrorPriorities.MANUAL_INSTRUMENTATION);
     return this;
   }
 

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

@@ -5,4 +5,6 @@ public class ErrorPriorities {
   public static final byte HTTP_SERVER_DECORATOR = -1;
 
   public static final byte DEFAULT = 0;
+  public static final byte TAG_INTERCEPTOR = 1;
+  public static final byte MANUAL_INSTRUMENTATION = 2;
 }