From 51bc6ef562f628cccf8a1e59044ba858049856c1 Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 31 Jan 2023 10:31:57 -0800 Subject: [PATCH 1/4] Fix backward compa --- .../agent/internal/configuration/Configuration.java | 1 + .../internal/configuration/ConfigurationBuilder.java | 8 ++++++++ 2 files changed, 9 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 7cf3c633c5d..7008dd9f382 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 @@ -304,6 +304,7 @@ public static class PreviewConfiguration { @Deprecated public boolean openTelemetryApiSupport; public PreviewInstrumentation instrumentation = new PreviewInstrumentation(); // this is just here to detect if using this old setting in order to give a helpful message + @Deprecated public int metricIntervalSeconds = 60; @Deprecated public Boolean ignoreRemoteParentNotSampled; public boolean captureControllerSpans; // this is just here to detect if using this old setting in order to give a helpful message diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 9d3d58f4a65..3bf538753a6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -149,6 +149,13 @@ private static void logConfigurationWarnings(Configuration config) { "\"openTelemetryApiSupport\" is no longer in preview and it is now the" + " (one and only) default behavior"); } + if (config.preview.metricIntervalSeconds != 60) { + configurationLogger.warn( + "\"metricIntervalSeconds\" is no longer in preview and it has been GA since 3.4.9"); + if (config.metricIntervalSeconds == 60) { + config.metricIntervalSeconds = config.preview.metricIntervalSeconds; + } + } if (config.preview.instrumentation.azureSdk.enabled) { configurationLogger.warn( "\"azureSdk\" instrumentation is no longer in preview" @@ -179,6 +186,7 @@ private static void logConfigurationWarnings(Configuration config) { + " and it is now enabled by default," + " so no need to enable it under preview configuration"); } + for (SamplingOverride override : config.preview.sampling.overrides) { if (override.telemetryKind != null) { configurationLogger.warn( From 141327fb1ee9c86fcd9bfb6ca3af2584ee19005c Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 31 Jan 2023 10:33:37 -0800 Subject: [PATCH 2/4] Revert a line --- .../agent/internal/configuration/ConfigurationBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index 3bf538753a6..bff351e0698 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -186,7 +186,6 @@ private static void logConfigurationWarnings(Configuration config) { + " and it is now enabled by default," + " so no need to enable it under preview configuration"); } - for (SamplingOverride override : config.preview.sampling.overrides) { if (override.telemetryKind != null) { configurationLogger.warn( From b2de20d8eb8d92bb4669972859d6dd6960b36bea Mon Sep 17 00:00:00 2001 From: Helen <56097766+heyams@users.noreply.github.com> Date: Tue, 31 Jan 2023 11:37:30 -0800 Subject: [PATCH 3/4] Comment Co-authored-by: Trask Stalnaker --- .../agent/internal/configuration/Configuration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7008dd9f382..1a28973a7d0 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 @@ -303,7 +303,7 @@ public static class PreviewConfiguration { // this is just here to detect if using this old setting in order to give a helpful message @Deprecated public boolean openTelemetryApiSupport; public PreviewInstrumentation instrumentation = new PreviewInstrumentation(); - // this is just here to detect if using this old setting in order to give a helpful message + // these are just here to detect if using this old setting in order to give a helpful message @Deprecated public int metricIntervalSeconds = 60; @Deprecated public Boolean ignoreRemoteParentNotSampled; public boolean captureControllerSpans; From 17e4c37748ab961b395091202d1a4cc6a1f01008 Mon Sep 17 00:00:00 2001 From: Helen Yang Date: Tue, 31 Jan 2023 12:05:53 -0800 Subject: [PATCH 4/4] Add backward compa for env var --- .../configuration/ConfigurationBuilder.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java index bff351e0698..6a42248f379 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilder.java @@ -99,6 +99,10 @@ public class ConfigurationBuilder { private static final String APPLICATIONINSIGHTS_PREVIEW_PROFILER_ENABLEDIAGNOSTICS = "APPLICATIONINSIGHTS_PREVIEW_PROFILER_ENABLEDIAGNOSTICS"; + @Deprecated + private static final String APPLICATIONINSIGHTS_PREVIEW_METRIC_INTERVAL_SECONDS = + "APPLICATIONINSIGHTS_PREVIEW_METRIC_INTERVAL_SECONDS"; + private static final String APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS = "APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS"; @@ -564,9 +568,21 @@ static void overlayFromEnv(Configuration config, Path baseDir) throws IOExceptio overlayWithEnvVar( APPLICATIONINSIGHTS_SELF_DIAGNOSTICS_FILE_PATH, config.selfDiagnostics.file.path); - config.metricIntervalSeconds = - overlayWithEnvVar( - APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS, config.metricIntervalSeconds); + String deprecatedMetricIntervalSeconds = + getEnvVar(APPLICATIONINSIGHTS_PREVIEW_METRIC_INTERVAL_SECONDS); + String metricIntervalSeconds = getEnvVar(APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS); + if (metricIntervalSeconds != null) { + config.metricIntervalSeconds = + overlayWithEnvVar( + APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS, config.metricIntervalSeconds); + } else if (deprecatedMetricIntervalSeconds != null) { + configurationLogger.warn( + "\"APPLICATIONINSIGHTS_PREVIEW_METRIC_INTERVAL_SECONDS\" has been renamed to \"APPLICATIONINSIGHTS_METRIC_INTERVAL_SECONDS\"" + + " in 3.4.9 (GA)"); + config.metricIntervalSeconds = + overlayWithEnvVar( + APPLICATIONINSIGHTS_PREVIEW_METRIC_INTERVAL_SECONDS, config.metricIntervalSeconds); + } config.preview.instrumentation.springIntegration.enabled = overlayWithEnvVar(