From b3125f8823a490b605c8c793e1ab9f7dd997dbd3 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Sat, 14 Oct 2017 21:20:06 +0800
Subject: [PATCH] Make the target agent as 3.3 expected

---
 apm-sniffer/apm-agent-core/pom.xml |  17 ++++
 apm-sniffer/apm-agent/pom.xml      | 144 +----------------------------
 apm-sniffer/config/agent.config    |  19 ++++
 3 files changed, 40 insertions(+), 140 deletions(-)
 create mode 100644 apm-sniffer/config/agent.config

diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index 5b995f1e9..121f579a0 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -194,6 +194,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <delete dir="${project.basedir}/../../packages"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 6018f6ecd..d947eb0cd 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -45,142 +45,7 @@
         <!-- plugin -->
         <dependency>
             <groupId>org.skywalking</groupId>
-            <artifactId>apm-jedis-2.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-jdbc-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-httpClient-4.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-dubbo-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>tomcat-7.x-8.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>motan-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-mongodb-3.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-resin-3.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-resin-4.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-okhttp-3.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-feign-default-http-9.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-resttemplate-4.3.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-spring-concurrent-util-4.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-springmvc-annotation-4.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-spring-cloud-feign-1.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-struts2-2.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-nutz-mvc-annotation-1.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-nutz-http-1.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-jetty-client-9.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-jetty-server-9.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-spymemcached-2.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-sharding-jdbc-1.5.x-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- activation -->
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-log4j-1.x-activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-log4j-2.x-activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x-activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing-activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-trace-activation</artifactId>
+            <artifactId>apm-agent-core</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -204,10 +69,6 @@
                             <createSourcesJar>true</createSourcesJar>
                             <shadeSourcesContent>true</shadeSourcesContent>
                             <transformers>
-                                <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>skywalking-plugin.def</resource>
-                                </transformer>
                                 <transformer
                                     implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
@@ -252,6 +113,9 @@
                                 <mkdir dir="${project.basedir}/../../packages/skywalking-agent"/>
                                 <copy file="${project.build.directory}/skywalking-agent.jar"
                                       tofile="${project.basedir}/../../packages/skywalking-agent/skywalking-agent.jar" overwrite="true"/>
+                                <mkdir dir="${project.basedir}/../../packages/skywalking-agent/config"/>
+                                <copydir src="${project.basedir}/../config"
+                                         dest="${project.basedir}/../../packages/skywalking-agent/config" forceoverwrite="true"/>
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
new file mode 100644
index 000000000..a81175845
--- /dev/null
+++ b/apm-sniffer/config/agent.config
@@ -0,0 +1,19 @@
+# The application name in UI
+agent.application_code=Your_ApplicationName
+
+# The number of sampled traces per 3 seconds
+# Negative number means sample traces as many as possible, most likely 100%
+# agent.sample_n_per_3_secs=-1
+
+# Ignore the segments if their operation names start with these suffix.
+# agent.ignore_suffix=.jpg,.jpeg,.js,.css,.png,.bmp,.gif,.ico,.mp3,.mp4,.html,.svg
+
+# Server addresses.
+# Mapping to `agent_server/jetty/port` in `config/application.yml` of Collector.
+# Examples：
+# Single collector：SERVERS="127.0.0.1:8080"
+# Collector cluster：SERVERS="10.2.45.126:8080,10.2.45.127:7600"
+collector.servers=127.0.0.1:10800
+
+# Logging level
+logging.level=DEBUG
-- 
GitLab