Skip to content

Commit 5ca2aa1

Browse files
authored
Make vertx opt-in preview instrumentation for now (#2058)
1 parent fbb276e commit 5ca2aa1

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ public static class PreviewInstrumentation {
340340

341341
public DisabledByDefaultInstrumentation springIntegration =
342342
new DisabledByDefaultInstrumentation();
343+
344+
public DisabledByDefaultInstrumentation vertx = new DisabledByDefaultInstrumentation();
343345
}
344346

345347
public static class PreviewStatsbeat {

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ static Config getConfig(Configuration config) {
100100
// springIntegration instrumentation is ON by default in OTEL
101101
properties.put("otel.instrumentation.spring-integration.enabled", "false");
102102
}
103+
if (!config.preview.instrumentation.vertx.enabled) {
104+
// vertx instrumentation is ON by default in OTEL
105+
properties.put("otel.instrumentation.vertx.enabled", "false");
106+
}
103107
if (!config.preview.captureControllerSpans) {
104108
properties.put("otel.instrumentation.common.experimental.suppress-controller-spans", "true");
105109
}

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ enum Feature {
5656
PLAY_DISABLED(25), // preview instrumentation, play is ON by default in OTEL
5757
CAPTURE_HTTP_SERVER_4XX_AS_SUCCESS(26),
5858
CAPTURE_HTTP_SERVER_HEADERS(27),
59-
CAPTURE_HTTP_CLIENT_HEADERS(28);
59+
CAPTURE_HTTP_CLIENT_HEADERS(28),
60+
VERTX_DISABLED(29); // preview instrumentation, vertx is ON by default in OTEL
6061

6162
private static final Map<String, Feature> javaVendorFeatureMap;
6263

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ void trackConfigurationOptions(Configuration config) {
147147
if (!config.preview.instrumentation.springIntegration.enabled) {
148148
featureList.add(Feature.SPRING_INTEGRATION_DISABLED);
149149
}
150+
if (!config.preview.instrumentation.vertx.enabled) {
151+
featureList.add(Feature.VERTX_DISABLED);
152+
}
150153

151154
// Statsbeat
152155
if (config.preview.statsbeat.disabled) {

0 commit comments

Comments
 (0)