Snippet injection Test update

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

@@ -317,7 +317,7 @@ public static class PreviewConfiguration {
     public boolean disablePropagation;
     public boolean captureHttpServer4xxAsError = true;
 
-    public JavaScriptSnippet javaScriptSnippet = new JavaScriptSnippet();
+    public BrowserSdkLoader browserSdkLoader = new BrowserSdkLoader();
 
     // LoggingLevel is no longer sent by default since 3.3.0, since the data is already available
     // under SeverityLevel. This configuration is provided as a temporary measure for customers
@@ -584,7 +584,7 @@ public static class EnabledByDefaultInstrumentation {
     public boolean enabled = true;
   }
 
-  public static class JavaScriptSnippet {
+  public static class BrowserSdkLoader {
     public boolean enabled;
   }
 

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

@@ -21,7 +21,7 @@ public class SnippetConfiguration {
   // visible for testing
   static String readSnippet() {
     ClassLoader classLoader = SnippetConfiguration.class.getClassLoader();
-    String resourceName = "javascript-snippet.txt";
+    String resourceName = "browser-sdk-loader-snippet.txt";
     InputStream inputStream = classLoader.getResourceAsStream(resourceName);
     if (inputStream == null) {
       LOGGER.error("Resource not found: " + resourceName);

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

@@ -120,7 +120,7 @@ public void apply(RuntimeConfiguration runtimeConfig) {
     boolean currentEnabled = !Strings.isNullOrEmpty(currentConfig.connectionString);
 
     updateConnectionString(runtimeConfig.connectionString);
-    if (initialConfig.preview.javaScriptSnippet.enabled) {
+    if (initialConfig.preview.browserSdkLoader.enabled) {
       SnippetConfiguration.initializeSnippet(runtimeConfig.connectionString);
     }
     updateRoleName(runtimeConfig.role.name);

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

@@ -230,7 +230,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
     }
 
     if (telemetryClient.getConnectionString() != null) {
-      if (configuration.preview.javaScriptSnippet.enabled) {
+      if (configuration.preview.browserSdkLoader.enabled) {
         SnippetConfiguration.initializeSnippet(configuration.connectionString);
       }
     }
@@ -392,8 +392,8 @@ private static Set<Feature> initStatsbeatFeatureSet(Configuration config) {
     if (!config.preview.instrumentation.jaxrsAnnotations.enabled) {
       featureList.add(Feature.JAXRS_ANNOTATIONS_DISABLED);
     }
-    if (config.preview.javaScriptSnippet.enabled) {
-      featureList.add(Feature.JAVASCRIPT_SNIPPET);
+    if (config.preview.browserSdkLoader.enabled) {
+      featureList.add(Feature.BROWSER_SDK_LOADER);
     }
 
     // Statsbeat

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/statsbeat/Feature.java

@@ -49,7 +49,7 @@ public enum Feature {
   TELEMETRY_PROCESSOR_ENABLED(33),
   SDK_2X_BRIDGE_VIA_3X_AGENT(34), // track 2.x bridge usage via 3.x codeless agent
   PROFILER_ENABLED(35),
-  JAVASCRIPT_SNIPPET(36); // track javascript snippet
+  BROWSER_SDK_LOADER(36); // track javascript snippet
 
   private static final Map<String, Feature> javaVendorFeatureMap;
 

settings.gradle.kts

@@ -80,6 +80,7 @@ include(":smoke-tests:framework")
 hideFromDependabot(":smoke-tests:apps:ActuatorMetrics")
 hideFromDependabot(":smoke-tests:apps:AutoPerfCounters")
 hideFromDependabot(":smoke-tests:apps:AzureSdk")
+hideFromDependabot(":smoke-tests:apps:BrowserSdkLoader")
 hideFromDependabot(":smoke-tests:apps:Cassandra")
 hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j1Interop2x")
 hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j2Interop2x")
@@ -132,7 +133,7 @@ hideFromDependabot(":smoke-tests:apps:RoleNameOverrides")
 hideFromDependabot(":smoke-tests:apps:RuntimeAttach")
 hideFromDependabot(":smoke-tests:apps:RuntimeAttachWithDelayedConnectionString")
 hideFromDependabot(":smoke-tests:apps:Sampling")
-hideFromDependabot(":smoke-tests:apps:SnippetInjection")
+
 hideFromDependabot(":smoke-tests:apps:SamplingOverrides")
 hideFromDependabot(":smoke-tests:apps:SamplingOverridesBackCompat")
 hideFromDependabot(":smoke-tests:apps:SpringBoot")

smoke-tests/apps/SnippetInjection/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SnippetInjectionTest.java → smoke-tests/apps/BrowserSdkLoader/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/BrowserSdkLoaderTest.java

@@ -19,41 +19,41 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @UseAgent
-abstract class SnippetInjectionTest {
+abstract class BrowserSdkLoaderTest {
   @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
 
   @Test
   @TargetUri("/test")
-  void normalSnippetInjectionTest() throws Exception {
+  void normalBrowserSdkLoaderEnableTest() throws Exception {
     String url = testing.getBaseUrl() + "/test";
     String response = HttpHelper.get(url, "", emptyMap());
-    assertThat(response).contains("script");
+    assertThat(response).contains("InstrumentationKey=00000000");
   }
 
   @Environment(TOMCAT_8_JAVA_8)
-  static class Tomcat8Java8Test extends SnippetInjectionTest {}
+  static class Tomcat8Java8Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_8_OPENJ9)
-  static class Tomcat8Java8OpenJ9Test extends SnippetInjectionTest {}
+  static class Tomcat8Java8OpenJ9Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_11)
-  static class Tomcat8Java11Test extends SnippetInjectionTest {}
+  static class Tomcat8Java11Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_11_OPENJ9)
-  static class Tomcat8Java11OpenJ9Test extends SnippetInjectionTest {}
+  static class Tomcat8Java11OpenJ9Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_17)
-  static class Tomcat8Java17Test extends SnippetInjectionTest {}
+  static class Tomcat8Java17Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_19)
-  static class Tomcat8Java19Test extends SnippetInjectionTest {}
+  static class Tomcat8Java19Test extends BrowserSdkLoaderTest {}
 
   @Environment(TOMCAT_8_JAVA_20)
-  static class Tomcat8Java20Test extends SnippetInjectionTest {}
+  static class Tomcat8Java20Test extends BrowserSdkLoaderTest {}
 
   @Environment(WILDFLY_13_JAVA_8)
-  static class Wildfly13Java8Test extends SnippetInjectionTest {}
+  static class Wildfly13Java8Test extends BrowserSdkLoaderTest {}
 
   @Environment(WILDFLY_13_JAVA_8_OPENJ9)
-  static class Wildfly13Java8OpenJ9Test extends SnippetInjectionTest {}
+  static class Wildfly13Java8OpenJ9Test extends BrowserSdkLoaderTest {}
 }

smoke-tests/apps/BrowserSdkLoader/src/smokeTest/resources/applicationinsights.json

@@ -0,0 +1,8 @@
+{
+  "preview": {
+    "browserSdkLoader":
+    {
+      "enabled": true
+    }
+  }
+}