Remove elasticsearch.request.description
It seems to potentially have sensitive contents, so removing to be safe.
MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/TransportActionListener.java
@@ -32,9 +32,6 @@ public class TransportActionListener<T extends ActionResponse> implements Action
}
private void onRequest(final ActionRequest request) {
- if (request != null) {
- span.setTag("elasticsearch.request.description", request.getDescription());
- }
if (request instanceof IndicesRequest) {
final IndicesRequest req = (IndicesRequest) request;
if (req.indices() != null) {

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy
dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy
@@ -276,7 +276,6 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
"elasticsearch.shard.replication.total" 2
"elasticsearch.shard.replication.successful" 1
"elasticsearch.shard.replication.failed" 0
- "elasticsearch.request.description" "index {[$indexName][$indexType][1], source[{}]}"
defaultTags()
}
}

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/TransportActionListener.java
@@ -32,9 +32,6 @@ public class TransportActionListener<T extends ActionResponse> implements Action
}
private void onRequest(final ActionRequest request) {
- if (request != null) {
- span.setTag("elasticsearch.request.description", request.getDescription());
- }
if (request instanceof IndicesRequest) {
final IndicesRequest req = (IndicesRequest) request;
if (req.indices() != null) {

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy
@@ -268,7 +268,6 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
"elasticsearch.shard.replication.total" 2
"elasticsearch.shard.replication.successful" 1
"elasticsearch.shard.replication.failed" 0
- "elasticsearch.request.description" "index {[test-index][test-type][1], source[{}]}"
defaultTags()
}
}

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy
@@ -275,7 +275,6 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
"elasticsearch.shard.replication.total" 2
"elasticsearch.shard.replication.successful" 1
"elasticsearch.shard.replication.failed" 0
- "elasticsearch.request.description" "index {[test-index][test-type][1], source[{}]}"
defaultTags()
}
}

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/TransportActionListener.java
@@ -36,9 +36,6 @@ public class TransportActionListener<T extends ActionResponse> implements Action
}
private void onRequest(final ActionRequest request) {
- if (request != null) {
- span.setTag("elasticsearch.request.description", request.getDescription());
- }
if (request instanceof IndicesRequest) {
final IndicesRequest req = (IndicesRequest) request;
if (req.indices() != null) {

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy
@@ -249,7 +249,6 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
"elasticsearch.shard.replication.total" 2
"elasticsearch.shard.replication.successful" 1
"elasticsearch.shard.replication.failed" 0
- "elasticsearch.request.description" "index {[test-index][test-type][1], source[{}]}"
defaultTags()
}
}

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy
@@ -273,7 +273,6 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
"elasticsearch.shard.replication.total" 2
"elasticsearch.shard.replication.successful" 1
"elasticsearch.shard.replication.failed" 0
- "elasticsearch.request.description" "index {[test-index][test-type][1], source[{}]}"
defaultTags()
}
}

Remove elasticsearch.request.description

It seems to potentially have sensitive contents, so removing to be safe.