Add Apolloconfig Inst

open-telemetry#12787
freshchen · Dec 3, 2024 · 511d12a · 511d12a
1 parent 83ce10e
commit 511d12a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/instrumentation/apolloconfig-apolloclient-1.0/javaagent/build.gradle.kts b/instrumentation/apolloconfig-apolloclient-1.0/javaagent/build.gradle.kts
@@ -6,7 +6,7 @@ muzzle {
   pass {
     group.set("com.ctrip.framework.apollo")
     module.set("apollo-client")
-    versions.set("[1.0.0,2.3.0]")
+    versions.set("[1.0.0,)")
     assertInverse.set(true)
   }
 }
@@ -15,15 +15,8 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  library("com.ctrip.framework.apollo:apollo-client:1.1.0")
+  library("com.ctrip.framework.apollo:apollo-client:1.0.0")
+  testCompileOnly("com.ctrip.framework.apollo:apollo-client:1.1.0")
 
   testImplementation(project(":testing-common"))
-
-  latestDepTestLibrary("com.ctrip.framework.apollo:apollo-client:1.1.+")
-}
-
-tasks.withType<Test>().configureEach {
-  // required on jdk17
-  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
-  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 }
diff --git a/.../javaagent/instrumentation/apolloconfig/apolloclient/v1_0/ApolloRepositoryChangeTest.java b/.../javaagent/instrumentation/apolloconfig/apolloclient/v1_0/ApolloRepositoryChangeTest.java
@@ -33,10 +33,6 @@ void fireRepositoryChangeTest() {
     testConfigRepository.addChangeListener(new TestRepositoryChangeListener());
     testConfigRepository.sync();
 
-    checkRepositoryChange(namespace);
-  }
-
-  private static void checkRepositoryChange(String namespace) {
     testing.waitAndAssertTraces(
         trace ->
             trace.hasSpansSatisfyingExactly(