From c6afa57c7a9879bd271ac88820cdcecb6edf1dd3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Oct 2021 21:28:58 -0700 Subject: [PATCH 1/7] Add Quartz preview instrumentation --- .../agent/internal/configuration/Configuration.java | 2 ++ .../agent/internal/init/ConfigOverride.java | 3 +++ agent/instrumentation/build.gradle.kts | 1 + 3 files changed, 6 insertions(+) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java index d937d4a2327..d7f5440e014 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java @@ -280,6 +280,8 @@ public static class PreviewInstrumentation { @Deprecated public DisabledByDefaultInstrumentation jaxws = new DisabledByDefaultInstrumentation(); + public DisabledByDefaultInstrumentation quartz = new DisabledByDefaultInstrumentation(); + // this is just here to detect if using this old setting in order to give a helpful message @Deprecated public DisabledByDefaultInstrumentation rabbitmq = new DisabledByDefaultInstrumentation(); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java index 3a48be857a2..9babab152be 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java @@ -76,6 +76,9 @@ static Config getConfig(Configuration config) { // TODO (trask) investigate if grizzly instrumentation can be enabled upstream by default now properties.put("otel.instrumentation.grizzly.enabled", "true"); } + if (!config.preview.instrumentation.quartz.enabled) { + properties.put("otel.instrumentation.quartz.enabled", "false"); + } if (!config.preview.instrumentation.springIntegration.enabled) { properties.put("otel.instrumentation.spring-integration.enabled", "false"); } diff --git a/agent/instrumentation/build.gradle.kts b/agent/instrumentation/build.gradle.kts index 8d1d26ea47e..47624443b9d 100644 --- a/agent/instrumentation/build.gradle.kts +++ b/agent/instrumentation/build.gradle.kts @@ -106,6 +106,7 @@ dependencies { implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-annotations-1.0:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-api-1.0:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-api-metrics-1.0:$otelInstrumentationAlphaVersion") + implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-quartz-2.0:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-rabbitmq-2.7:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-reactor-3.1:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-reactor-netty-0.9:$otelInstrumentationAlphaVersion") From fcf5a36e0904ab5cbe4227593d762ae6f6151085 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Oct 2021 21:33:50 -0700 Subject: [PATCH 2/7] And Apache Camel preview instrumentation --- .../agent/internal/configuration/Configuration.java | 3 +++ .../agent/internal/init/ConfigOverride.java | 3 +++ agent/instrumentation/build.gradle.kts | 1 + 3 files changed, 7 insertions(+) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java index d7f5440e014..5977db39b45 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java @@ -266,6 +266,9 @@ public static class InternalConfiguration { } public static class PreviewInstrumentation { + + public DisabledByDefaultInstrumentation apacheCamel = new DisabledByDefaultInstrumentation(); + // this is just here to detect if using this old setting in order to give a helpful message @Deprecated public DisabledByDefaultInstrumentation azureSdk = new DisabledByDefaultInstrumentation(); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java index 9babab152be..7ffa98be6d6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java @@ -71,6 +71,9 @@ static Config getConfig(Configuration config) { if (!config.instrumentation.springScheduling.enabled) { properties.put("otel.instrumentation.spring-scheduling.enabled", "false"); } + if (!config.preview.instrumentation.apacheCamel.enabled) { + properties.put("otel.instrumentation.apache-camel.enabled", "false"); + } if (config.preview.instrumentation.grizzly.enabled) { // grizzly instrumentation is off by default // TODO (trask) investigate if grizzly instrumentation can be enabled upstream by default now diff --git a/agent/instrumentation/build.gradle.kts b/agent/instrumentation/build.gradle.kts index 47624443b9d..c5889573afe 100644 --- a/agent/instrumentation/build.gradle.kts +++ b/agent/instrumentation/build.gradle.kts @@ -39,6 +39,7 @@ dependencies { exclude("ch.qos.logback", "logback-core") } + implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-camel-2.20:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpasyncclient-4.1:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-2.0:$otelInstrumentationAlphaVersion") implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:$otelInstrumentationAlphaVersion") From ca544bc7a57a6c54a1968958241d96ea9ad99e90 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 4 Oct 2021 21:38:30 -0700 Subject: [PATCH 3/7] Statsbeat --- .../agent/internal/statsbeat/Feature.java | 4 +++- .../agent/internal/statsbeat/FeatureStatsbeat.java | 6 ++++++ .../agent/internal/statsbeat/Instrumentations.java | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java index 4f81d2f3e7a..d695c3841cd 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java @@ -49,7 +49,9 @@ enum Feature { SPRING_INTEGRATION_DISABLED(19), LEGACY_PROPAGATION_DISABLED(20), GRIZZLY_DISABLED(21), // preview instrumentation - STATSBEAT_DISABLED(22); // disable non-essential statsbeat + STATSBEAT_DISABLED(22), // disable non-essential statsbeat + QUARTZ_DISABLED(23), // preview instrumentation + APACHE_CAMEL_DISABLED(24); // preview instrumentation private static final Map javaVendorFeatureMap; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java index 76d4f1afd20..fde0b7db9de 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java @@ -129,9 +129,15 @@ void trackConfigurationOptions(Configuration config) { } // preview instrumentation + if (!config.preview.instrumentation.apacheCamel.enabled) { + featureList.add(Feature.APACHE_CAMEL_DISABLED); + } if (!config.preview.instrumentation.grizzly.enabled) { featureList.add(Feature.GRIZZLY_DISABLED); } + if (!config.preview.instrumentation.quartz.enabled) { + featureList.add(Feature.QUARTZ_DISABLED); + } if (!config.preview.instrumentation.springIntegration.enabled) { featureList.add(Feature.SPRING_INTEGRATION_DISABLED); } diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Instrumentations.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Instrumentations.java index 06f86871ad6..3f761785b33 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Instrumentations.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Instrumentations.java @@ -118,6 +118,8 @@ class Instrumentations { INSTRUMENTATION_MAP.put("io.opentelemetry.jaxrs-client-2.0", 67); INSTRUMENTATION_MAP.put("io.opentelemetry.jaxrs-client-2.0-resteasy-3.0", 68); INSTRUMENTATION_MAP.put("io.opentelemetry.grizzly-2.0", 69); + INSTRUMENTATION_MAP.put("io.opentelemetry.quartz-2.0", 70); + INSTRUMENTATION_MAP.put("io.opentelemetry.apache-camel-2.20", 71); } // encode BitSet to a long From b2245093271f0ceea395d3cac63dbef1739d17ed Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 5 Oct 2021 09:41:31 -0700 Subject: [PATCH 4/7] Update lock files --- agent/instrumentation/gradle.lockfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agent/instrumentation/gradle.lockfile b/agent/instrumentation/gradle.lockfile index 50df55184d6..658bb3e9d04 100644 --- a/agent/instrumentation/gradle.lockfile +++ b/agent/instrumentation/gradle.lockfile @@ -66,6 +66,7 @@ io.opentelemetry.instrumentation:opentelemetry-lettuce-common:1.6.0+ai.patches-a io.opentelemetry.instrumentation:opentelemetry-mongo-3.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-netty-4.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.6.0+ai.patches-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-quartz-2.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-reactor-3.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-rxjava-2.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-rxjava-3.0:1.6.0+ai.patches-alpha=runtimeClasspath @@ -74,6 +75,7 @@ io.opentelemetry.instrumentation:opentelemetry-servlet-common:1.6.0+ai.patches-a io.opentelemetry.instrumentation:opentelemetry-servlet-javax-common:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-spring-integration-4.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-spring-webflux-5.0:1.6.0+ai.patches-alpha=runtimeClasspath +io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-camel-2.20:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpasyncclient-4.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-2.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-apache-httpclient-4.0:1.6.0+ai.patches-alpha=runtimeClasspath @@ -145,6 +147,7 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-okhttp-3.0:1. io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-annotations-1.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-api-1.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-opentelemetry-api-metrics-1.0:1.6.0+ai.patches-alpha=runtimeClasspath +io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-quartz-2.0:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-rabbitmq-2.7:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-reactor-3.1:1.6.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-reactor-netty-0.9:1.6.0+ai.patches-alpha=runtimeClasspath From 06f30e83cb7929f9b985c800e45c618dc4ce920d Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 5 Oct 2021 13:07:13 -0700 Subject: [PATCH 5/7] Fix feature tracking for preview instrumentations --- .../agent/internal/init/ConfigOverride.java | 15 +++++++++------ .../agent/internal/statsbeat/Feature.java | 8 ++++---- .../internal/statsbeat/FeatureStatsbeat.java | 16 ++++++++-------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java index 7ffa98be6d6..4b4c7a0f8fb 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java @@ -71,19 +71,22 @@ static Config getConfig(Configuration config) { if (!config.instrumentation.springScheduling.enabled) { properties.put("otel.instrumentation.spring-scheduling.enabled", "false"); } - if (!config.preview.instrumentation.apacheCamel.enabled) { - properties.put("otel.instrumentation.apache-camel.enabled", "false"); + if (config.preview.instrumentation.apacheCamel.enabled) { + // apache-camel instrumentation is off by default + properties.put("otel.instrumentation.apache-camel.enabled", "true"); } if (config.preview.instrumentation.grizzly.enabled) { // grizzly instrumentation is off by default // TODO (trask) investigate if grizzly instrumentation can be enabled upstream by default now properties.put("otel.instrumentation.grizzly.enabled", "true"); } - if (!config.preview.instrumentation.quartz.enabled) { - properties.put("otel.instrumentation.quartz.enabled", "false"); + if (config.preview.instrumentation.quartz.enabled) { + // quartz instrumentation is off by default + properties.put("otel.instrumentation.quartz.enabled", "true"); } - if (!config.preview.instrumentation.springIntegration.enabled) { - properties.put("otel.instrumentation.spring-integration.enabled", "false"); + if (config.preview.instrumentation.springIntegration.enabled) { + // springIntegration instrumentation is off by default + properties.put("otel.instrumentation.spring-integration.enabled", "true"); } if (!config.preview.captureControllerSpans) { properties.put("otel.instrumentation.common.experimental.suppress-controller-spans", "true"); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java index d695c3841cd..9b8925a81fd 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java @@ -46,12 +46,12 @@ enum Feature { // JAVA_HTTP_CLIENT_DISABLED(16), no longer used // JAXWS_DISABLED(17), no longer used RABBITMQ_DISABLED(18), - SPRING_INTEGRATION_DISABLED(19), + SPRING_INTEGRATION_ENABLED(19), // preview instrumentation LEGACY_PROPAGATION_DISABLED(20), - GRIZZLY_DISABLED(21), // preview instrumentation + GRIZZLY_ENABLED(21), // preview instrumentation STATSBEAT_DISABLED(22), // disable non-essential statsbeat - QUARTZ_DISABLED(23), // preview instrumentation - APACHE_CAMEL_DISABLED(24); // preview instrumentation + QUARTZ_ENABLED(23), // preview instrumentation + APACHE_CAMEL_ENABLED(24); // preview instrumentation private static final Map javaVendorFeatureMap; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java index fde0b7db9de..059fb147497 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java @@ -129,17 +129,17 @@ void trackConfigurationOptions(Configuration config) { } // preview instrumentation - if (!config.preview.instrumentation.apacheCamel.enabled) { - featureList.add(Feature.APACHE_CAMEL_DISABLED); + if (config.preview.instrumentation.apacheCamel.enabled) { + featureList.add(Feature.APACHE_CAMEL_ENABLED); } - if (!config.preview.instrumentation.grizzly.enabled) { - featureList.add(Feature.GRIZZLY_DISABLED); + if (config.preview.instrumentation.grizzly.enabled) { + featureList.add(Feature.GRIZZLY_ENABLED); } - if (!config.preview.instrumentation.quartz.enabled) { - featureList.add(Feature.QUARTZ_DISABLED); + if (config.preview.instrumentation.quartz.enabled) { + featureList.add(Feature.QUARTZ_ENABLED); } - if (!config.preview.instrumentation.springIntegration.enabled) { - featureList.add(Feature.SPRING_INTEGRATION_DISABLED); + if (config.preview.instrumentation.springIntegration.enabled) { + featureList.add(Feature.SPRING_INTEGRATION_ENABLED); } // Statsbeat From a1101f9825c0af541322b9f8603f14b6a47ff43d Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 5 Oct 2021 14:36:41 -0700 Subject: [PATCH 6/7] Fix instrumentations on default by OTEL --- .../agent/internal/init/ConfigOverride.java | 18 +++++++++--------- .../agent/internal/statsbeat/Feature.java | 8 ++++---- .../internal/statsbeat/FeatureStatsbeat.java | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java index 4b4c7a0f8fb..ba4a2b473ee 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java @@ -71,22 +71,22 @@ static Config getConfig(Configuration config) { if (!config.instrumentation.springScheduling.enabled) { properties.put("otel.instrumentation.spring-scheduling.enabled", "false"); } - if (config.preview.instrumentation.apacheCamel.enabled) { - // apache-camel instrumentation is off by default - properties.put("otel.instrumentation.apache-camel.enabled", "true"); + if (!config.preview.instrumentation.apacheCamel.enabled) { + // apache-camel instrumentation is ON by default in OTEL + properties.put("otel.instrumentation.apache-camel.enabled", "false"); } if (config.preview.instrumentation.grizzly.enabled) { // grizzly instrumentation is off by default // TODO (trask) investigate if grizzly instrumentation can be enabled upstream by default now properties.put("otel.instrumentation.grizzly.enabled", "true"); } - if (config.preview.instrumentation.quartz.enabled) { - // quartz instrumentation is off by default - properties.put("otel.instrumentation.quartz.enabled", "true"); + if (!config.preview.instrumentation.quartz.enabled) { + // quartz instrumentation is ON by default in OTEL + properties.put("otel.instrumentation.quartz.enabled", "false"); } - if (config.preview.instrumentation.springIntegration.enabled) { - // springIntegration instrumentation is off by default - properties.put("otel.instrumentation.spring-integration.enabled", "true"); + if (!config.preview.instrumentation.springIntegration.enabled) { + // springIntegration instrumentation is ON by default in OTEL + properties.put("otel.instrumentation.spring-integration.enabled", "false"); } if (!config.preview.captureControllerSpans) { properties.put("otel.instrumentation.common.experimental.suppress-controller-spans", "true"); diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java index 9b8925a81fd..486fe19d27f 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java @@ -46,12 +46,12 @@ enum Feature { // JAVA_HTTP_CLIENT_DISABLED(16), no longer used // JAXWS_DISABLED(17), no longer used RABBITMQ_DISABLED(18), - SPRING_INTEGRATION_ENABLED(19), // preview instrumentation + SPRING_INTEGRATION_DISABLED(19), // preview instrumentation, spring-integration is ON by default in OTEL LEGACY_PROPAGATION_DISABLED(20), - GRIZZLY_ENABLED(21), // preview instrumentation + GRIZZLY_ENABLED(21), // preview instrumentation, grizzly is OFF by default in OTEL STATSBEAT_DISABLED(22), // disable non-essential statsbeat - QUARTZ_ENABLED(23), // preview instrumentation - APACHE_CAMEL_ENABLED(24); // preview instrumentation + QUARTZ_DISABLED(23), // preview instrumentation, quartz is ON by default in OTEL + APACHE_CAMEL_DISABLED(24); // preview instrumentation, apache camel is ON by default in OTEL private static final Map javaVendorFeatureMap; diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java index 059fb147497..092acdbbad5 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/FeatureStatsbeat.java @@ -129,17 +129,17 @@ void trackConfigurationOptions(Configuration config) { } // preview instrumentation - if (config.preview.instrumentation.apacheCamel.enabled) { - featureList.add(Feature.APACHE_CAMEL_ENABLED); + if (!config.preview.instrumentation.apacheCamel.enabled) { + featureList.add(Feature.APACHE_CAMEL_DISABLED); } if (config.preview.instrumentation.grizzly.enabled) { featureList.add(Feature.GRIZZLY_ENABLED); } - if (config.preview.instrumentation.quartz.enabled) { - featureList.add(Feature.QUARTZ_ENABLED); + if (!config.preview.instrumentation.quartz.enabled) { + featureList.add(Feature.QUARTZ_DISABLED); } - if (config.preview.instrumentation.springIntegration.enabled) { - featureList.add(Feature.SPRING_INTEGRATION_ENABLED); + if (!config.preview.instrumentation.springIntegration.enabled) { + featureList.add(Feature.SPRING_INTEGRATION_DISABLED); } // Statsbeat From 2584919da8cd401ddc78f3ca1a4ba308320f115b Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 5 Oct 2021 14:42:40 -0700 Subject: [PATCH 7/7] Fix spotlessApply --- .../applicationinsights/agent/internal/statsbeat/Feature.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java index 486fe19d27f..6f8265c09a9 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/Feature.java @@ -46,7 +46,8 @@ enum Feature { // JAVA_HTTP_CLIENT_DISABLED(16), no longer used // JAXWS_DISABLED(17), no longer used RABBITMQ_DISABLED(18), - SPRING_INTEGRATION_DISABLED(19), // preview instrumentation, spring-integration is ON by default in OTEL + SPRING_INTEGRATION_DISABLED( + 19), // preview instrumentation, spring-integration is ON by default in OTEL LEGACY_PROPAGATION_DISABLED(20), GRIZZLY_ENABLED(21), // preview instrumentation, grizzly is OFF by default in OTEL STATSBEAT_DISABLED(22), // disable non-essential statsbeat