From 316808d19e893fe021e7fbf4a1ecfe61edf2491b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 13 May 2026 06:41:30 -0700 Subject: [PATCH 1/2] Normalize Spring Boot actuator autoconfigure javaagent package --- .../AutoConfigurationImportSelectorInstrumentation.java | 2 +- .../v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java | 2 +- .../v2_0/SpringBootActuatorIgnoredTypesConfigurer.java | 2 +- .../v2_0/SpringBootActuatorInstrumentationModule.java | 6 +++--- .../actuator/{ => autoconfigure}/v2_0/ActuatorTest.java | 4 ++-- .../boot/actuator/{ => autoconfigure}/v2_0/SpringApp.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/AutoConfigurationImportSelectorInstrumentation.java (98%) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java (99%) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java (95%) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/SpringBootActuatorInstrumentationModule.java (90%) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/ActuatorTest.java (97%) rename instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/{ => autoconfigure}/v2_0/SpringApp.java (97%) diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/AutoConfigurationImportSelectorInstrumentation.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/AutoConfigurationImportSelectorInstrumentation.java similarity index 98% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/AutoConfigurationImportSelectorInstrumentation.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/AutoConfigurationImportSelectorInstrumentation.java index 68ea37816593..7513fb7f3f72 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/AutoConfigurationImportSelectorInstrumentation.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/AutoConfigurationImportSelectorInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.returns; diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java similarity index 99% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java index 19f089b6a67c..b24f44896349 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import static java.util.Collections.singletonList; diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java similarity index 95% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java index 487be5f0f181..f7167f856f48 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import com.google.auto.service.AutoService; import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder; diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorInstrumentationModule.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java similarity index 90% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorInstrumentationModule.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java index 4a345211deca..6f68e0702d35 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorInstrumentationModule.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Collections.singletonList; @@ -42,13 +42,13 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) // classloaders, so that the bean class loader (different from the instrumented class loader) // can load it helperResourceBuilder.registerForAllClassLoaders( - "io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class"); + "io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class"); } @Override public List exposedClassNames() { return singletonList( - "io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0.OpenTelemetryMeterRegistryAutoConfiguration"); + "io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0.OpenTelemetryMeterRegistryAutoConfiguration"); } @Override diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/ActuatorTest.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/ActuatorTest.java similarity index 97% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/ActuatorTest.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/ActuatorTest.java index e0a11b1465f4..d363c7fb4abb 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/ActuatorTest.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/ActuatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; @@ -14,7 +14,7 @@ import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; -import io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0.SpringApp.TestBean; +import io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0.SpringApp.TestBean; import java.util.ArrayList; import java.util.Set; import org.junit.jupiter.api.Test; diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringApp.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringApp.java similarity index 97% rename from instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringApp.java rename to instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringApp.java index 06275f89ba20..7b653fb5f3be 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringApp.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringApp.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0; +package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; From 58b3e2515929ba9b1100c7aa0b32356409d8ea1b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 13 May 2026 07:04:50 -0700 Subject: [PATCH 2/2] Run spotless --- .../v2_0/SpringBootActuatorInstrumentationModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java index 6f68e0702d35..6af49de7468a 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/SpringBootActuatorInstrumentationModule.java @@ -42,7 +42,7 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder) // classloaders, so that the bean class loader (different from the instrumented class loader) // can load it helperResourceBuilder.registerForAllClassLoaders( - "io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class"); + "io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class"); } @Override