[skywalking] branch oap-cluster-fix updated (06d831e -> 14628f8)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch oap-cluster-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 06d831e  Fix no stream register.
     add 0f9c27d  Revert SolrJ plugin. (#2871)
     add 14628f8  Merge branch 'master' into oap-cluster-fix

No new revisions were added by this update.

Summary of changes:
 .../network/trace/component/ComponentsDefine.java  |   3 -
 .../skywalking/apm/agent/core/conf/Config.java     |  12 -
 .../core/remote/TraceSegmentServiceClient.java     |   1 +
 .../apm/agent/core/context/TracingContextTest.java |  34 +-
 apm-sniffer/apm-sdk-plugin/pom.xml                 |   3 +-
 .../apm-sdk-plugin/solrj-7.x-plugin/pom.xml        |  47 ---
 .../apm/plugin/solrj/SolrConnectorInterceptor.java |  59 ---
 .../apm/plugin/solrj/commons/SolrjInstance.java    |  39 --
 .../apm/plugin/solrj/commons/SolrjTags.java        |  39 --
 .../solrj/define/HttpClientInstrumentation.java    |  64 ---
 .../solrj/define/SolrClientInstrumentation.java    |  75 ----
 .../src/main/resources/skywalking-plugin.def       |  18 -
 .../plugin/solrj/SolrClientInterceptorTest.java    | 428 ---------------------
 docs/en/setup/service-agent/java-agent/README.md   |   2 -
 .../service-agent/java-agent/Supported-list.md     |   1 -
 .../src/test/resources/component-libraries.yml     |   7 -
 .../src/main/resources/component-libraries.yml     |   7 -
 17 files changed, 22 insertions(+), 817 deletions(-)
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/pom.xml
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/SolrConnectorInterceptor.java
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjInstance.java
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/commons/SolrjTags.java
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/HttpClientInstrumentation.java
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/solrj/define/SolrClientInstrumentation.java
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/main/resources/skywalking-plugin.def
 delete mode 100644 apm-sniffer/apm-sdk-plugin/solrj-7.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/solrj/SolrClientInterceptorTest.java