Merge pull request #476 from newrelic/fix-mongo-instrumentation

Prevent mongodb instrumentation from applying to async/reactive clients

instrumentation/mongodb-3.0/build.gradle

@@ -14,6 +14,13 @@ dependencies {
 
 verifyInstrumentation {
     passesOnly 'org.mongodb:mongo-java-driver:[3.0.0,3.1.0-rc0)'
+    // This instrumentation module shouldn't apply to the mongo async/reactive drivers
+    fails('org.mongodb:mongodb-driver-async:[3.0.0-rc0,)') {
+        compile("org.mongodb:mongo-java-driver:3.0.0")
+    }
+    fails('org.mongodb:mongodb-driver-reactivestreams:[1.0.0-rc0,)') {
+        compile("org.mongodb:mongo-java-driver:3.0.0")
+    }
 }
 
 site {

instrumentation/mongodb-3.0/src/main/java/com/mongodb/async/client/MongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2021 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.async.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the async driver
+@SkipIfPresent
+final class MongoClients {}

instrumentation/mongodb-3.0/src/main/java/com/mongodb/reactivestreams/client/MongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2021 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.reactivestreams.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the reactive driver
+@SkipIfPresent
+final class MongoClients {}

instrumentation/mongodb-3.1/build.gradle

@@ -13,7 +13,14 @@ dependencies {
 }
 
 verifyInstrumentation {
-    passesOnly 'org.mongodb:mongo-java-driver:[3.1.0-rc0,)'
+    passesOnly 'org.mongodb:mongo-java-driver:[3.1.0-rc0,3.7.0-rc0)'
+    // This instrumentation module shouldn't apply to the mongo async/reactive drivers
+    fails('org.mongodb:mongodb-driver-async:[3.0.0-rc0,)') {
+        compile("org.mongodb:mongo-java-driver:3.1.0")
+    }
+    fails('org.mongodb:mongodb-driver-reactivestreams:[1.0.0-rc0,)') {
+        compile("org.mongodb:mongo-java-driver:3.1.0")
+    }
 }
 
 site {

instrumentation/mongodb-3.1/src/main/java/com/mongodb/MongoClientSettings.java

@@ -0,0 +1,8 @@
+package com.mongodb;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// Prevent this instrumentation module from applying when the mongodb-3.7 module does.
+@SkipIfPresent
+public final class MongoClientSettings {
+}

instrumentation/mongodb-3.1/src/main/java/com/mongodb/async/client/MongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2021 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.async.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the async driver
+@SkipIfPresent
+final class MongoClients {}

instrumentation/mongodb-3.1/src/main/java/com/mongodb/async/client/NettyMongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2020 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.async.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the async driver
+@SkipIfPresent
+final class NettyMongoClients {}

instrumentation/mongodb-3.1/src/main/java/com/mongodb/reactivestreams/client/MongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2021 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.reactivestreams.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the reactive driver
+@SkipIfPresent
+final class MongoClients {}

instrumentation/mongodb-3.7/build.gradle

@@ -13,7 +13,11 @@ dependencies {
 
 verifyInstrumentation {
     passesOnly 'org.mongodb:mongo-java-driver:[3.7.0-rc0,)'
-    fails('org.mongodb:mongodb-driver-async:[3.7.0-rc0,)') {
+    // This instrumentation module shouldn't apply to the mongo async/reactive drivers
+    fails('org.mongodb:mongodb-driver-async:[3.0.0-rc0,)') {
+        compile("org.mongodb:mongo-java-driver:3.7.0")
+    }
+    fails('org.mongodb:mongodb-driver-reactivestreams:[1.0.0-rc0,)') {
         compile("org.mongodb:mongo-java-driver:3.7.0")
     }
 }

instrumentation/mongodb-3.7/src/main/java/com/mongodb/async/client/MongoClients.java

@@ -0,0 +1,14 @@
+/*
+ *
+ *  * Copyright 2021 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.mongodb.async.client;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the async driver
+@SkipIfPresent
+final class MongoClients {}

instrumentation/mongodb-3.7/src/main/java/com/mongodb/async/client/NettyMongoClients.java

@@ -9,6 +9,6 @@
 
 import com.newrelic.api.agent.weaver.SkipIfPresent;
 
-// This instrumentation will cause Segment timeouts if it applies to the async driver
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the async driver
 @SkipIfPresent
 final class NettyMongoClients {}

instrumentation/mongodb-3.7/src/main/java/com/mongodb/reactivestreams/client/MongoClients.java

@@ -9,6 +9,6 @@
 
 import com.newrelic.api.agent.weaver.SkipIfPresent;
 
-// This instrumentation will cause Segment timeouts if it applies to the reactive driver
+// This instrumentation will cause Segment timeouts and incorrect metrics if it applies to the reactive driver
 @SkipIfPresent
 final class MongoClients {}