You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/05/07 08:02:00 UTC
[skywalking] branch master updated: Avoid NPE in ElasticSearch 5
client due to version mismatch. (#6863)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 667f3be Avoid NPE in ElasticSearch 5 client due to version mismatch. (#6863)
667f3be is described below
commit 667f3be3bf200016858f5388df643e08eda7f308
Author: Ax1an <ax...@foxmail.com>
AuthorDate: Fri May 7 16:01:42 2021 +0800
Avoid NPE in ElasticSearch 5 client due to version mismatch. (#6863)
---
CHANGES.md | 1 +
.../elasticsearch/v6/define/RestHighLevelClientInstrumentation.java | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 7da895a..f80e5cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Release Notes.
* Add `spring-cloud-gateway-3.x` optional plugin.
* Add `okhttp-4.x` plugin.
* Fix NPE when thrift field is nested in plugin `thrift`
+* Fix possible NullPointerException in agent's ES plugin.
#### OAP-Backend
* BugFix: filter invalid Envoy access logs whose socket address is empty.
diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java
index 7c2bbee..6adb02e 100644
--- a/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java
+++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java
@@ -257,4 +257,9 @@ public class RestHighLevelClientInstrumentation extends ClassEnhancePluginDefine
public StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() {
return new StaticMethodsInterceptPoint[0];
}
+
+ @Override
+ protected String[] witnessClasses() {
+ return new String[] {Constants.TASK_TRANSPORT_CHANNEL_WITNESS_CLASSES};
+ }
}