From 994d11c501e82850304adcb02c1822c69c51d680 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Fri, 1 Dec 2017 22:37:34 +0800
Subject: [PATCH 1/2] Update gRPC version. And shade google opencensus in
 agent.

---
 apm-network/pom.xml                | 2 +-
 apm-sniffer/apm-agent-core/pom.xml | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apm-network/pom.xml b/apm-network/pom.xml
index f2b789728..827d302e7 100644
--- a/apm-network/pom.xml
+++ b/apm-network/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <grpc.version>1.7.0</grpc.version>
+        <grpc.version>1.8.0</grpc.version>
         <compiler.version>1.6</compiler.version>
     </properties>
 
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index 86b18ec99..93be5dad6 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jetty.version>9.4.2.v20170220</jetty.version>
-        <grpc.version>1.7.0</grpc.version>
+        <grpc.version>1.8.0</grpc.version>
         <bytebuddy.version>1.7.6</bytebuddy.version>
 
         <shade.package>org.skywalking.apm.dependencies</shade.package>
@@ -50,6 +50,8 @@
         <shade.io.grpc.target>${shade.package}.${shade.io.grpc.source}</shade.io.grpc.target>
         <shade.io.netty.source>io.netty</shade.io.netty.source>
         <shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
+        <shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
+        <shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
     </properties>
 
     <dependencies>
@@ -176,6 +178,10 @@
                                     <pattern>${shade.io.netty.source}</pattern>
                                     <shadedPattern>${shade.io.netty.target}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>${shade.io.opencensus.source}</pattern>
+                                    <shadedPattern>${shade.io.opencensus.target}</shadedPattern>
+                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>

From 0b6f430f2998268c7ea5dedb0b405a650d02830b Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Fri, 1 Dec 2017 22:54:04 +0800
Subject: [PATCH 2/2] Update netty to 4.1.17

---
 apm-network/pom.xml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/apm-network/pom.xml b/apm-network/pom.xml
index 827d302e7..cb1992737 100644
--- a/apm-network/pom.xml
+++ b/apm-network/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <grpc.version>1.8.0</grpc.version>
+        <netty.version>4.1.17.Final</netty.version>
         <compiler.version>1.6</compiler.version>
     </properties>
 
@@ -40,6 +41,20 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
             <version>${grpc.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-native-epoll</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler-proxy</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
@@ -51,6 +66,21 @@
             <artifactId>grpc-stub</artifactId>
             <version>${grpc.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -58,7 +88,7 @@
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.4.1.Final</version>
+                <version>1.5.0.Final</version>
             </extension>
         </extensions>
         <plugins>