Add muzzle check to other instrumentation classes

Author: Brian Devins-Suresh

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/HttpServerResponseEndHandlerInstrumentation.java

@@ -7,6 +7,7 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
 
 @AutoService(Instrumenter.class)
 public class HttpServerResponseEndHandlerInstrumentation extends Instrumenter.Tracing
@@ -15,6 +16,11 @@ public HttpServerResponseEndHandlerInstrumentation() {
     super("vertx", "vertx-4.0");
   }
 
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+  }
+
   @Override
   public String[] helperClassNames() {
     return new String[] {

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerInstrumentation.java

@@ -7,6 +7,7 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
+import datadog.trace.agent.tooling.muzzle.Reference;
 
 @AutoService(Instrumenter.class)
 public class RouteHandlerInstrumentation extends Instrumenter.Tracing
@@ -15,6 +16,11 @@ public RouteHandlerInstrumentation() {
     super("vertx", "vertx-4.0");
   }
 
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
+  }
+
   @Override
   public String[] helperClassNames() {
     return new String[] {

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteImplInstrumentation.java

@@ -8,8 +8,7 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.muzzle.IReferenceMatcher;
-import datadog.trace.agent.tooling.muzzle.ReferenceMatcher;
+import datadog.trace.agent.tooling.muzzle.Reference;
 
 @AutoService(Instrumenter.class)
 public class RouteImplInstrumentation extends Instrumenter.AppSec
@@ -19,9 +18,9 @@ public RouteImplInstrumentation() {
     super("vertx", "vertx-4.0");
   }
 
-  private IReferenceMatcher postProcessReferenceMatcher(final ReferenceMatcher origMatcher) {
-    return new IReferenceMatcher.ConjunctionReferenceMatcher(
-        origMatcher, VertxVersionMatcher.INSTANCE);
+  @Override
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
   }
 
   @Override

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextImplInstrumentation.java

@@ -6,8 +6,7 @@
 
 import com.google.auto.service.AutoService;
 import datadog.trace.agent.tooling.Instrumenter;
-import datadog.trace.agent.tooling.muzzle.IReferenceMatcher;
-import datadog.trace.agent.tooling.muzzle.ReferenceMatcher;
+import datadog.trace.agent.tooling.muzzle.Reference;
 
 @AutoService(Instrumenter.class)
 public class RoutingContextImplInstrumentation extends Instrumenter.AppSec
@@ -18,13 +17,13 @@ public RoutingContextImplInstrumentation() {
   }
 
   @Override
-  public String instrumentedType() {
-    return "io.vertx.ext.web.impl.RoutingContextImpl";
+  public Reference[] additionalMuzzleReferences() {
+    return new Reference[] {VertxVersionMatcher.HTTP_1X_SERVER_RESPONSE};
   }
 
-  private IReferenceMatcher postProcessReferenceMatcher(final ReferenceMatcher origMatcher) {
-    return new IReferenceMatcher.ConjunctionReferenceMatcher(
-        origMatcher, VertxVersionMatcher.INSTANCE);
+  @Override
+  public String instrumentedType() {
+    return "io.vertx.ext.web.impl.RoutingContextImpl";
   }
 
   @Override

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/VertxVersionMatcher.java

@@ -1,12 +1,10 @@
 package datadog.trace.instrumentation.vertx_4_0.server;
 
 import datadog.trace.agent.tooling.muzzle.Reference;
-import datadog.trace.agent.tooling.muzzle.ReferenceMatcher;
 
 // checks for vertx > 4
 public class VertxVersionMatcher {
   // added in 4.0
-  static final ReferenceMatcher INSTANCE =
-      new ReferenceMatcher(
-          new Reference.Builder("io.vertx.core.http.impl.Http1xServerResponse").build());
+  static final Reference HTTP_1X_SERVER_RESPONSE =
+      new Reference.Builder("io.vertx.core.http.impl.Http1xServerResponse").build();
 }