Bump errorProneVersion from 2.23.0 to 2.24.0

agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.19=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.16.0=runtimeClasspath
-com.google.errorprone:error_prone_annotations:2.23.0=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.24.0=runtimeClasspath
 com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
 io.netty:netty-bom:4.1.104.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath

agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 com.azure:azure-sdk-bom:1.2.19=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.16.0=runtimeClasspath
-com.google.errorprone:error_prone_annotations:2.23.0=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.24.0=runtimeClasspath
 com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
 io.netty:netty-bom:4.1.104.Final=runtimeClasspath
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha=runtimeClasspath

agent/agent-tooling/gradle.lockfile

@@ -25,7 +25,7 @@ com.github.oshi:oshi-core:6.4.9=runtimeClasspath
 com.github.spotbugs:spotbugs-annotations:4.8.3=runtimeClasspath
 com.github.stephenc.jcip:jcip-annotations:1.0-1=runtimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
-com.google.errorprone:error_prone_annotations:2.23.0=runtimeClasspath
+com.google.errorprone:error_prone_annotations:2.24.0=runtimeClasspath
 com.google.guava:guava-bom:33.0.0-jre=runtimeClasspath
 com.microsoft.azure:msal4j-persistence-extension:1.2.0=runtimeClasspath
 com.microsoft.azure:msal4j:1.14.0=runtimeClasspath

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

@@ -540,8 +540,19 @@ static void overlayFromEnv(Configuration config, Path baseDir) throws IOExceptio
     StringLookup stringLookup =
         StringLookupFactory.INSTANCE.interpolatorStringLookup(stringLookupMap, null, false);
     StringSubstitutor stringSubstitutor = new StringSubstitutor(stringLookup);
-    config.connectionString =
-        overlayConnectionStringFromEnv(stringSubstitutor.replace(config.connectionString));
+    String replacedConnectionString = stringSubstitutor.replace(config.connectionString);
+    if (replacedConnectionString != null
+        && !replacedConnectionString.startsWith("InstrumentationKey=")
+        && config.connectionString.equals(replacedConnectionString)) {
+      throw new FriendlyException(
+          "Error loading connection string from a file (\""
+              + config.connectionString
+              + "\").\n"
+              + "Please use this format instead:"
+              + "\n{ \"connectionString\": \"${file:connection-string-file.txt}\" }\n",
+          "Learn more about configuration options here: " + CONFIGURATION_OPTIONS_LINK);
+    }
+    config.connectionString = overlayConnectionStringFromEnv(replacedConnectionString);
     if (isTrimEmpty(config.role.name)) {
       // only use WEBSITE_SITE_NAME as a fallback
       config.role.name = getWebsiteSiteNameEnvVar();

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/configuration/ConfigurationBuilderTest.java

@@ -162,25 +162,31 @@ void testOverlayWithEnvVarWithGoodFileStringLookupFormat() throws Exception {
   @Test
   void testOverlayWithEnvVarWithBadFileStringLookupFormat() throws Exception {
     Configuration configuration = new Configuration();
-    configuration.connectionString = "${file:" + connectionStringFile.getAbsolutePath();
-    ConfigurationBuilder.overlayFromEnv(configuration, Paths.get("."));
-    assertThat(configuration.connectionString).isEqualTo(configuration.connectionString);
+    String filename = "${file:" + connectionStringFile.getAbsolutePath();
+    configuration.connectionString = filename;
+    assertFriendlyExceptionThrown(configuration, filename);
 
-    configuration.connectionString = "${xyz:" + connectionStringFile.getAbsolutePath() + "}";
-    ConfigurationBuilder.overlayFromEnv(configuration, Paths.get("."));
-    assertThat(configuration.connectionString).isEqualTo(configuration.connectionString);
+    filename = "${xyz:" + connectionStringFile.getAbsolutePath() + "}";
+    configuration.connectionString = filename;
+    assertFriendlyExceptionThrown(configuration, filename);
 
-    configuration.connectionString = "file:" + connectionStringFile.getAbsolutePath() + "}";
-    ConfigurationBuilder.overlayFromEnv(configuration, Paths.get("."));
-    assertThat(configuration.connectionString).isEqualTo(configuration.connectionString);
+    filename = "file:" + connectionStringFile.getAbsolutePath() + "}";
+    configuration.connectionString = filename;
+    assertFriendlyExceptionThrown(configuration, filename);
 
-    configuration.connectionString = "file:" + connectionStringFile.getAbsolutePath();
-    ConfigurationBuilder.overlayFromEnv(configuration, Paths.get("."));
-    assertThat(configuration.connectionString).isEqualTo(configuration.connectionString);
+    filename = "file:" + connectionStringFile.getAbsolutePath();
+    configuration.connectionString = filename;
+    assertFriendlyExceptionThrown(configuration, filename);
 
     configuration.connectionString = CONNECTION_STRING;
     ConfigurationBuilder.overlayFromEnv(configuration, Paths.get("."));
-    assertThat(configuration.connectionString).isEqualTo(configuration.connectionString);
+    assertThat(configuration.connectionString).isEqualTo(CONNECTION_STRING);
+  }
+
+  private static void assertFriendlyExceptionThrown(Configuration configuration, String filename) {
+    assertThatThrownBy(() -> ConfigurationBuilder.overlayFromEnv(configuration, Paths.get(".")))
+        .isInstanceOf(FriendlyException.class);
+    assertThat(configuration.connectionString).isEqualTo(filename);
   }
 
   @Test

dependencyManagement/build.gradle.kts

@@ -36,7 +36,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.10.4"
-val errorProneVersion = "2.23.0"
+val errorProneVersion = "2.24.0"
 val byteBuddyVersion = "1.12.18"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

licenses/more-licenses.md

@@ -1,7 +1,7 @@
 
 # agent
 ## Dependency License Report
-_2023-12-19 13:41:29 PST_
+_2023-12-22 03:05:53 UTC_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.16.0` 
@@ -41,7 +41,7 @@ _2023-12-19 13:41:29 PST_
 > - **POM Project URL**: [http://findbugs.sourceforge.net/](http://findbugs.sourceforge.net/)
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-**7** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.23.0` 
+**7** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.24.0` 
 > - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)