Commit 8bc03bdd authored by 吴晟's avatar 吴晟
Browse files

Merge branch 'fix/gRPC-1.8.0' 

* fix/gRPC-1.8.0:
  Update netty to 4.1.17
  Update gRPC version. And shade google opencensus in agent.
parents 0afd4bc2 0b6f430f

apm-network/pom.xml

+32 −2
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 


    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <grpc.version>1.7.0</grpc.version>

        <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>

apm-sniffer/apm-agent-core/pom.xml

+7 −1
Original line number Diff line number Diff line
@@ -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>