diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
index 46962e53b8e..720977facfd 100644
--- a/agent/agent-bootstrap/gradle.lockfile
+++ b/agent/agent-bootstrap/gradle.lockfile
@@ -9,9 +9,9 @@ com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=
diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/agent-for-testing/gradle.lockfile
+++ b/agent/agent-for-testing/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
index 8d05a996a17..707a65e1861 100644
--- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
+++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
@@ -4,9 +4,9 @@
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.14.0=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
index 8d05a996a17..707a65e1861 100644
--- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
+++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -4,9 +4,9 @@
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.14.0=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
+++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile
+++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
index b3881597541..9d0d88f94c6 100644
--- a/agent/agent-profiler/agent-alerting/gradle.lockfile
+++ b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -3,9 +3,9 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
new file mode 100644
index 00000000000..c7d84f1f076
--- /dev/null
+++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
@@ -0,0 +1,10 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
+com.google.guava:guava-bom:31.1-jre=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
+org.junit:junit-bom:5.8.2=runtimeClasspath
+empty=
diff --git a/agent/agent-profiler/agent-profiler-api/gradle.lockfile b/agent/agent-profiler/agent-profiler-api/gradle.lockfile
index b3f55f135ed..6b3be6bf75b 100644
--- a/agent/agent-profiler/agent-profiler-api/gradle.lockfile
+++ b/agent/agent-profiler/agent-profiler-api/gradle.lockfile
@@ -13,9 +13,9 @@ com.fasterxml.woodstox:woodstox-core:6.2.7=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 io.projectreactor:reactor-core:3.4.17=runtimeClasspath
 org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
diff --git a/agent/agent-profiler/agent-service-profiler/gradle.lockfile b/agent/agent-profiler/agent-service-profiler/gradle.lockfile
index 59aca558244..73e539e4401 100644
--- a/agent/agent-profiler/agent-service-profiler/gradle.lockfile
+++ b/agent/agent-profiler/agent-service-profiler/gradle.lockfile
@@ -40,9 +40,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport:4.1.76.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
 io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
 io.projectreactor:reactor-core:3.4.17=runtimeClasspath
diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts
index 6362c90e543..8a0ff8ac029 100644
--- a/agent/agent-tooling/build.gradle.kts
+++ b/agent/agent-tooling/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
   compileOnly(project(":agent:agent-bootstrap"))
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
 
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
@@ -83,7 +83,7 @@ dependencies {
   testImplementation(project(":agent:agent-bootstrap"))
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
-  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
+  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
 
   testImplementation("org.junit.jupiter:junit-jupiter")
   testImplementation("com.azure:azure-core-test")
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
index 9153310c984..9113a1eee50 100644
--- a/agent/agent-tooling/gradle.lockfile
+++ b/agent/agent-tooling/gradle.lockfile
@@ -51,9 +51,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport:4.1.76.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
 io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
 io.projectreactor:reactor-core:3.4.17=runtimeClasspath
@@ -65,7 +65,6 @@ org.apache.commons:commons-lang3:3.11=runtimeClasspath
 org.apache.commons:commons-text:1.9=runtimeClasspath
 org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
-org.ow2.asm:asm:9.1=runtimeClasspath
 org.reactivestreams:reactive-streams:1.0.3=runtimeClasspath
 org.slf4j:jcl-over-slf4j:1.7.36=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java
index 1f57c992783..beb75472acf 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AfterAgentListener.java
@@ -23,7 +23,6 @@
 
 import com.google.auto.service.AutoService;
 import com.microsoft.applicationinsights.agent.internal.httpclient.LazyHttpClient;
-import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.extension.AgentListener;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 
@@ -37,8 +36,7 @@ public static void setAppIdSupplier(AppIdSupplier appIdSupplier) {
   }
 
   @Override
-  public void afterAgent(
-      Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
+  public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
     // only safe now to resolve app id because SSL initialization
     // triggers loading of java.util.logging (starting with Java 8u231)
     // and JBoss/Wildfly need to install their own JUL manager before JUL is initialized.
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
index 3d3d46d7e60..3679f226800 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java
@@ -26,18 +26,18 @@
 import com.google.auto.service.AutoService;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.legacyheaders.DelegatingPropagatorProvider;
-import io.opentelemetry.javaagent.extension.config.ConfigCustomizer;
+import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-@AutoService(ConfigCustomizer.class)
-public class AiConfigCustomizer implements ConfigCustomizer {
+@AutoService(ConfigPropertySource.class)
+public class AiConfigCustomizer implements ConfigPropertySource {
 
   @Override
-  public Map<String, String> defaultProperties() {
+  public Map<String, String> getProperties() {
     Configuration config = FirstEntryPoint.getConfiguration();
 
     Map<String, String> properties = new HashMap<>();
@@ -198,7 +198,9 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
     properties.put("otel.instrumentation.netty-4.1.enabled", "true");
 
     properties.put("otel.instrumentation.okhttp.enabled", "true");
-    properties.put("otel.instrumentation.opentelemetry-annotations.enabled", "true");
+    properties.put("otel.instrumentation.opentelemetry-extension-annotations.enabled", "true");
+    properties.put(
+        "otel.instrumentation.opentelemetry-instrumentation-annotations.enabled", "true");
     properties.put("otel.instrumentation.opentelemetry-api.enabled", "true");
     properties.put("otel.instrumentation.opentelemetry-instrumentation-api.enabled", "true");
     properties.put("otel.instrumentation.reactor.enabled", "true");
@@ -207,7 +209,6 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
 
     properties.put("otel.instrumentation.servlet.enabled", "true");
     properties.put("otel.instrumentation.spring-core.enabled", "true");
-    properties.put("otel.instrumentation.spring-jms.enabled", "true");
     properties.put("otel.instrumentation.spring-web.enabled", "true");
     properties.put("otel.instrumentation.spring-webmvc.enabled", "true");
     properties.put("otel.instrumentation.spring-webflux.enabled", "true");
@@ -232,6 +233,7 @@ private static void enableInstrumentations(Configuration config, Map<String, Str
     }
     if (config.instrumentation.jms.enabled) {
       properties.put("otel.instrumentation.jms.enabled", "true");
+      properties.put("otel.instrumentation.spring-jms.enabled", "true");
     }
     if (config.instrumentation.kafka.enabled) {
       properties.put("otel.instrumentation.kafka.enabled", "true");
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiIgnoreMatcherProvider.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiIgnoreMatcherProvider.java
index c62a2cdf9ec..a881592e0af 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiIgnoreMatcherProvider.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiIgnoreMatcherProvider.java
@@ -22,15 +22,15 @@
 package com.microsoft.applicationinsights.agent.internal.init;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class AiIgnoreMatcherProvider implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(Config config, IgnoredTypesBuilder builder) {
+  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
     builder.ignoreClass("com.microsoft.applicationinsights.agent.");
   }
 }
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/agent/gradle.lockfile
+++ b/agent/agent/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/azure-monitor-exporter/build.gradle.kts b/agent/azure-monitor-exporter/build.gradle.kts
index a8d78ae3099..d83d35fba59 100644
--- a/agent/azure-monitor-exporter/build.gradle.kts
+++ b/agent/azure-monitor-exporter/build.gradle.kts
@@ -35,11 +35,11 @@ dependencies {
 
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
 
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
-  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
+  testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
 
   testImplementation("org.junit.jupiter:junit-jupiter")
   testImplementation("com.azure:azure-core-test")
diff --git a/agent/azure-monitor-exporter/gradle.lockfile b/agent/azure-monitor-exporter/gradle.lockfile
index d50a4923c6b..6a0213d430f 100644
--- a/agent/azure-monitor-exporter/gradle.lockfile
+++ b/agent/azure-monitor-exporter/gradle.lockfile
@@ -41,9 +41,9 @@ io.netty:netty-transport-native-epoll:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.76.Final=runtimeClasspath
 io.netty:netty-transport:4.1.76.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.0.18=runtimeClasspath
 io.projectreactor.netty:reactor-netty-http:1.0.18=runtimeClasspath
 io.projectreactor:reactor-core:3.4.17=runtimeClasspath
diff --git a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
index 9eaac3218e0..9489f7337d8 100644
--- a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
+++ b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
@@ -3,9 +3,6 @@ plugins {
 
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 muzzle {
@@ -31,7 +28,7 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
+++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions/build.gradle.kts b/agent/instrumentation/azure-functions/build.gradle.kts
index 5a739a6f638..e89c488eddd 100644
--- a/agent/instrumentation/azure-functions/build.gradle.kts
+++ b/agent/instrumentation/azure-functions/build.gradle.kts
@@ -1,9 +1,6 @@
 plugins {
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 muzzle {
@@ -17,7 +14,7 @@ val otelInstrumentationAlphaVersion: String by project
 dependencies {
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/azure-functions/gradle.lockfile
+++ b/agent/instrumentation/azure-functions/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/micrometer-1.0/build.gradle.kts b/agent/instrumentation/micrometer-1.0/build.gradle.kts
index 245f5354532..dde8f95a992 100644
--- a/agent/instrumentation/micrometer-1.0/build.gradle.kts
+++ b/agent/instrumentation/micrometer-1.0/build.gradle.kts
@@ -3,9 +3,6 @@ plugins {
 
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 muzzle {
@@ -40,7 +37,7 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/micrometer-1.0/gradle.lockfile
+++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/SpringBootActuatorIgnoredTypesConfigurer.java b/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/SpringBootActuatorIgnoredTypesConfigurer.java
index 90393a1e999..cc6e7088c12 100644
--- a/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/SpringBootActuatorIgnoredTypesConfigurer.java
+++ b/agent/instrumentation/micrometer-1.0/src/main/java/io/opentelemetry/javaagent/instrumentation/micrometer/SpringBootActuatorIgnoredTypesConfigurer.java
@@ -22,15 +22,15 @@
 package io.opentelemetry.javaagent.instrumentation.micrometer;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
 public class SpringBootActuatorIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
-  public void configure(Config config, IgnoredTypesBuilder builder) {
+  public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
     builder.allowClass("org.springframework.core.io.ClassPathResource");
     builder.allowClass("org.springframework.boot.autoconfigure.AutoConfigurationImportSelector");
   }
diff --git a/agent/instrumentation/netty-4.0/build.gradle.kts b/agent/instrumentation/netty-4.0/build.gradle.kts
index a08b308f33e..c7cdf73ea91 100644
--- a/agent/instrumentation/netty-4.0/build.gradle.kts
+++ b/agent/instrumentation/netty-4.0/build.gradle.kts
@@ -1,9 +1,6 @@
 plugins {
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 val otelInstrumentationAlphaVersion: String by project
@@ -16,7 +13,7 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/netty-4.0/gradle.lockfile b/agent/instrumentation/netty-4.0/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/netty-4.0/gradle.lockfile
+++ b/agent/instrumentation/netty-4.0/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/netty-4.1/build.gradle.kts b/agent/instrumentation/netty-4.1/build.gradle.kts
index 330db273b80..b72f9947a63 100644
--- a/agent/instrumentation/netty-4.1/build.gradle.kts
+++ b/agent/instrumentation/netty-4.1/build.gradle.kts
@@ -1,9 +1,6 @@
 plugins {
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 val otelInstrumentationAlphaVersion: String by project
@@ -16,7 +13,7 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/netty-4.1/gradle.lockfile b/agent/instrumentation/netty-4.1/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/netty-4.1/gradle.lockfile
+++ b/agent/instrumentation/netty-4.1/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/servlet/build.gradle.kts b/agent/instrumentation/servlet/build.gradle.kts
index 3c2b85a7fbd..5f520daa786 100644
--- a/agent/instrumentation/servlet/build.gradle.kts
+++ b/agent/instrumentation/servlet/build.gradle.kts
@@ -1,9 +1,6 @@
 plugins {
   id("ai.java-conventions")
   id("ai.javaagent-instrumentation")
-
-  id("io.opentelemetry.instrumentation.muzzle-generation") version "1.15.0-alpha"
-  id("io.opentelemetry.instrumentation.muzzle-check") version "1.15.0-alpha"
 }
 
 muzzle {
@@ -22,7 +19,7 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
 }
diff --git a/agent/instrumentation/servlet/gradle.lockfile b/agent/instrumentation/servlet/gradle.lockfile
index ea965bc5a51..c7d84f1f076 100644
--- a/agent/instrumentation/servlet/gradle.lockfile
+++ b/agent/instrumentation/servlet/gradle.lockfile
@@ -3,8 +3,8 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile
index ad8878aefe7..1f1e53c3a68 100644
--- a/agent/runtime-attach/gradle.lockfile
+++ b/agent/runtime-attach/gradle.lockfile
@@ -3,9 +3,9 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 net.bytebuddy:byte-buddy-agent:1.12.10=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 empty=
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3ab22e983ac..df76d07223f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -39,6 +39,8 @@ dependencies {
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
   implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.16.0-alpha")
+
   // When updating, also update dependencyManagement/dependencyManagement.gradle.kts
   // we need to use byte buddy variant that does not shade asm
   implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.10") {
diff --git a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
index 0f662d1fb7a..d575471e043 100644
--- a/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
+++ b/buildSrc/src/main/kotlin/ai.javaagent-instrumentation.gradle.kts
@@ -3,6 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
   id("ai.java-conventions")
   id("ai.shadow-conventions")
+
+  id("io.opentelemetry.instrumentation.muzzle-generation")
+  id("io.opentelemetry.instrumentation.muzzle-check")
 }
 
 val otelInstrumentationAlphaVersion: String by project
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 3621b37dfb7..e17b2bd0c4c 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -11,11 +11,11 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
-val otelVersion = "1.15.0"
+val otelVersion = "1.16.0"
 // IMPORTANT when updating opentelemetry instrumentation version, be sure to update bytebuddy version to match
-val otelInstrumentationVersion = "1.15.0"
-val otelInstrumentationAlphaVersion = "1.15.0-alpha"
-val otelContribAlphaVersion = "1.15.0-alpha"
+val otelInstrumentationVersion = "1.16.0"
+val otelInstrumentationAlphaVersion = "1.16.0-alpha"
+val otelContribAlphaVersion = "1.16.0-alpha"
 
 rootProject.extra["otelVersion"] = otelVersion
 rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
index b3881597541..9d0d88f94c6 100644
--- a/etw/java/gradle.lockfile
+++ b/etw/java/gradle.lockfile
@@ -3,9 +3,9 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.3=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.15.0-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.15.0=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.16.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.16.0=runtimeClasspath
 org.junit:junit-bom:5.8.2=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 empty=