Skip to content

Commit 6c1e485

Browse files
trasktrask
authored
Normalize Spring Boot actuator autoconfigure javaagent package (#18733)
1 parent f1e161d commit 6c1e485

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/AutoConfigurationImportSelectorInstrumentation.java renamed 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import static net.bytebuddy.matcher.ElementMatchers.named;
99
import static net.bytebuddy.matcher.ElementMatchers.returns;

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java renamed 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import static java.util.Collections.singletonList;
99

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorIgnoredTypesConfigurer.java renamed 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import com.google.auto.service.AutoService;
99
import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesBuilder;

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringBootActuatorInstrumentationModule.java renamed 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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Collections.singletonList;
@@ -42,13 +42,13 @@ public void registerHelperResources(HelperResourceBuilder helperResourceBuilder)
4242
// classloaders, so that the bean class loader (different from the instrumented class loader)
4343
// can load it
4444
helperResourceBuilder.registerForAllClassLoaders(
45-
"io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class");
45+
"io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/autoconfigure/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.class");
4646
}
4747

4848
@Override
4949
public List<String> exposedClassNames() {
5050
return singletonList(
51-
"io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0.OpenTelemetryMeterRegistryAutoConfiguration");
51+
"io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0.OpenTelemetryMeterRegistryAutoConfiguration");
5252
}
5353

5454
@Override

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/ActuatorTest.java renamed 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
@@ -14,7 +14,7 @@
1414
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
1515
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1616
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
17-
import io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0.SpringApp.TestBean;
17+
import io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0.SpringApp.TestBean;
1818
import java.util.ArrayList;
1919
import java.util.Set;
2020
import org.junit.jupiter.api.Test;

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/boot/actuator/v2_0/SpringApp.java renamed 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.v2_0;
6+
package io.opentelemetry.javaagent.instrumentation.spring.boot.actuator.autoconfigure.v2_0;
77

88
import io.micrometer.core.instrument.Counter;
99
import io.micrometer.core.instrument.MeterRegistry;

0 commit comments

Comments
 (0)