Update submodule (#1628)

microsoft · Apr 15, 2021 · c745c71 · c745c71
1 parent 03d92a0
commit c745c71
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...in/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/ConfigOverride.java b/...in/java/com/microsoft/applicationinsights/agent/internal/wasbootstrap/ConfigOverride.java
@@ -47,7 +47,7 @@ static Config getConfig(Configuration config) {
             properties.put("otel.instrumentation.opentelemetry-annotations.enabled", "false");
         }
         if (!config.preview.instrumentation.azureSdk.enabled) {
-            properties.put("otel.instrumentation.azure-sdk.enabled", "false");
+            properties.put("otel.instrumentation.azure-core.enabled", "false");
         }
         properties.put("otel.propagators", DelegatingPropagatorProvider.NAME);
         // AI exporter is configured manually

diff --git a/agent/instrumentation/build.gradle b/agent/instrumentation/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-apache-httpclient-5.0', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-applicationinsights-web-2.3', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-functions', version: versions.opentelemetryInstrumentationAlpha
-    implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-sdk', version: versions.opentelemetryInstrumentationAlpha
+    implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-azure-core-1.14', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-3.0', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-cassandra-4.0', version: versions.opentelemetryInstrumentationAlpha
     implementation group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-classloaders', version: versions.opentelemetryInstrumentationAlpha

diff --git a/agent/instrumentation/gradle/dependency-locks/compileClasspath.lockfile b/agent/instrumentation/gradle/dependency-locks/compileClasspath.lockfile
@@ -10,8 +10,8 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpcl
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-5.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-applicationinsights-web-2.3:1.0.0+ai.patch.1-alpha
+io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.14:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-functions:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-sdk:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-3.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-4.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-classloaders:1.0.0+ai.patch.1-alpha

diff --git a/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile b/agent/instrumentation/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -35,8 +35,8 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpcl
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-5.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-applicationinsights-web-2.3:1.0.0+ai.patch.1-alpha
+io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-core-1.14:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-functions:1.0.0+ai.patch.1-alpha
-io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-azure-sdk:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-3.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-cassandra-4.0:1.0.0+ai.patch.1-alpha
 io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-classloaders:1.0.0+ai.patch.1-alpha

diff --git a/otel b/otel
+9 −0		instrumentation/azure-core-1.14/javaagent/azure-core-1.14-javaagent.gradle
+1 −1		...aagent/src/main/java/io/opentelemetry/javaagent/instrumentation/azuresdk/AzureSdkInstrumentationModule.java
+0 −0		instrumentation/azure-core-1.14/javaagent/src/test/groovy/AzureSdkTest.groovy
+1 −8		javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java
+1 −1		settings.gradle