Revert SolrJ plugin.

apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java

@@ -122,8 +122,6 @@ public class ComponentsDefine {
 
     public static final OfficialComponent RESTEASY =  new OfficialComponent(62, "RESTEasy");
 
-    public static final OfficialComponent SOLRJ =  new OfficialComponent(63, "solrj");
-
     private static ComponentsDefine INSTANCE = new ComponentsDefine();
 
     private String[] components;
@@ -181,7 +179,6 @@ public ComponentsDefine() {
         addComponent(VERTX);
         addComponent(SPRING_CLOUD_GATEWAY);
         addComponent(RESTEASY);
-        addComponent(SOLRJ);
     }
 
     private void addComponent(OfficialComponent component) {

apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java

@@ -193,17 +193,5 @@ public static class Toolkit {
              */
             public static boolean USE_QUALIFIED_NAME_AS_OPERATION_NAME = false;
         }
-
-        public static class SolrJ {
-            /**
-             * If true, trace all the query parameters(include deleteByIds and deleteByQuery) in Solr query request, default is false.
-             */
-            public static boolean TRACE_STATEMENT = false;
-
-            /**
-             * If true, trace all the operation parameters in Solr request, default is false.
-             */
-            public static boolean TRACE_OPS_PARAMS = false;
-        }
     }
 }

apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java

@@ -72,6 +72,7 @@ public void onComplete() throws Throwable {
 
     @Override
     public void shutdown() throws Throwable {
+        TracingContext.ListenerManager.remove(this);
         carrier.shutdownConsumers();
     }
 

apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/TracingContextTest.java

@@ -39,28 +39,34 @@ public static void clear() {
     @Test
     public void testSpanLimit() {
         final boolean[] dataReceived = {false};
-        TracingContext.ListenerManager.add(new TracingContextListener() {
+        TracingContextListener listener = new TracingContextListener() {
             @Override public void afterFinished(TraceSegment traceSegment) {
                 dataReceived[0] = true;
             }
-        });
-        TracingContext tracingContext = new TracingContext();
-        AbstractSpan span = tracingContext.createEntrySpan("/url");
+        };
+        TracingContext.ListenerManager.add(listener);
+        try {
+            TracingContext tracingContext = new TracingContext();
+            AbstractSpan span = tracingContext.createEntrySpan("/url");
 
-        for (int i = 0; i < 10; i++) {
-            AbstractSpan localSpan = tracingContext.createLocalSpan("/java-bean");
+            for (int i = 0; i < 10; i++) {
+                AbstractSpan localSpan = tracingContext.createLocalSpan("/java-bean");
 
-            for (int j = 0; j < 100; j++) {
-                AbstractSpan exitSpan = tracingContext.createExitSpan("/redis","localhost");
-                tracingContext.stopSpan(exitSpan);
+                for (int j = 0; j < 100; j++) {
+                    AbstractSpan exitSpan = tracingContext.createExitSpan("/redis", "localhost");
+                    tracingContext.stopSpan(exitSpan);
+                }
+
+                tracingContext.stopSpan(localSpan);
             }
 
-            tracingContext.stopSpan(localSpan);
-        }
+            tracingContext.stopSpan(span);
 
-        tracingContext.stopSpan(span);
+            Assert.assertTrue(dataReceived[0]);
+        } finally {
+            TracingContext.ListenerManager.remove(listener);
+        }
+    }
 
 
-        Assert.assertTrue(dataReceived[0]);
-    }
 }

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

@@ -73,7 +73,6 @@
         <module>dubbo-2.7.x-conflict-patch</module>
         <module>vertx-plugins</module>
         <module>resteasy-plugin</module>
-        <module>solrj-7.x-plugin</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -183,4 +182,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>