Add ErrorPriorities level for manual instrumentation (#9387)

* Add ErrorPriorities for manual instrumentation and tag interceptor

(cherry picked from commit c26ef68)

* Set resource name and error priority to manual instrumentation for otel spans

(cherry picked from commit f573ade)

* remove tag interceptor error priority

* Test on new error priorities level

---------

Co-authored-by: DJ Gregor <[email protected]>

Author: cecile75

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java

@@ -15,6 +15,8 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper;
+import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities;
+import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
 import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
@@ -105,11 +107,11 @@ public Span setStatus(StatusCode statusCode, String description) {
     if (this.recording) {
       if (this.statusCode == UNSET) {
         this.statusCode = statusCode;
-        this.delegate.setError(statusCode == ERROR);
+        this.delegate.setError(statusCode == ERROR, ErrorPriorities.MANUAL_INSTRUMENTATION);
         this.delegate.setErrorMessage(statusCode == ERROR ? description : null);
       } else if (this.statusCode == ERROR && statusCode == OK) {
         this.statusCode = statusCode;
-        this.delegate.setError(false);
+        this.delegate.setError(false, ErrorPriorities.MANUAL_INSTRUMENTATION);
         this.delegate.setErrorMessage(null);
       }
     }
@@ -132,7 +134,7 @@ public Span recordException(Throwable exception, Attributes additionalAttributes
   @Override
   public Span updateName(String name) {
     if (this.recording) {
-      this.delegate.setResourceName(name);
+      this.delegate.setResourceName(name, ResourceNamePriorities.MANUAL_INSTRUMENTATION);
     }
     return this;
   }

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/test/groovy/datadog/trace/core/DDSpanTest.groovy

@@ -457,6 +457,11 @@ class DDSpanTest extends DDCoreSpecification {
     then:
     !span.isError()
 
+    when:
+    span.setError(true, ErrorPriorities.MANUAL_INSTRUMENTATION)
+    then:
+    span.isError()
+
     when:
     span.setError(true, Byte.MAX_VALUE)
     then:

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,5 @@ public class ErrorPriorities {
   public static final byte HTTP_SERVER_DECORATOR = -1;
 
   public static final byte DEFAULT = 0;
+  public static final byte MANUAL_INSTRUMENTATION = 1;
 }