Skip to content

Commit 01a684c

Browse files
siyuniu-mstrask
andauthored
Snippet injection Test update (#3132)
Co-authored-by: Trask Stalnaker <[email protected]>
1 parent bdf7895 commit 01a684c

File tree

15 files changed

+30
-38
lines changed

15 files changed

+30
-38
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public static class PreviewConfiguration {
317317
public boolean disablePropagation;
318318
public boolean captureHttpServer4xxAsError = true;
319319

320-
public JavaScriptSnippet javaScriptSnippet = new JavaScriptSnippet();
320+
public BrowserSdkLoader browserSdkLoader = new BrowserSdkLoader();
321321

322322
// LoggingLevel is no longer sent by default since 3.3.0, since the data is already available
323323
// under SeverityLevel. This configuration is provided as a temporary measure for customers
@@ -584,7 +584,7 @@ public static class EnabledByDefaultInstrumentation {
584584
public boolean enabled = true;
585585
}
586586

587-
public static class JavaScriptSnippet {
587+
public static class BrowserSdkLoader {
588588
public boolean enabled;
589589
}
590590

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SnippetConfiguration {
2121
// visible for testing
2222
static String readSnippet() {
2323
ClassLoader classLoader = SnippetConfiguration.class.getClassLoader();
24-
String resourceName = "javascript-snippet.txt";
24+
String resourceName = "browser-sdk-loader-snippet.txt";
2525
InputStream inputStream = classLoader.getResourceAsStream(resourceName);
2626
if (inputStream == null) {
2727
LOGGER.error("Resource not found: " + resourceName);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void apply(RuntimeConfiguration runtimeConfig) {
120120
boolean currentEnabled = !Strings.isNullOrEmpty(currentConfig.connectionString);
121121

122122
updateConnectionString(runtimeConfig.connectionString);
123-
if (initialConfig.preview.javaScriptSnippet.enabled) {
123+
if (initialConfig.preview.browserSdkLoader.enabled) {
124124
SnippetConfiguration.initializeSnippet(runtimeConfig.connectionString);
125125
}
126126
updateRoleName(runtimeConfig.role.name);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
230230
}
231231

232232
if (telemetryClient.getConnectionString() != null) {
233-
if (configuration.preview.javaScriptSnippet.enabled) {
233+
if (configuration.preview.browserSdkLoader.enabled) {
234234
SnippetConfiguration.initializeSnippet(configuration.connectionString);
235235
}
236236
}
@@ -392,8 +392,8 @@ private static Set<Feature> initStatsbeatFeatureSet(Configuration config) {
392392
if (!config.preview.instrumentation.jaxrsAnnotations.enabled) {
393393
featureList.add(Feature.JAXRS_ANNOTATIONS_DISABLED);
394394
}
395-
if (config.preview.javaScriptSnippet.enabled) {
396-
featureList.add(Feature.JAVASCRIPT_SNIPPET);
395+
if (config.preview.browserSdkLoader.enabled) {
396+
featureList.add(Feature.BROWSER_SDK_LOADER);
397397
}
398398

399399
// Statsbeat

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public enum Feature {
4949
TELEMETRY_PROCESSOR_ENABLED(33),
5050
SDK_2X_BRIDGE_VIA_3X_AGENT(34), // track 2.x bridge usage via 3.x codeless agent
5151
PROFILER_ENABLED(35),
52-
JAVASCRIPT_SNIPPET(36); // track javascript snippet
52+
BROWSER_SDK_LOADER(36); // track javascript snippet
5353

5454
private static final Map<String, Feature> javaVendorFeatureMap;
5555

settings.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ include(":smoke-tests:framework")
8080
hideFromDependabot(":smoke-tests:apps:ActuatorMetrics")
8181
hideFromDependabot(":smoke-tests:apps:AutoPerfCounters")
8282
hideFromDependabot(":smoke-tests:apps:AzureSdk")
83+
hideFromDependabot(":smoke-tests:apps:BrowserSdkLoader")
8384
hideFromDependabot(":smoke-tests:apps:Cassandra")
8485
hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j1Interop2x")
8586
hideFromDependabot(":smoke-tests:apps:ClassicSdkLog4j2Interop2x")
@@ -132,7 +133,7 @@ hideFromDependabot(":smoke-tests:apps:RoleNameOverrides")
132133
hideFromDependabot(":smoke-tests:apps:RuntimeAttach")
133134
hideFromDependabot(":smoke-tests:apps:RuntimeAttachWithDelayedConnectionString")
134135
hideFromDependabot(":smoke-tests:apps:Sampling")
135-
hideFromDependabot(":smoke-tests:apps:SnippetInjection")
136+
136137
hideFromDependabot(":smoke-tests:apps:SamplingOverrides")
137138
hideFromDependabot(":smoke-tests:apps:SamplingOverridesBackCompat")
138139
hideFromDependabot(":smoke-tests:apps:SpringBoot")

0 commit comments

Comments
 (0)