fix: shade async-profiler packages

apache · Nov 5, 2024 · 9806c91 · 9806c91
1 parent 39b2397
commit 9806c91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
@@ -53,6 +53,8 @@
         <shade.org.slf4j.target>${shade.package}.${shade.org.slf4j.source}</shade.org.slf4j.target>
         <ststem-rules.version>1.18.0</ststem-rules.version>
         <slf4j.version>1.7.25</slf4j.version>
+        <shade.one.profiler.source>one.profiler</shade.one.profiler.source>
+        <shade.one.profiler.target>${shade.package}.${shade.one.profiler.source}</shade.one.profiler.target>
     </properties>
 
     <dependencies>
@@ -226,6 +228,7 @@
                                     <exclude>org.checkerframework:checker-compat-qual:jar:</exclude>
                                     <exclude>org.checkerframework:checker-qual:jar:</exclude>
                                     <exclude>org.codehaus.mojo:animal-sniffer-annotations:jar:</exclude>
+<!--                                    <exclude>tools.profiler:async-profiler:jar:</exclude>-->
                                 </excludes>
                             </artifactSet>
                             <relocations>
@@ -253,6 +256,10 @@
                                     <pattern>${shade.org.slf4j.source}</pattern>
                                     <shadedPattern>${shade.org.slf4j.target}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>${shade.one.profiler.source}</pattern>
+                                    <shadedPattern>${shade.one.profiler.target}</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>

diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
@@ -38,8 +38,6 @@
         <can.retransform.classes>true</can.retransform.classes>
         <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
         <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
-        <shade.one.profiler.source>one.profiler</shade.one.profiler.source>
-        <shade.one.profiler.target>${shade.package}.${shade.one.profiler.source}</shade.one.profiler.target>
     </properties>
 
     <dependencies>
@@ -94,17 +92,14 @@
                                     <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
                                     <exclude>io.perfmark:*</exclude>
                                     <exclude>org.slf4j:*</exclude>
+                                    <exclude>tools.profiler:async-profiler</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>${shade.net.bytebuddy.source}</pattern>
                                     <shadedPattern>${shade.net.bytebuddy.target}</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>${shade.one.profiler.source}</pattern>
-                                    <shadedPattern>${shade.one.profiler.target}</shadedPattern>
-                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>