Merge pull request #179 from jd-opensource/170-support-custom-conditi…

…on-to-simplify-configuration update shaded
jd-opensource · Dec 18, 2024 · b6ccb69 · b6ccb69
2 parents d39c6e7 + a162936
commit b6ccb69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/NOTICE b/NOTICE
@@ -79,10 +79,9 @@ joylive-event-opentelemetry
     javax.annotation -> com.jd.live.agent.shaded.javax.annotation
     org.codehaus -> com.jd.live.agent.shaded.org.codehaus
     org.checkerframework -> com.jd.live.agent.shaded.org.checkerframework
-    # com.squareup.okhttp3
-    # com.squareup.okio
-    com.squareup -> com.jd.live.agent.shaded.com.squareup
-    org.jetbrains.kotlin -> com.jd.live.agent.shaded.org.jetbrains.kotlin
+    okhttp3 -> com.jd.live.agent.shaded.okhttp3
+    okio -> com.jd.live.agent.shaded.okio
+    kotlin -> com.jd.live.agent.shaded.kotlin
     org.slf4j -> com.jd.live.agent.shaded.org.slf4j depend on joylive-logger-slf4j
 joylive-flowcontrol-resilience4j
     io.github.resilience4j -> com.jd.live.agent.shaded.io.github.resilience4j

diff --git a/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml b/joylive-implement/joylive-event/joylive-event-opentelemetry/pom.xml
@@ -377,14 +377,16 @@
                                     <shadedPattern>com.jd.live.agent.shaded.org.checkerframework</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <!--com.squareup.okhttp3-->
-                                    <!--com.squareup.okio-->
-                                    <pattern>com.squareup</pattern>
-                                    <shadedPattern>com.jd.live.agent.shaded.com.squareup</shadedPattern>
+                                    <pattern>okhttp3</pattern>
+                                    <shadedPattern>com.jd.live.agent.shaded.okhttp3</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.jetbrains.kotlin</pattern>
-                                    <shadedPattern>com.jd.live.agent.shaded.org.jetbrains.kotlin</shadedPattern>
+                                    <pattern>okio</pattern>
+                                    <shadedPattern>com.jd.live.agent.shaded.okio</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>kotlin</pattern>
+                                    <shadedPattern>com.jd.live.agent.shaded.kotlin</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.slf4j</pattern>