From 7c00402d53b0a8e840fa2d75780d972565a7088e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 26 Feb 2025 17:07:35 -0800 Subject: [PATCH] Allow disabling spring-webmvc instrumentation --- .../agent/internal/init/AiConfigCustomizer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java index fe862e8ac3d..4b3c1c332f6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/AiConfigCustomizer.java @@ -203,7 +203,11 @@ private static void enableInstrumentations( properties.put("otel.instrumentation.servlet.enabled", "true"); properties.put("otel.instrumentation.spring-core.enabled", "true"); properties.put("otel.instrumentation.spring-web.enabled", "true"); - properties.put("otel.instrumentation.spring-webmvc.enabled", "true"); + if (otelConfig.getBoolean("otel.instrumentation.spring-webmvc.enabled", true)) { + // as a workaround for + // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/13249 + properties.put("otel.instrumentation.spring-webmvc.enabled", "true"); + } properties.put("otel.instrumentation.spring-webflux.enabled", "true"); properties.put("otel.instrumentation.tomcat.enabled", "true"); properties.put("otel.instrumentation.undertow.enabled", "true");