Refactoring

Author: ValentinZakharov

dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java

@@ -243,7 +243,4 @@ public MutableSpan getLocalRootSpan() {
   public AgentSpan asAgentSpan() {
     return delegate;
   }
-
-  @Override
-  public void onSpanFinished() {}
 }

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

@@ -236,7 +236,4 @@ public int hashCode() {
   public AgentSpan asAgentSpan() {
     return delegate;
   }
-
-  @Override
-  public void onSpanFinished() {}
 }

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

@@ -243,7 +243,4 @@ public int hashCode() {
   public AgentSpan asAgentSpan() {
     return delegate;
   }
-
-  @Override
-  public void onSpanFinished() {}
 }

dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java

@@ -39,6 +39,7 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -809,7 +810,7 @@ public String toString() {
   }
 
   @Override
-  public void attachWrapper(SpanWrapper wrapper) {
+  public void attachWrapper(@NonNull SpanWrapper wrapper) {
     WRAPPER_FIELD_UPDATER.compareAndSet(this, null, wrapper);
   }
 

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

@@ -242,7 +242,4 @@ public int hashCode() {
   public AgentSpan asAgentSpan() {
     return delegate;
   }
-
-  @Override
-  public void onSpanFinished() {}
 }

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

@@ -1,5 +1,5 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
 public interface SpanWrapper {
-  void onSpanFinished();
+  default void onSpanFinished() {}
 }