Make vertx opt-in preview instrumentation for now (#2058)

microsoft · Jan 25, 2022 · 5ca2aa1 · 5ca2aa1
1 parent fbb276e
commit 5ca2aa1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java
@@ -340,6 +340,8 @@ public static class PreviewInstrumentation {
 
     public DisabledByDefaultInstrumentation springIntegration =
         new DisabledByDefaultInstrumentation();
+
+    public DisabledByDefaultInstrumentation vertx = new DisabledByDefaultInstrumentation();
   }
 
   public static class PreviewStatsbeat {

diff --git a/...g/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java b/...g/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java
@@ -100,6 +100,10 @@ static Config getConfig(Configuration config) {
       // springIntegration instrumentation is ON by default in OTEL
       properties.put("otel.instrumentation.spring-integration.enabled", "false");
     }
+    if (!config.preview.instrumentation.vertx.enabled) {
+      // vertx instrumentation is ON by default in OTEL
+      properties.put("otel.instrumentation.vertx.enabled", "false");
+    }
     if (!config.preview.captureControllerSpans) {
       properties.put("otel.instrumentation.common.experimental.suppress-controller-spans", "true");
     }

diff --git a/...ing/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/...ing/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java
@@ -56,7 +56,8 @@ enum Feature {
   PLAY_DISABLED(25), // preview instrumentation, play is ON by default in OTEL
   CAPTURE_HTTP_SERVER_4XX_AS_SUCCESS(26),
   CAPTURE_HTTP_SERVER_HEADERS(27),
-  CAPTURE_HTTP_CLIENT_HEADERS(28);
+  CAPTURE_HTTP_CLIENT_HEADERS(28),
+  VERTX_DISABLED(29); // preview instrumentation, vertx is ON by default in OTEL
 
   private static final Map<String, Feature> javaVendorFeatureMap;
 

diff --git a/...ain/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java b/...ain/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java
@@ -147,6 +147,9 @@ void trackConfigurationOptions(Configuration config) {
     if (!config.preview.instrumentation.springIntegration.enabled) {
       featureList.add(Feature.SPRING_INTEGRATION_DISABLED);
     }
+    if (!config.preview.instrumentation.vertx.enabled) {
+      featureList.add(Feature.VERTX_DISABLED);
+    }
 
     // Statsbeat
     if (config.preview.statsbeat.disabled) {