Fix dropwizard instrumentation (#1607)

* Fix dropwizard instrumentation

* Fix others too

instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardTracer.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.dropwizardviews;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
+
+public class DropwizardTracer extends BaseTracer {
+  private static final DropwizardTracer TRACER = new DropwizardTracer();
+
+  public static DropwizardTracer tracer() {
+    return TRACER;
+  }
+
+  public Span startSpan(String spanName) {
+    return super.startSpan(spanName, Span.Kind.INTERNAL);
+  }
+
+  @Override
+  protected String getInstrumentationName() {
+    return "io.opentelemetry.auto.dropwizard-views-0.7";
+  }
+}

instrumentation/dropwizard-views-0.7/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardViewInstrumentationModule.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.dropwizardviews;
 
+import static io.opentelemetry.javaagent.instrumentation.dropwizardviews.DropwizardTracer.tracer;
 import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
 import static java.util.Collections.singletonList;
@@ -16,11 +17,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.google.auto.service.AutoService;
 import io.dropwizard.views.View;
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.api.trace.StatusCode;
-import io.opentelemetry.api.trace.Tracer;
-import io.opentelemetry.instrumentation.api.decorator.BaseDecorator;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.instrumentation.api.SpanWithScope;
 import io.opentelemetry.javaagent.tooling.InstrumentationModule;
@@ -43,6 +40,11 @@ public final class DropwizardViewInstrumentationModule extends InstrumentationMo
     return singletonList(new ViewRendererInstrumentation());
   }
 
+  @Override
+  public String[] helperClassNames() {
+    return new String[] {packageName + ".DropwizardTracer"};
+  }
+
   private static final class ViewRendererInstrumentation implements TypeInstrumentation {
     @Override
     public ElementMatcher<ClassLoader> classLoaderMatcher() {
@@ -67,19 +69,13 @@ public final class DropwizardViewInstrumentationModule extends InstrumentationMo
   }
 
   public static class RenderAdvice {
-    private static final Tracer TRACER =
-        OpenTelemetry.getGlobalTracer("io.opentelemetry.auto.dropwizard-views-0.7");
-
-    public static Tracer tracer() {
-      return TRACER;
-    }
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static SpanWithScope onEnter(@Advice.Argument(0) View view) {
       if (!Java8BytecodeBridge.currentSpan().getSpanContext().isValid()) {
         return null;
       }
-      Span span = tracer().spanBuilder("Render " + view.getTemplateName()).startSpan();
+      Span span = tracer().startSpan("Render " + view.getTemplateName());
       return new SpanWithScope(span, span.makeCurrent());
     }
 
@@ -90,11 +86,11 @@ public final class DropwizardViewInstrumentationModule extends InstrumentationMo
         return;
       }
       Span span = spanWithScope.getSpan();
-      if (throwable != null) {
+      if (throwable == null) {
-        span.setStatus(StatusCode.ERROR);
+        tracer().end(span);
-        BaseDecorator.addThrowable(span, throwable);
+      } else {
+        tracer().endExceptionally(span, throwable);
       }
-      span.end();
       spanWithScope.closeScope();
     }
   }

instrumentation/hibernate/hibernate-3.3/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/HibernateInstrumentationModule.java

@@ -28,6 +28,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule {
     return new String[] {
       "io.opentelemetry.javaagent.instrumentation.hibernate.SessionMethodUtils",
       "io.opentelemetry.javaagent.instrumentation.hibernate.HibernateDecorator",
+      packageName + ".V3Advice",
     };
   }
 

instrumentation/hibernate/hibernate-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/HibernateInstrumentationModule.java

@@ -28,6 +28,7 @@ public class HibernateInstrumentationModule extends InstrumentationModule {
     return new String[] {
       "io.opentelemetry.javaagent.instrumentation.hibernate.SessionMethodUtils",
       "io.opentelemetry.javaagent.instrumentation.hibernate.HibernateDecorator",
+      packageName + ".V4Advice",
     };
   }
 

instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java

@@ -39,7 +39,8 @@ public class NettyInstrumentationModule extends InstrumentationModule {
       packageName + ".server.NettyRequestExtractAdapter",
       packageName + ".server.HttpServerRequestTracingHandler",
       packageName + ".server.HttpServerResponseTracingHandler",
-      packageName + ".server.HttpServerTracingHandler"
+      packageName + ".server.HttpServerTracingHandler",
+      packageName + ".AbstractNettyAdvice"
     };
   }