From e236f44b122429261628d75206897d287249aaee Mon Sep 17 00:00:00 2001
From: Emanuele Palazzetti <emanuele.palazzetti@datadoghq.com>
Date: Tue, 1 Aug 2017 11:46:50 +0200
Subject: [PATCH] [mongo] update the db.statement tag to use the quantized
 query

---
 .../datadoghq/trace/agent/integration/MongoHelper.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java
index 1d9bcf21e0..f965823ca6 100644
--- a/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java
+++ b/dd-java-agent/src/main/java/com/datadoghq/trace/agent/integration/MongoHelper.java
@@ -5,6 +5,7 @@ import com.mongodb.MongoClientOptions;
 import com.mongodb.event.CommandStartedEvent;
 import io.opentracing.Span;
 import io.opentracing.contrib.mongo.TracingCommandListener;
+import io.opentracing.tag.Tags;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -50,8 +51,14 @@ public class MongoHelper extends DDAgentTracingHelper<MongoClientOptions.Builder
 
   public void decorate(final Span span, final CommandStartedEvent event) {
     try {
+      // normalize the Mongo command so that parameters are removed from the string
       final BsonDocument normalized = norm(event.getCommand());
-      span.setTag(DDTags.RESOURCE_NAME, normalized.toString());
+      final String mongoCmd = normalized.toString();
+
+      // add specific resource name and replace the `db.statement` OpenTracing
+      // tag with the quantized version of the Mongo command
+      span.setTag(DDTags.RESOURCE_NAME, mongoCmd);
+      span.setTag(Tags.DB_STATEMENT.getKey(), mongoCmd);
     } catch (final Throwable e) {
       log.warn("Couldn't decorate the mongo query: " + e.getMessage(), e);
     }