Skip to content

Commit 0290c94

Browse files
committed
Remove elasticsearch-java 7.15.x support
7.15.x (Sep 2021) had unstable API with different package structure (_core vs core, base.rest_client vs transport.rest_client). The API stabilized from 7.16.0+. Plugin now covers 7.16.x-9.x. All remaining versions verified locally.
1 parent b181999 commit 0290c94

14 files changed

Lines changed: 1 addition & 780 deletions

File tree

.github/workflows/plugins-test.2.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ jobs:
9898
- rocketmq-scenario
9999
- rocketmq-5-grpc-scenario
100100
- elasticsearch-java-scenario
101-
- elasticsearch-java-7.15.x-scenario
102101
steps:
103102
- uses: actions/checkout@v2
104103
with:

apm-sniffer/apm-sdk-plugin/elasticsearch-java-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/java/define/RestClientTransportV1Instrumentation.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

apm-sniffer/apm-sdk-plugin/elasticsearch-java-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/java/interceptor/TransportPerformRequestV1Interceptor.java

Lines changed: 0 additions & 125 deletions
This file was deleted.

apm-sniffer/apm-sdk-plugin/elasticsearch-java-plugin/src/main/resources/skywalking-plugin.def

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# Elasticsearch Java client (co.elastic.clients:elasticsearch-java) 7.15.x-9.x
18-
elasticsearch-java=org.apache.skywalking.apm.plugin.elasticsearch.java.define.RestClientTransportV1Instrumentation
17+
# Elasticsearch Java client (co.elastic.clients:elasticsearch-java) 7.16.x-9.x
1918
elasticsearch-java=org.apache.skywalking.apm.plugin.elasticsearch.java.define.RestClientTransportInstrumentation
2019
elasticsearch-java=org.apache.skywalking.apm.plugin.elasticsearch.java.define.ElasticsearchTransportBaseInstrumentation

test/plugin/scenarios/elasticsearch-java-7.15.x-scenario/bin/startup.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

test/plugin/scenarios/elasticsearch-java-7.15.x-scenario/config/expectedData.yaml

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)