Merge remote-tracking branch 'origin/master'

XiaoMi · Jul 14, 2023 · 6f81b78 · 6f81b78
2 parents 2ac83dd + a162401
commit 6f81b78
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/hera-all/opentelemetry-java-instrumentation/README.md b/hera-all/opentelemetry-java-instrumentation/README.md
@@ -94,4 +94,4 @@
 ## Opentelemetry-java
 更多细节、配置、设计原理可以查看开源版opentelemetry-java-instrumentation：
 
-https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.3.x
+https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/v1.3.x
diff --git a/...trumentation/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle b/...trumentation/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle
@@ -11,7 +11,9 @@ muzzle {
 dependencies {
   implementation project(':instrumentation:apache-dubbo-2.7:library')
 
-  library "org.apache.dubbo:dubbo:2.7.0"
+  library("org.apache.dubbo:dubbo:2.7.0"){
+    exclude group: 'com.alibaba.spring', module: 'spring-context-support'
+  }
 
   testImplementation project(':instrumentation:apache-dubbo-2.7:testing')
 

diff --git a/...-instrumentation/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle b/...-instrumentation/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle
@@ -1,7 +1,9 @@
 apply plugin: "otel.library-instrumentation"
 
 dependencies {
-  library "org.apache.dubbo:dubbo:2.7.0"
+  library("org.apache.dubbo:dubbo:2.7.0"){
+    exclude group: 'com.alibaba.spring', module: 'spring-context-support'
+  }
 
   testImplementation project(':instrumentation:apache-dubbo-2.7:testing')
 

diff --git a/...-instrumentation/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle b/...-instrumentation/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle
@@ -9,7 +9,9 @@ def apacheDubboVersion = '2.7.5'
 dependencies {
   api project(':testing-common')
 
-  api "org.apache.dubbo:dubbo:${apacheDubboVersion}"
+  api ("org.apache.dubbo:dubbo:${apacheDubboVersion}") {
+    exclude group: 'com.alibaba.spring', module: 'spring-context-support'
+  }
   api "org.apache.dubbo:dubbo-config-api:${apacheDubboVersion}"
 
   implementation "javax.annotation:javax.annotation-api:1.3.2"

diff --git a/hera-all/trace-etl/trace-etl-service/pom.xml b/hera-all/trace-etl/trace-etl-service/pom.xml
@@ -79,6 +79,12 @@
             <groupId>run.mone</groupId>
             <artifactId>dubbo</artifactId>
             <version>2.7.12-mone-v8-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.spring</groupId>
+                    <artifactId>spring-context-support</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -99,9 +105,9 @@
         </dependency>
         <!-- nacos -->
         <dependency>
-            <groupId>com.alibaba.spring</groupId>
+            <groupId>run.mone</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>1.0.10</version>
+            <version>1.0.10-mone-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>run.mone</groupId>
@@ -151,6 +157,10 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.alibaba.spring</groupId>
+                    <artifactId>spring-context-support</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>