Merge branch 'otel-fork-updated' into correct-history

microsoft · Apr 15, 2021 · 8c1e4b4 · 8c1e4b4
2 parents 5d92c91 + 82ebd19
commit 8c1e4b4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/...-sdk/javaagent/azure-sdk-javaagent.gradle → ...avaagent/azure-core-1.14-javaagent.gradle b/...-sdk/javaagent/azure-sdk-javaagent.gradle → ...avaagent/azure-core-1.14-javaagent.gradle
@@ -1,5 +1,14 @@
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
+muzzle {
+  pass {
+    group = "com.azure"
+    module = "azure-core"
+    versions = "[1.13.0,)"
+    assertInverse = true
+  }
+}
+
 configurations {
   testRuntime.exclude group: "com.azure", module: "azure-core-tracing-opentelemetry"
 }
@@ -9,5 +18,5 @@ dependencies {
     exclude(group: "com.azure", module: "azure-core")
   }
 
-  library group: "com.azure", name: "azure-core", version: "1.14.0"
+  library group: "com.azure", name: "azure-core", version: "1.13.0"
 }
diff --git a/...uresdk/AzureSdkInstrumentationModule.java → ...uresdk/AzureSdkInstrumentationModule.java b/...uresdk/AzureSdkInstrumentationModule.java → ...uresdk/AzureSdkInstrumentationModule.java
@@ -23,7 +23,7 @@
 @AutoService(InstrumentationModule.class)
 public class AzureSdkInstrumentationModule extends InstrumentationModule {
   public AzureSdkInstrumentationModule() {
-    super("azure-sdk");
+    super("azure-core", "azure-core-1.14");
   }
 
   @Override

diff --git a/...agent/src/test/groovy/AzureSdkTest.groovy → ...agent/src/test/groovy/AzureSdkTest.groovy b/...agent/src/test/groovy/AzureSdkTest.groovy → ...agent/src/test/groovy/AzureSdkTest.groovy
diff --git a/...agent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java b/...agent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/InstrumentationModule.java
@@ -50,9 +50,6 @@ public abstract class InstrumentationModule {
   private static final Logger log = LoggerFactory.getLogger(InstrumentationModule.class);
   private static final Logger muzzleLog = LoggerFactory.getLogger("muzzleMatcher");
 
-  private static boolean classLoaderOptimizationOptOutFlag =
-      Boolean.getBoolean("classLoaderOptimizationOptOut");
-
   private static final String[] EMPTY = new String[0];
 
   // Added here instead of AgentInstaller's ignores because it's relatively
@@ -140,7 +137,6 @@ public final AgentBuilder instrument(AgentBuilder parentAgentBuilder) {
     InstrumentationContextProvider contextProvider = getContextProvider();
 
     AgentBuilder agentBuilder = parentAgentBuilder;
-    log.info("classLoaderOptimizationOptOutFlag: {}", classLoaderOptimizationOptOutFlag);
     for (TypeInstrumentation typeInstrumentation : typeInstrumentations) {
       AgentBuilder.Identified.Extendable extendableAgentBuilder =
           agentBuilder
@@ -149,10 +145,7 @@ public final AgentBuilder instrument(AgentBuilder parentAgentBuilder) {
                       typeInstrumentation.typeMatcher(),
                       "Instrumentation type matcher unexpected exception: " + getClass().getName()),
                   failSafe(
-                      classLoaderOptimizationOptOutFlag
-                          ? moduleClassLoaderMatcher
-                          : moduleClassLoaderMatcher.and(
-                              typeInstrumentation.classLoaderOptimization()),
+                      moduleClassLoaderMatcher.and(typeInstrumentation.classLoaderOptimization()),
                       "Instrumentation class loader matcher unexpected exception: "
                           + getClass().getName()))
               .and(NOT_DECORATOR_MATCHER)

diff --git a/settings.gradle b/settings.gradle
@@ -75,7 +75,7 @@ include ':instrumentation:azure-functions:javaagent'
 include ':instrumentation:azure-functions:javaagent-unittests'
 include ':instrumentation:cassandra:cassandra-3.0:javaagent'
 include ':instrumentation:cassandra:cassandra-4.0:javaagent'
-include ':instrumentation:azure-sdk:javaagent' // out of order to avoid merge conflict with azure-functions instrumentation
+include ':instrumentation:azure-core-1.14:javaagent' // out of order to avoid merge conflict with azure-functions instrumentation
 include ':instrumentation:cdi-testing'
 include ':instrumentation:classloaders:javaagent'
 include ':instrumentation:classloaders:javaagent-integration-tests'