Commit 57814379 authored by 吴晟's avatar 吴晟
Browse files

Shade akka.* in collector-worker. Prevent akka se/deserializing failure.

parent 82ccb8dc

pom.xml

+24 −1
Original line number Diff line number Diff line
@@ -53,7 +53,30 @@ 
		<scala.compiler.version>2.11.7</scala.compiler.version>

		<powermock.version>1.6.4</powermock.version>

		<docker.plugin.version>0.4.13</docker.plugin.version>

		<skywalking.version>2.1-2017</skywalking.version>



        <shade.package>com.a.eye.skywalking.dependencies</shade.package>

        <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>

        <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>

        <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>

        <shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}</shade.com.lmax.disruptor.target>

        <shade.akka.source>akka</shade.akka.source>

        <shade.akka.target>${shade.package}.${shade.akka.source}</shade.akka.target>

        <shade.scala.source>scala</shade.scala.source>

        <shade.scala.target>${shade.package}.${shade.scala.source}</shade.scala.target>

        <shade.org.agrona.source>org.agrona</shade.org.agrona.source>

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

        <shade.org.jboss.netty.source>org.jboss.netty</shade.org.jboss.netty.source>

        <shade.org.jboss.netty.target>${shade.package}.${shade.org.jboss.netty.source}</shade.org.jboss.netty.target>

        <shade.org.reactivestreams.source>org.reactivestreams</shade.org.reactivestreams.source>

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

        <shade.org.uncommons.maths.source>org.uncommons.maths</shade.org.uncommons.maths.source>

        <shade.org.uncommons.maths.target>${shade.package}.${shade.org.uncommons.maths.source}</shade.org.uncommons.maths.target>

        <shade.com.google.source>com.google</shade.com.google.source>

        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>

        <shade.io.aeron.source>io.aeron</shade.io.aeron.source>

        <shade.io.aeron.target>${shade.package}.${shade.io.aeron.source}</shade.io.aeron.target>

        <shade.com.typesafe.source>com.typesafe</shade.com.typesafe.source>

        <shade.com.typesafe.target>${shade.package}.${shade.com.typesafe.source}</shade.com.typesafe.target>

	</properties>



    <dependencies>

skywalking-collector/skywalking-collector-worker/pom.xml

+31 −0
Original line number Diff line number Diff line
@@ -45,4 +45,35 @@ 
            <scope>test</scope>

        </dependency>

    </dependencies>



    <build>

        <finalName>${artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-shade-plugin</artifactId>

                <version>2.4.1</version>

                <executions>

                    <execution>

                        <phase>package</phase>

                        <goals>

                            <goal>shade</goal>

                        </goals>

                        <configuration>

                            <shadedArtifactAttached>false</shadedArtifactAttached>

                            <createDependencyReducedPom>true</createDependencyReducedPom>

                            <createSourcesJar>true</createSourcesJar>

                            <shadeSourcesContent>true</shadeSourcesContent>

                            <relocations>

                                <relocation>

                                    <pattern>${shade.akka.source}</pattern>

                                    <shadedPattern>${shade.akka.target}</shadedPattern>

                                </relocation>

                            </relocations>

                        </configuration>

                    </execution>

                </executions>

            </plugin>

        </plugins>

    </build>

</project>

skywalking-sniffer/skywalking-agent/dependency-reduced-pom.xml

+0 −23
Original line number Diff line number Diff line
@@ -148,31 +148,8 @@ 
    </repository>

  </distributionManagement>

  <properties>

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

    <shade.com.typesafe.target>${shade.package}.${shade.com.typesafe.source}</shade.com.typesafe.target>

    <shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}</shade.com.lmax.disruptor.target>

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

    <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>

    <shade.akka.target>${shade.package}.${shade.akka.source}</shade.akka.target>

    <shade.org.jboss.netty.source>org.jboss.netty</shade.org.jboss.netty.source>

    <shade.io.aeron.target>${shade.package}.${shade.io.aeron.source}</shade.io.aeron.target>

    <shade.org.uncommons.maths.source>org.uncommons.maths</shade.org.uncommons.maths.source>

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

    <shade.scala.source>scala</shade.scala.source>

    <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>

    <shade.org.jboss.netty.target>${shade.package}.${shade.org.jboss.netty.source}</shade.org.jboss.netty.target>

    <shade.org.uncommons.maths.target>${shade.package}.${shade.org.uncommons.maths.source}</shade.org.uncommons.maths.target>

    <shade.package>com.a.eye.skywalking.dependencies</shade.package>

    <shade.com.google.source>com.google</shade.com.google.source>

    <shade.org.agrona.source>org.agrona</shade.org.agrona.source>

    <shade.scala.target>${shade.package}.${shade.scala.source}</shade.scala.target>

    <shade.com.typesafe.source>com.typesafe</shade.com.typesafe.source>

    <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>

    <shade.org.reactivestreams.source>org.reactivestreams</shade.org.reactivestreams.source>

    <shade.akka.source>akka</shade.akka.source>

    <premain.class>com.a.eye.skywalking.agent.SkyWalkingAgent</premain.class>

    <shade.io.aeron.source>io.aeron</shade.io.aeron.source>

    <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>

  </properties>

</project>

skywalking-sniffer/skywalking-agent/pom.xml

+0 −23
Original line number Diff line number Diff line
@@ -16,30 +16,7 @@ 


    <properties>

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

        <shade.package>com.a.eye.skywalking.dependencies</shade.package>

        <premain.class>com.a.eye.skywalking.agent.SkyWalkingAgent</premain.class>

        <shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>

        <shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>

        <shade.com.lmax.disruptor.source>com.lmax.disruptor</shade.com.lmax.disruptor.source>

        <shade.com.lmax.disruptor.target>${shade.package}.${shade.com.lmax.disruptor.source}</shade.com.lmax.disruptor.target>

        <shade.akka.source>akka</shade.akka.source>

        <shade.akka.target>${shade.package}.${shade.akka.source}</shade.akka.target>

        <shade.scala.source>scala</shade.scala.source>

        <shade.scala.target>${shade.package}.${shade.scala.source}</shade.scala.target>

        <shade.org.agrona.source>org.agrona</shade.org.agrona.source>

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

        <shade.org.jboss.netty.source>org.jboss.netty</shade.org.jboss.netty.source>

        <shade.org.jboss.netty.target>${shade.package}.${shade.org.jboss.netty.source}</shade.org.jboss.netty.target>

        <shade.org.reactivestreams.source>org.reactivestreams</shade.org.reactivestreams.source>

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

        <shade.org.uncommons.maths.source>org.uncommons.maths</shade.org.uncommons.maths.source>

        <shade.org.uncommons.maths.target>${shade.package}.${shade.org.uncommons.maths.source}</shade.org.uncommons.maths.target>

        <shade.com.google.source>com.google</shade.com.google.source>

        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>

        <shade.io.aeron.source>io.aeron</shade.io.aeron.source>

        <shade.io.aeron.target>${shade.package}.${shade.io.aeron.source}</shade.io.aeron.target>

        <shade.com.typesafe.source>com.typesafe</shade.com.typesafe.source>

        <shade.com.typesafe.target>${shade.package}.${shade.com.typesafe.source}</shade.com.typesafe.target>

    </properties>



    <dependencies>