Move lettuce into default plugin (#4127)

* Move lettuce into default plugin

* Fix maven pom

apm-sniffer/optional-plugins/lettuce-5.x-plugin/pom.xml → apm-sniffer/apm-sdk-plugin/lettuce-5.x-plugin/pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.skywalking</groupId>
-        <artifactId>optional-plugins</artifactId>
+        <artifactId>apm-sdk-plugin</artifactId>
         <version>7.0.0-SNAPSHOT</version>
     </parent>
 

apm-sniffer/apm-sdk-plugin/pom.xml

@@ -82,6 +82,7 @@
         <module>netty-socketio-plugin</module>
         <module>armeria-0.84.x-plugin</module>
         <module>httpclient-3.x-plugin</module>
+        <module>lettuce-5.x-plugin</module>
     </modules>
     <packaging>pom</packaging>
 

apm-sniffer/optional-plugins/pom.xml

@@ -44,7 +44,6 @@
         <module>optional-spring-plugins</module>
         <module>trace-ignore-plugin</module>
         <module>gson-2.8.x-plugin</module>
-        <module>lettuce-5.x-plugin</module>
         <module>zookeeper-3.4.x-plugin</module>
         <module>customize-enhance-plugin</module>
         <module>play-2.x-plugin</module>

docs/en/setup/service-agent/java-agent/README.md

@@ -128,7 +128,6 @@ Now, we have the following known optional plugins.
 * [Plugin of tracing Oracle and Resin](agent-optional-plugins/Oracle-Resin-plugins.md)
 * [Filter traces through specified endpoint name patterns](agent-optional-plugins/trace-ignore-plugin.md)
 * Plugin of Gson serialization lib in optional plugin folder.
-* Plugin of Lettuce 5.x(JRE 8+) in optional plugin folder. Agent is compatible in JDK 1.6+, this plugin could be used in JRE 8+, by matching the lib requirement.
 * Plugin of Zookeeper 3.4.x in optional plugin folder. The reason of being optional plugin is, many business irrelevant traces are generated, which cause extra payload to agents and backends. At the same time, those traces may be just heartbeat(s).
 * [Customize enhance](Customize-enhance-trace.md) Trace methods based on description files, rather than write plugin or change source codes.
 * Plugin of Spring Cloud Gateway 2.1.x in optional plugin folder. Please only active this plugin when you install agent in Spring Gateway. spring-cloud-gateway-2.x-plugin and spring-webflux-5.x-plugin are both required.

docs/en/setup/service-agent/java-agent/Supported-list.md

@@ -51,7 +51,7 @@
   * Redis
     * [Jedis](https://github.com/xetorthio/jedis) 2.x
     * [Redisson](https://github.com/redisson/redisson) Easy Java Redis client 3.5.2+
-    * [Lettuce](https://github.com/lettuce-io/lettuce-core) 5.x (Optional²)
+    * [Lettuce](https://github.com/lettuce-io/lettuce-core) 5.x
   * [MongoDB Java Driver](https://github.com/mongodb/mongo-java-driver) 2.13-2.14, 3.4.0-3.5.0, 3.7.x-3.11.1
   * Memcached Client
     * [Spymemcached](https://github.com/couchbase/spymemcached) 2.x

test/plugin/scenarios/lettuce-scenario/configuration.yml

@@ -19,8 +19,6 @@ entryService: http://localhost:8080/lettuce-scenario/case/lettuce-case
 healthCheck: http://localhost:8080/lettuce-scenario/case/healthCheck
 startScript: ./bin/startup.sh
 framework: lettuce
-runningMode: with_optional
-withPlugins: apm-lettuce-5.x-plugin-*.jar
 environment:
   - REDIS_SERVERS=redis-server:6379
 depends_on:

test/plugin/scenarios/lettuce-scenario/pom.xml

@@ -130,15 +130,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <url>http://repo.spring.io/snapshot</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>http://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
\ No newline at end of file