From 76806a27985e4203386d736a3fa7e8dcc20f9d52 Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Thu, 29 Jun 2017 22:56:27 +0800
Subject: [PATCH 1/2] Fix issue that skywalking-agent.jar include the google
 class  and exclude the proto files inside protobuf-java

---
 apm-sniffer/apm-agent-core/pom.xml | 8 ++++++++
 apm-sniffer/apm-agent/pom.xml      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index d762b4c1d..3c87124fb 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -140,6 +140,14 @@
                                     <shadedPattern>${shade.io.netty.target}</shadedPattern>
                                 </relocation>
                             </relocations>
+                            <filters>
+                                <filter>
+                                    <artifact>com.google.protobuf:protobuf-java</artifact>
+                                    <excludes>
+                                        <exclude>google/</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 680c2d932..b07bef698 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -151,7 +151,7 @@
                                     <exclude>*:gson</exclude>
                                     <exclude>io.grpc:*</exclude>
                                     <exclude>io.netty:*</exclude>
-                                    <exclude>com.google.protobuf:*</exclude>
+                                    <exclude>com.google.*:*</exclude>
                                     <exclude>com.google.guava:guava</exclude>
                                 </excludes>
                             </artifactSet>

From 268509deb4a4b25a9054244110101dafb855486c Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Fri, 30 Jun 2017 08:13:06 +0800
Subject: [PATCH 2/2] let the sense of filter more clear

---
 apm-sniffer/apm-agent-core/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index 3c87124fb..ab9c00f09 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -144,7 +144,8 @@
                                 <filter>
                                     <artifact>com.google.protobuf:protobuf-java</artifact>
                                     <excludes>
-                                        <exclude>google/</exclude>
+                                        <exclude>google/protobuf/*.proto</exclude>
+                                        <exclude>google/protobuf/compiler/*.proto</exclude>
                                     </excludes>
                                 </filter>
                             </filters>