[#8945] End of support for elasticsearch bbose client plugin

pinpoint-apm · Jun 20, 2022 · db30cc0 · db30cc0
1 parent 0304cc8
commit db30cc0
Show file tree

Hide file tree

Showing 41 changed files with 3 additions and 2,427 deletions.
diff --git a/agent/src/main/resources/profiles/local/pinpoint.config b/agent/src/main/resources/profiles/local/pinpoint.config
@@ -1196,16 +1196,6 @@ profiler.elasticsearch.enabled=true
 profiler.elasticsearch.recordDsl=true
 profiler.elasticsearch.recordESVersion=false
 
-###########################################################
-# ElasticsearchBBoss
-###########################################################
-profiler.elasticsearchbboss.enabled=true
-profiler.elasticsearchbboss.recordResult=false
-profiler.elasticsearchbboss.recordArgs=true
-profiler.elasticsearchbboss.recordDsl=true
-profiler.elasticsearchbboss.recordESVersion=true
-profiler.elasticsearchbboss.recordResponseHandlerClass=false
-profiler.elasticsearchbboss.maxDslSize=50000
 
 ###########################################################
 # JDK CompletableFuture

diff --git a/agent/src/main/resources/profiles/release/pinpoint.config b/agent/src/main/resources/profiles/release/pinpoint.config
@@ -1219,16 +1219,6 @@ profiler.elasticsearch.enabled=true
 profiler.elasticsearch.recordDsl=true
 profiler.elasticsearch.recordESVersion=false
 
-###########################################################
-# ElasticsearchBBoss
-###########################################################
-profiler.elasticsearchbboss.enabled=true
-profiler.elasticsearchbboss.recordResult=false
-profiler.elasticsearchbboss.recordArgs=true
-profiler.elasticsearchbboss.recordDsl=true
-profiler.elasticsearchbboss.recordESVersion=true
-profiler.elasticsearchbboss.recordResponseHandlerClass=false
-profiler.elasticsearchbboss.maxDslSize=50000
 
 ###########################################################
 # JDK CompletableFuture

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/trace/ServiceType.java b/commons/src/main/java/com/navercorp/pinpoint/common/trace/ServiceType.java
@@ -231,8 +231,8 @@
  * <tr><td>9160</td><td>GRPC</td></tr>
  * <tr><td>9161</td><td>GRPC_INTERNAL</td></tr>
  * <tr><td>9162</td><td>GRPC_SERVER_INTERNAL</td></tr>
- * <tr><td>9201</td><td>ElasticsearchBBoss</td></tr>
- * <tr><td>9202</td><td>ElasticsearchBBossExecutor</td></tr>
+ * <tr><td>9201</td><td>ElasticsearchBBoss @Deprecated</td></tr>
+ * <tr><td>9202</td><td>ElasticsearchBBossExecutor @Deprecated </td></tr>
  * <tr><td>9203</td><td>ELASTICSEARCH</td></tr>
  * <tr><td>9204</td><td>ELASTICSEARCH_HIGHLEVEL_CLIENT</td></tr>
  * <tr><td>9205</td><td>ELASTICSEARCH8</td></tr>

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/trace/ServiceTypeProperty.java b/commons/src/main/java/com/navercorp/pinpoint/common/trace/ServiceTypeProperty.java
@@ -24,5 +24,6 @@ public enum ServiceTypeProperty {
     QUEUE,
     RECORD_STATISTICS,
     INCLUDE_DESTINATION_ID,
+    @Deprecated
     ALIAS
 }
diff --git a/doc/modules.md b/doc/modules.md
@@ -55,7 +55,6 @@
 | Jackson Databind | jackson-databind | 2.0.6 | 2.12.3 |  |  |
 | MariaDB Connector/J | mariadb-java-client | 1.3.0 | 2.7.2 |  |  |
 | MongoDB Java Driver | mongodb-driver | 3.0.0 | 3.12.8 |  |  |
-| [Elasticsearch](https://github.com/pinpoint-apm/pinpoint/tree/master/plugins/elasticsearch-bboss) | bboss-elasticsearch-rest-jdbc | 5.6.9 | 5.8.2 |  |  |
 | Elasticsearch | elasticsearch-rest-high-level-client | 6.0.0 | 6.8.15 |  |  |
 | Datastax Java Driver | cassandra-driver-core | 2.0.10 | 3.11.0 |  |  |
 | Druid | druid | 1.0.0 | 1.2.6 |  |  |

diff --git a/plugins-it/elasticsearch-bbose-it/pom.xml b/plugins-it/elasticsearch-bbose-it/pom.xml
diff --git a/...icsearch-bbose-it/src/test/java/com/navercorp/pinpoint/plugin/elasticsearchbboss/Car.java b/...icsearch-bbose-it/src/test/java/com/navercorp/pinpoint/plugin/elasticsearchbboss/Car.java
diff --git a/...est/java/com/navercorp/pinpoint/plugin/elasticsearchbboss/ElasticsearchExecutor569IT.java b/...est/java/com/navercorp/pinpoint/plugin/elasticsearchbboss/ElasticsearchExecutor569IT.java