Commit 13f88259 authored by 吴晟's avatar 吴晟 Committed by 彭勇升 pengys
Browse files

Bug fix (#1857) 

* Fix mesh receiver doesn't update heartbeat.

* Fix bug of mesh heartbeat and rest receiver.

* Fix issue: opencensus is included in agent without shade. @tuohai666
parent 08f634b6

apm-protocol/apm-network/pom.xml

+4 −0
Original line number Diff line number Diff line
@@ -42,21 +42,25 @@ 
            <groupId>io.grpc</groupId>

            <artifactId>grpc-netty</artifactId>

            <version>${grpc.version}</version>

            <scope>provided</scope>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-protobuf</artifactId>

            <version>${grpc.version}</version>

            <scope>provided</scope>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-stub</artifactId>

            <version>${grpc.version}</version>

            <scope>provided</scope>

        </dependency>

        <dependency>

            <groupId>io.netty</groupId>

            <artifactId>netty-tcnative-boringssl-static</artifactId>

            <version>${netty-tcnative-boringssl-static.version}</version>

            <scope>provided</scope>

        </dependency>

    </dependencies>

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

+55 −36
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
  ~

  -->



<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>



    <parent>
@@ -38,8 +39,8 @@ 
        <guava.version>20.0</guava.version>

        <bytebuddy.version>1.9.2</bytebuddy.version>

        <disruptor.version>3.3.6</disruptor.version>

        <apache-httpclient.version>4.5.3</apache-httpclient.version>

        <wiremock.version>2.6.0</wiremock.version>

        <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>

        <os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>

        <shade.package>org.apache.skywalking.apm.dependencies</shade.package>

        <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>
@@ -56,7 +57,8 @@ 
        <shade.org.apache.http.source>org.apache.http</shade.org.apache.http.source>

        <shade.org.apache.http.target>${shade.package}.${shade.org.apache.http.source}</shade.org.apache.http.target>

        <shade.org.apache.commons.source>org.apache.commons</shade.org.apache.commons.source>

        <shade.org.apache.commons.target>${shade.package}.${shade.org.apache.http.source}</shade.org.apache.commons.target>

        <shade.org.apache.commons.target>${shade.package}.${shade.org.apache.http.source}

        </shade.org.apache.commons.target>

    </properties>



    <dependencies>
@@ -64,7 +66,6 @@ 
            <groupId>org.apache.skywalking</groupId>

            <artifactId>apm-network</artifactId>

            <version>${project.version}</version>



        </dependency>

        <dependency>

            <groupId>org.apache.skywalking</groupId>
@@ -76,21 +77,36 @@ 
            <artifactId>byte-buddy</artifactId>

            <version>${bytebuddy.version}</version>

        </dependency>

        <dependency>

            <groupId>net.bytebuddy</groupId>

            <artifactId>byte-buddy-agent</artifactId>

            <version>${bytebuddy.version}</version>

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>com.lmax</groupId>

            <artifactId>disruptor</artifactId>

            <version>${disruptor.version}</version>

        </dependency>

        <dependency>

            <groupId>org.apache.httpcomponents</groupId>

            <artifactId>httpclient</artifactId>

            <version>${apache-httpclient.version}</version>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-netty</artifactId>

            <version>${grpc.version}</version>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-protobuf</artifactId>

            <version>${grpc.version}</version>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-stub</artifactId>

            <version>${grpc.version}</version>

        </dependency>

        <dependency>

            <groupId>io.netty</groupId>

            <artifactId>netty-tcnative-boringssl-static</artifactId>

            <version>${netty-tcnative-boringssl-static.version}</version>

        </dependency>

        <dependency>

            <groupId>net.bytebuddy</groupId>

            <artifactId>byte-buddy-agent</artifactId>

            <version>${bytebuddy.version}</version>

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>org.eclipse.jetty</groupId>
@@ -109,7 +125,6 @@ 
            <artifactId>wiremock</artifactId>

            <version>${wiremock.version}</version>

            <scope>test</scope>



        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>
@@ -139,7 +154,6 @@ 
        </dependencies>

    </dependencyManagement>

    <build>



        <extensions>

            <extension>

                <groupId>kr.motd.maven</groupId>
@@ -185,10 +199,6 @@ 
                                    <pattern>${shade.io.opencensus.source}</pattern>

                                    <shadedPattern>${shade.io.opencensus.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.org.apache.http.source}</pattern>

                                    <shadedPattern>${shade.org.apache.http.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.org.apache.commons.source}</pattern>

                                    <shadedPattern>${shade.org.apache.commons.target}</shadedPattern>
@@ -204,7 +214,8 @@ 
                                </filter>

                            </filters>

                            <transformers>

                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />

                                <transformer

                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

                            </transformers>

                        </configuration>

                    </execution>
@@ -230,13 +241,21 @@ 
                        <configuration>

                            <target>

                                <echo message="unjar"/>

                                <unzip src="${project.build.directory}/${artifactId}-${version}.jar" dest="${project.build.directory}/unpacked/" />

                                <unzip src="${project.build.directory}/${artifactId}-${version}.jar"

                                       dest="${project.build.directory}/unpacked/"/>

                                <echo message="rename service providers in META-INF/services"/>

                                <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib" />

                                <move file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so" tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so" />

                                <move file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll" tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll" />

                                <move

                                    file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"

                                    tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib"/>

                                <move

                                    file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so"

                                    tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so"/>

                                <move

                                    file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll"

                                    tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll"/>

                                <echo message="jar back"/>

                                <jar destfile="${project.build.directory}/${artifactId}-${version}.jar" basedir="${project.build.directory}/unpacked" />

                                <jar destfile="${project.build.directory}/${artifactId}-${version}.jar"

                                     basedir="${project.build.directory}/unpacked"/>

                            </target>

                        </configuration>

                        <goals>

apm-sniffer/apm-agent/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
                                    <exclude>*:gson</exclude>

                                    <exclude>io.grpc:*</exclude>

                                    <exclude>io.netty:*</exclude>

                                    <exclude>io.opencensus:*</exclude>

                                    <exclude>com.google.*:*</exclude>

                                    <exclude>com.google.guava:guava</exclude>

                                </excludes>

oap-server/pom.xml

+11 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
        <graphql-java.version>8.0</graphql-java.version>

        <zookeeper.version>3.4.10</zookeeper.version>

        <grpc.version>1.10.0</grpc.version>

        <netty-tcnative-boringssl-static.version>2.0.7.Final</netty-tcnative-boringssl-static.version>

        <jetty.version>9.4.2.v20170220</jetty.version>

        <lombok.version>1.18.0</lombok.version>

        <h2.version>1.4.196</h2.version>
@@ -98,6 +99,11 @@ 


    <dependencyManagement>

        <dependencies>

            <dependency>

                <groupId>org.apache.skywalking</groupId>

                <artifactId>apm-network</artifactId>

                <version>${project.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.skywalking</groupId>

                <artifactId>apm-util</artifactId>
@@ -220,6 +226,11 @@ 
                <artifactId>grpc-stub</artifactId>

                <version>${grpc.version}</version>

            </dependency>

            <dependency>

                <groupId>io.netty</groupId>

                <artifactId>netty-tcnative-boringssl-static</artifactId>

                <version>${netty-tcnative-boringssl-static.version}</version>

            </dependency>

            <dependency>

                <groupId>io.grpc</groupId>

                <artifactId>grpc-testing</artifactId>

oap-server/server-library/library-buffer/pom.xml

+16 −1
Original line number Diff line number Diff line
@@ -38,7 +38,22 @@ 
        <dependency>

            <groupId>org.apache.skywalking</groupId>

            <artifactId>apm-network</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-netty</artifactId>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-protobuf</artifactId>

        </dependency>

        <dependency>

            <groupId>io.grpc</groupId>

            <artifactId>grpc-stub</artifactId>

        </dependency>

        <dependency>

            <groupId>io.netty</groupId>

            <artifactId>netty-tcnative-boringssl-static</artifactId>

        </dependency>

    </dependencies>

</project>
 
 No newline at end of file