Update to upstream 1.2.0 (#233)

(and micrometer 1.7.0)
signalfx · May 17, 2021 · 90112d3 · 90112d3
1 parent 04e85bb
commit 90112d3
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### General Notes
+
+- OpenTelemetry Java SDK and OpenTelemetry Java Instrumentation dependencies were updated to version 1.2.0.
+- Micrometer dependency was updated to version 1.7.0.
+
 ### Breaking Changes
 
 - The Splunk Distribution of OpenTelemetry Java Instrumentation now uses the OTLP span exporter as the default. The OTLP

diff --git a/custom/build.gradle b/custom/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}")
   compileOnly("io.opentelemetry:opentelemetry-semconv:${versions.opentelemetryAlpha}")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
   annotationProcessor deps.autoservice
   compileOnly deps.autoservice
 
@@ -30,7 +30,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing:${versions.opentelemetry}")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:${versions.opentelemetryAlpha}")
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}")
-  testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}")
+  testImplementation("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
   testImplementation("io.micrometer:micrometer-core:${versions.micrometer}")
 
   testImplementation(project(':testing:common'))

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -2,13 +2,13 @@ boolean snapshot = findProperty("snapshot") == 'yes'
 
 ext {
   versions = [
-      opentelemetry              : snapshot ? "1.2.0-SNAPSHOT" : "1.1.0",
-      opentelemetryAlpha         : snapshot ? "1.2.0-alpha-SNAPSHOT" : "1.1.0-alpha",
-      opentelemetryJavaagent     : snapshot ? "1.2.0-SNAPSHOT" : '1.1.0',
-      opentelemetryJavaagentAlpha: snapshot ? "1.2.0-alpha-SNAPSHOT" : '1.1.0-alpha',
+      opentelemetry              : snapshot ? "1.3.0-SNAPSHOT" : "1.2.0",
+      opentelemetryAlpha         : snapshot ? "1.3.0-alpha-SNAPSHOT" : "1.2.0-alpha",
+      opentelemetryJavaagent     : snapshot ? "1.3.0-SNAPSHOT" : '1.2.0',
+      opentelemetryJavaagentAlpha: snapshot ? "1.3.0-alpha-SNAPSHOT" : '1.2.0-alpha',
       mockito                    : '3.8.0',
       jupiter                    : '5.7.1',
-      micrometer                 : '1.6.4'
+      micrometer                 : '1.7.0'
   ]
 
   deps = [

diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
@@ -14,9 +14,8 @@ configurations {
 dependencies {
     compileOnly("io.opentelemetry:opentelemetry-sdk:${versions.opentelemetry}")
     compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}")
-    compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
+    compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
     compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-api:${versions.opentelemetryJavaagentAlpha}")
-    compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}")
     compileOnly("net.bytebuddy:byte-buddy:1.10.10")
     annotationProcessor deps.autoservice
     compileOnly deps.autoservice

diff --git a/...rc/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java b/...rc/main/java/com/splunk/opentelemetry/commonsdbcp2/CommonsDbcp2InstrumentationModule.java
@@ -23,8 +23,8 @@
 
 import com.google.auto.service.AutoService;
 import io.micrometer.core.instrument.Metrics;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +48,7 @@ protected boolean defaultEnabled() {
   }
 
   @Override
-  protected String[] additionalHelperClassNames() {
+  public String[] getMuzzleHelperClassNames() {
     return new String[] {
       "com.splunk.opentelemetry.commonsdbcp2.DataSourceMetrics",
       "com.splunk.opentelemetry.commonsdbcp2.DataSourceMetrics$TotalConnectionsUsed"

diff --git a/...in/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java b/...in/java/com/splunk/opentelemetry/middleware/GlassfishAttributesInstrumentationModule.java
@@ -16,15 +16,15 @@
 
 package com.splunk.opentelemetry.middleware;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
 import com.sun.appserv.server.util.Version;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...c/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java b/...c/main/java/com/splunk/opentelemetry/middleware/JettyAttributesInstrumentationModule.java
@@ -16,15 +16,15 @@
 
 package com.splunk.opentelemetry.middleware;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java b/...main/java/com/splunk/opentelemetry/middleware/LibertyAttributesInstrumentationModule.java
@@ -16,16 +16,16 @@
 
 package com.splunk.opentelemetry.middleware;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.ibm.ws.kernel.productinfo.ProductInfo;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/ChannelPipelineInstrumentation.java b/...3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/ChannelPipelineInstrumentation.java
@@ -16,18 +16,18 @@
 
 package com.splunk.opentelemetry.netty.v3_8;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.CallDepthThreadLocalMap;
 import io.opentelemetry.javaagent.instrumentation.api.ContextStore;
 import io.opentelemetry.javaagent.instrumentation.api.InstrumentationContext;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.HashMap;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;

diff --git a/...tty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java b/...tty-3.8/src/main/java/com/splunk/opentelemetry/netty/v3_8/NettyInstrumentationModule.java
@@ -16,13 +16,13 @@
 
 package com.splunk.opentelemetry.netty.v3_8;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.servertiming.ServerTimingHeader;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.netty.v3_8.ChannelTraceContext;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +40,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   }
 
   @Override
-  protected String[] additionalHelperClassNames() {
+  public String[] getMuzzleHelperClassNames() {
     return new String[] {
       ServerTimingHeader.class.getName(),
       getClass().getPackage().getName() + ".ServerTimingHandler",
@@ -51,7 +51,7 @@ protected String[] additionalHelperClassNames() {
 
   // run after the upstream netty instrumentation
   @Override
-  public int getOrder() {
+  public int order() {
     return 1;
   }
 

diff --git a/...4.0/src/main/java/com/splunk/opentelemetry/netty/v4_0/ChannelPipelineInstrumentation.java b/...4.0/src/main/java/com/splunk/opentelemetry/netty/v4_0/ChannelPipelineInstrumentation.java
@@ -16,8 +16,8 @@
 
 package com.splunk.opentelemetry.netty.v4_0;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -27,8 +27,8 @@
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpServerCodec;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.CallDepthThreadLocalMap;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;

diff --git a/...tty-4.0/src/main/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationModule.java b/...tty-4.0/src/main/java/com/splunk/opentelemetry/netty/v4_0/NettyInstrumentationModule.java
@@ -16,13 +16,13 @@
 
 package com.splunk.opentelemetry.netty.v4_0;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.servertiming.ServerTimingHeader;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -41,7 +41,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   }
 
   @Override
-  protected String[] additionalHelperClassNames() {
+  public String[] getMuzzleHelperClassNames() {
     return new String[] {
       ServerTimingHeader.class.getName(),
       this.getClass().getPackage().getName() + ".ServerTimingHandler",
@@ -51,7 +51,7 @@ protected String[] additionalHelperClassNames() {
 
   // run after the upstream netty instrumentation
   @Override
-  public int getOrder() {
+  public int order() {
     return 1;
   }
 

diff --git a/.../servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java b/.../servlet/src/main/java/com/splunk/opentelemetry/servlet/ServletInstrumentationModule.java
@@ -16,9 +16,9 @@
 
 package com.splunk.opentelemetry.servlet;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.safeHasSuperType;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.safeHasSuperType;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.NameMatchers.namedOneOf;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -28,9 +28,9 @@
 import com.splunk.opentelemetry.servertiming.ServerTimingHeader;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.TextMapSetter;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -52,18 +52,21 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassesNamed("javax.servlet.Filter", "javax.servlet.http.HttpServlet");
   }
 
-  protected String[] additionalHelperClassNames() {
+  @Override
+  public String[] getMuzzleHelperClassNames() {
     return new String[] {
       ServerTimingHeader.class.getName(), getClass().getName() + "$HeadersSetter"
     };
   }
 
   // run after the upstream servlet instrumentation - server span needs to be accessible here
-  public int getOrder() {
+  @Override
+  public int order() {
     return 1;
   }
 
   // enable the instrumentation only if the server-timing header flag is on
+  @Override
   protected boolean defaultEnabled() {
     return super.defaultEnabled() && ServerTimingHeader.shouldEmitServerTimingHeader();
   }

diff --git a/.../main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java b/.../main/java/com/splunk/opentelemetry/middleware/TomcatAttributesInstrumentationModule.java
@@ -16,15 +16,15 @@
 
 package com.splunk.opentelemetry.middleware;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...c/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java b/...c/main/java/com/splunk/opentelemetry/middleware/TomeeAttributesInstrumentationModule.java
@@ -21,8 +21,8 @@
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/...main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java b/...main/java/com/splunk/opentelemetry/middleware/weblogic/WebLogicInstrumentationModule.java
@@ -16,8 +16,8 @@
 
 package com.splunk.opentelemetry.middleware.weblogic;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
 import static net.bytebuddy.matcher.ElementMatchers.isProtected;
@@ -28,9 +28,9 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -53,7 +53,7 @@ public WebLogicInstrumentationModule() {
   }
 
   @Override
-  public int getOrder() {
+  public int order() {
     // Make sure this runs after default servlet instrumentations so that server span would already
     // be available.
     return 1;
@@ -131,7 +131,7 @@ public static void start(
   }
 
   @Override
-  protected String[] additionalHelperClassNames() {
+  public String[] getMuzzleHelperClassNames() {
     String packageName = this.getClass().getPackage().getName();
 
     return new String[] {

diff --git a/...main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java b/...main/java/com/splunk/opentelemetry/middleware/WildFlyAttributesInstrumentationModule.java
@@ -16,15 +16,15 @@
 
 package com.splunk.opentelemetry.middleware;
 
-import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.ClassLoaderMatcher.hasClassesNamed;
+import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import com.google.auto.service.AutoService;
 import com.splunk.opentelemetry.javaagent.bootstrap.MiddlewareHolder;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.api.CallDepthThreadLocalMap;
-import io.opentelemetry.javaagent.tooling.InstrumentationModule;
-import io.opentelemetry.javaagent.tooling.TypeInstrumentation;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

diff --git a/testing/agent-metrics/build.gradle b/testing/agent-metrics/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   compileOnly deps.autoservice
 
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:${versions.opentelemetryJavaagentAlpha}")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-spi:${versions.opentelemetryJavaagentAlpha}")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
   compileOnly("io.micrometer:micrometer-core:${versions.micrometer}")
 }