From daf58f3ecbe329c1fb15bea6b6f226e383f4e1d5 Mon Sep 17 00:00:00 2001
From: gzlicanyi <gzlicanyi@163.com>
Date: Fri, 26 May 2023 16:53:02 +0800
Subject: [PATCH 1/2] Fix the gson dependency in the kafka-reporter-plugin.
 (#10848)

---
 CHANGES.md                                          |  1 +
 .../kafka-reporter-plugin/pom.xml                   | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b87d8aa5ba..a0b3338e91 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Release Notes.
 * Support Grizzly Trace
 * Fix possible IllegalStateException when using Micrometer.
 * Support Grizzly Work ThreadPool Metric Monitor
+* Fix the gson dependency in the kafka-reporter-plugin.
 
 #### Documentation
 
diff --git a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
index a0f4fd92d8..bac27707d0 100644
--- a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
+++ b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
@@ -28,12 +28,21 @@
     <artifactId>kafka-reporter-plugin</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <shade.com.google.source>com.google</shade.com.google.source>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
             <version>${kafka-clients.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+        </dependency>
     </dependencies>
 
 
@@ -76,6 +85,10 @@
                                     <pattern>org.slf4j</pattern>
                                     <shadedPattern>${shade.package}/org.slf4j</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>${shade.com.google.source}</pattern>
+                                    <shadedPattern>${shade.package}.${shade.com.google.source}</shadedPattern>
+                                </relocation>
                             </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

From 9a1ad5dc562037493b1c7f69e178aa5c0b05b376 Mon Sep 17 00:00:00 2001
From: gzlicanyi <gzlicanyi@163.com>
Date: Fri, 26 May 2023 18:17:06 +0800
Subject: [PATCH 2/2] Fix the gson dependency by maven-shade-plugin in the
 kafka-reporter-plugin.

---
 .../kafka-reporter-plugin/pom.xml                   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
index bac27707d0..ec7d4cb272 100644
--- a/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
+++ b/apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
@@ -28,21 +28,12 @@
     <artifactId>kafka-reporter-plugin</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <shade.com.google.source>com.google</shade.com.google.source>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
             <version>${kafka-clients.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
     </dependencies>
 
 
@@ -86,8 +77,8 @@
                                     <shadedPattern>${shade.package}/org.slf4j</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>${shade.com.google.source}</pattern>
-                                    <shadedPattern>${shade.package}.${shade.com.google.source}</shadedPattern>
+                                    <pattern>com.google.gson</pattern>
+                                    <shadedPattern>${shade.package}.com.google.gson</shadedPattern>
                                 </relocation>
                             </relocations>
                             <transformers>