From c5f57151c0323c08df9cee4b65c5ce55947d0d8c Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler@newrelic.com>
Date: Tue, 1 Aug 2017 11:29:21 -0700
Subject: [PATCH] Use a factory to create TracingCommandListener

This bypasses the inexplicable change in visibility of the constructor.
---
 dd-java-agent/dd-java-agent.gradle                     |  3 ++-
 .../datadoghq/trace/agent/integration/MongoHelper.java |  3 ++-
 .../contrib/mongo/TracingCommandListenerFactory.java   | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java

diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle
index b99157673d..bcdfa91556 100644
--- a/dd-java-agent/dd-java-agent.gradle
+++ b/dd-java-agent/dd-java-agent.gradle
@@ -16,6 +16,7 @@ whitelistedInstructionClasses += whitelistedBranchClasses += [
   'com.datadoghq.trace.agent.TraceAnnotationsManager',
   'com.datadoghq.trace.agent.InstrumentationChecker',
   'com.datadoghq.trace.agent.DDJavaAgentInfo',
+  'io.opentracing.contrib.mongo.TracingCommandListenerFactory',
 ]
 
 dependencies {
@@ -30,7 +31,7 @@ dependencies {
   compile(group: 'io.opentracing.contrib', name: 'opentracing-web-servlet-filter', version: '0.0.9') {
     exclude(group: 'org.eclipse.jetty', module: 'jetty-servlet')
   }
-  compile(group: 'io.opentracing.contrib', name: 'opentracing-mongo-driver', version: '0.0.2') {
+  compile(group: 'io.opentracing.contrib', name: 'opentracing-mongo-driver', version: '0.0.3') {
     exclude(group: 'org.mongodb', module: 'mongodb-driver-async')
     exclude(group: 'org.mongodb', module: 'mongo-java-driver')
   }
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 f965823ca6..5b8c2dc2b0 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.contrib.mongo.TracingCommandListenerFactory;
 import io.opentracing.tag.Tags;
 import java.util.Arrays;
 import java.util.List;
@@ -41,7 +42,7 @@ public class MongoHelper extends DDAgentTracingHelper<MongoClientOptions.Builder
   protected MongoClientOptions.Builder doPatch(final MongoClientOptions.Builder builder)
       throws Exception {
 
-    final TracingCommandListener listener = new TracingCommandListener(tracer);
+    final TracingCommandListener listener = TracingCommandListenerFactory.create(tracer);
     builder.addCommandListener(listener);
 
     setState(builder, 1);
diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java b/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java
new file mode 100644
index 0000000000..84fccd296d
--- /dev/null
+++ b/dd-java-agent/src/main/java/io/opentracing/contrib/mongo/TracingCommandListenerFactory.java
@@ -0,0 +1,10 @@
+package io.opentracing.contrib.mongo;
+
+import io.opentracing.Tracer;
+
+public class TracingCommandListenerFactory {
+
+  public static TracingCommandListener create(final Tracer tracer) {
+    return new TracingCommandListener(tracer);
+  }
+}