diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-3.txt b/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-3.txt deleted file mode 100644 index 0737e9b6180b..000000000000 --- a/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-3.txt +++ /dev/null @@ -1,2 +0,0 @@ -Comparing source compatibility of opentelemetry-autoconfigure-spring-boot-3-2.6.0-SNAPSHOT.jar against -No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-2.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-2.txt similarity index 50% rename from docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-2.txt rename to docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-2.txt index 74cea130e500..6bf00fc78372 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-2.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-2.txt @@ -1,8 +1,8 @@ -Comparing source compatibility of opentelemetry-autoconfigure-spring-boot-2-2.6.0-SNAPSHOT.jar against -+++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration (not serializable) +Comparing source compatibility of opentelemetry-spring-2.6.0-SNAPSHOT.jar against ++++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration (not serializable) +++ CLASS FILE FORMAT VERSION: 52.0 <- n.a. +++ NEW SUPERCLASS: java.lang.Object +++ NEW CONSTRUCTOR: PUBLIC(+) OpenTelemetryAutoConfiguration() +++ NEW ANNOTATION: org.springframework.context.annotation.Configuration +++ NEW ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties - +++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties (+) + +++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties (+) diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-3.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-3.txt new file mode 100644 index 000000000000..ac6541a45dea --- /dev/null +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-3.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-3-2.6.0-SNAPSHOT.jar against +No changes. \ No newline at end of file diff --git a/docs/contributing/intellij-setup-and-troubleshooting.md b/docs/contributing/intellij-setup-and-troubleshooting.md index 0b47b066eabf..2dc82afb693a 100644 --- a/docs/contributing/intellij-setup-and-troubleshooting.md +++ b/docs/contributing/intellij-setup-and-troubleshooting.md @@ -35,7 +35,7 @@ If you are working on a specific instrumentation, you can load only the modules For example, to load the modules for the Spring Boot autoconfigure instrumentation, run: ```shell -./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/ +./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2.7/ ``` Install the [Kotlin executable](https://kotlinlang.org/docs/tutorials/command-line.html) diff --git a/docs/contributing/selectModules.kts b/docs/contributing/selectModules.kts index ce9508197f2b..92dc4e7873d4 100755 --- a/docs/contributing/selectModules.kts +++ b/docs/contributing/selectModules.kts @@ -12,7 +12,7 @@ main(args) fun main(args: Array) { if (args.isEmpty()) { - println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/ ...") + println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2.7/ ...") return } diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/README.md b/instrumentation/spring/spring-boot-autoconfigure-2.7/README.md similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-2/README.md rename to instrumentation/spring/spring-boot-autoconfigure-2.7/README.md diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure-2.7/build.gradle.kts similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts rename to instrumentation/spring/spring-boot-autoconfigure-2.7/build.gradle.kts index cf1f041567de..7b370607dd76 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("otel.japicmp-conventions") } -base.archivesName.set("opentelemetry-autoconfigure-spring-boot-2") +base.archivesName.set("opentelemetry-spring-boot-autoconfigure-2.7") group = "io.opentelemetry.instrumentation" val springBootVersion = "2.7.18" // AutoConfiguration is added in 2.7.0, but can be used with older versions diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/gradle.properties b/instrumentation/spring/spring-boot-autoconfigure-2.7/gradle.properties similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-2/gradle.properties rename to instrumentation/spring/spring-boot-autoconfigure-2.7/gradle.properties diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfiguration.java similarity index 88% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfiguration.java index f3f936f37693..c650664f0c74 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfiguration.java @@ -3,18 +3,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.TracerProvider; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.MapConverter; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.SdkEnabled; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.DistroVersionResourceProvider; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.SpringResourceProvider; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.MapConverter; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.SdkEnabled; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.SpringConfigProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources.DistroVersionResourceProvider; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources.SpringResourceProvider; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil; import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/ConditionalOnEnabledInstrumentation.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/ConditionalOnEnabledInstrumentation.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/ConditionalOnEnabledInstrumentation.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/ConditionalOnEnabledInstrumentation.java index e54ca70fa971..949586bd13ed 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/ConditionalOnEnabledInstrumentation.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/ConditionalOnEnabledInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal; import io.opentelemetry.api.OpenTelemetry; import java.lang.annotation.ElementType; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/InstrumentationPropertyEnabled.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/InstrumentationPropertyEnabled.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/InstrumentationPropertyEnabled.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/InstrumentationPropertyEnabled.java index ef049fa7eed1..156dcceab387 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/InstrumentationPropertyEnabled.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/InstrumentationPropertyEnabled.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal; import java.util.Map; import org.springframework.context.annotation.Condition; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/MapConverter.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/MapConverter.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/MapConverter.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/MapConverter.java index 94344c8dadda..af78ddda34a7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/MapConverter.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/MapConverter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import java.util.Collections; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/SdkEnabled.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/SdkEnabled.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/SdkEnabled.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/SdkEnabled.java index 871d23ca712c..446f37bc57df 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/SdkEnabled.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/SdkEnabled.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal; import org.springframework.boot.autoconfigure.condition.AnyNestedCondition; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java similarity index 89% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java index a0d9c83e9fd6..51ddeb19fffe 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.annotations.WithSpan; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import org.aspectj.lang.annotation.Aspect; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java similarity index 96% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java index 2eda95bfdda1..98cb03a22b16 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspect.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.api.OpenTelemetry; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JoinPointRequest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JoinPointRequest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JoinPointRequest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JoinPointRequest.java index 817546cd0727..39710a361c23 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JoinPointRequest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JoinPointRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.instrumentation.annotations.WithSpan; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java similarity index 93% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java index 043392a8cd62..dca4312322be 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/JointPointCodeAttributesExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspect.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspect.java similarity index 97% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspect.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspect.java index b07a66f8e451..c947b3c82a44 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspect.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspect.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; @@ -28,7 +28,7 @@ * can not be applied to constructors. */ abstract class WithSpanAspect { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-boot-autoconfigure-2"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-boot-autoconfigure-2.7"; private final Instrumenter instrumenter; private final JoinPointRequest.Factory requestFactory; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java index 19f66be02daa..e89dd07447ea 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import io.opentelemetry.instrumentation.annotations.SpanAttribute; import io.opentelemetry.instrumentation.api.annotation.support.ParameterAttributeNamesExtractor; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/DataSourcePostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/DataSourcePostProcessor.java similarity index 93% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/DataSourcePostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/DataSourcePostProcessor.java index 104b93594133..aa02a02a72c2 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/DataSourcePostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/DataSourcePostProcessor.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import javax.sql.DataSource; import org.springframework.aop.scope.ScopedProxyUtils; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java similarity index 91% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java index 42772394264c..fedae6b1bf23 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import javax.sql.DataSource; import org.springframework.beans.factory.ObjectProvider; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java index daeb9332c446..344ee308baf8 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java similarity index 92% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java index 83b35db656ff..2235787afedf 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderApplicationListener.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderApplicationListener.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderApplicationListener.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderApplicationListener.java index 208e285e0647..139f805a2f14 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderApplicationListener.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderApplicationListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderInstaller.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderInstaller.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderInstaller.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderInstaller.java index f68815a7d8a8..bcbab272b4a1 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderInstaller.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderInstaller.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java similarity index 92% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java index 2423a7022783..ade4ecce7cf7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java similarity index 91% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java index 716ef47261a0..32b477c1737f 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.micrometer; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.micrometer; import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.MeterRegistry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java similarity index 85% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java index 04cd707e456e..d3108314a077 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.mongo; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.mongo; import com.mongodb.MongoClientSettings; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java similarity index 90% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java index 303e631cfd20..98931d00a94c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.r2dbc.spi.ConnectionFactory; import org.springframework.beans.factory.ObjectProvider; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java similarity index 94% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java index 9bc780ecc6ce..446f6b3441f3 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.R2dbcTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateBeanPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateBeanPostProcessor.java similarity index 97% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateBeanPostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateBeanPostProcessor.java index 9e8fda03d009..352fdbd12d4e 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateBeanPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateBeanPostProcessor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateInstrumentation.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateInstrumentation.java similarity index 91% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateInstrumentation.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateInstrumentation.java index 8097c4d2d921..1c0f6b78a396 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/RestTemplateInstrumentation.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/RestTemplateInstrumentation.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry; import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java similarity index 92% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java index 5a1df99aba65..ab8e73333cea 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java similarity index 92% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java index 564269156aa7..8c71c688759c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessor.java similarity index 94% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessor.java index 651a38e9fa9e..5e47de5226cd 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessor.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.instrumentation.spring.webflux.v5_3.SpringWebfluxTelemetry; import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java similarity index 85% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java index a3c3ca3e8778..5058650a6fec 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webmvc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webmvc; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.instrumentation.spring.webmvc.v5_3.SpringWebMvcTelemetry; import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/ConfigPropertiesBridge.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/ConfigPropertiesBridge.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/ConfigPropertiesBridge.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/ConfigPropertiesBridge.java index 156b95a92d21..a47cb18c704f 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/ConfigPropertiesBridge.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/ConfigPropertiesBridge.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/InstrumentationConfigUtil.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/InstrumentationConfigUtil.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/InstrumentationConfigUtil.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/InstrumentationConfigUtil.java index a0dfae102e13..f5dc376689a5 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/InstrumentationConfigUtil.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/InstrumentationConfigUtil.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import com.google.errorprone.annotations.CanIgnoreReturnValue; import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtelResourceProperties.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtelResourceProperties.java similarity index 96% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtelResourceProperties.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtelResourceProperties.java index 7cd552ea17ae..333c347e59da 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtelResourceProperties.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtelResourceProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import java.util.Collections; import java.util.Map; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterProperties.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterProperties.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterProperties.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterProperties.java index f4c706dccfa0..e90a0793b94f 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterProperties.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import java.util.HashMap; import java.util.Map; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/PropagationProperties.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/PropagationProperties.java similarity index 96% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/PropagationProperties.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/PropagationProperties.java index 53056c5506fe..badd01bcaa62 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/PropagationProperties.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/PropagationProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import java.util.Collections; import java.util.List; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/SpringConfigProperties.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/SpringConfigProperties.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/SpringConfigProperties.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/SpringConfigProperties.java index 9b9b67038513..8ae80152ae75 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/SpringConfigProperties.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/SpringConfigProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import io.opentelemetry.exporter.otlp.internal.OtlpConfigUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProvider.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProvider.java similarity index 95% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProvider.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProvider.java index 755f14559677..8349be134c82 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; @@ -19,7 +19,7 @@ public class DistroVersionResourceProvider implements ResourceProvider { public static final String VERSION = - EmbeddedInstrumentationProperties.findVersion("io.opentelemetry.spring-boot-autoconfigure-2"); + EmbeddedInstrumentationProperties.findVersion("io.opentelemetry.spring-boot-autoconfigure-2.7"); private static final AttributeKey TELEMETRY_DISTRO_NAME = AttributeKey.stringKey("telemetry.distro.name"); diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProvider.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProvider.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProvider.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProvider.java index 975bf1b3e46d..3cbdd9b96fe7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProvider.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-spring-boot/resource-config.json b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-spring-boot/resource-config.json similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-spring-boot/resource-config.json rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/native-image/io.opentelemetry.instrumentation/opentelemetry-spring-boot/resource-config.json diff --git a/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring.factories b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000000..a6a0b6ddd2d4 --- /dev/null +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring.factories @@ -0,0 +1,15 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations.InstrumentationAnnotationsAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging.OpenTelemetryAppenderAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc.JdbcInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.micrometer.MicrometerBridgeAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc.R2dbcInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web.SpringWebInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux.SpringWebfluxInstrumentationAutoConfiguration,\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webmvc.SpringWebMvc5InstrumentationAutoConfiguration + +org.springframework.context.ApplicationListener=\ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging.LogbackAppenderApplicationListener diff --git a/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000000..a7a2bb7f1283 --- /dev/null +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,10 @@ +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations.InstrumentationAnnotationsAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging.OpenTelemetryAppenderAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc.JdbcInstrumentationAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.micrometer.MicrometerBridgeAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc.R2dbcInstrumentationAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web.SpringWebInstrumentationAutoConfiguration +io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux.SpringWebfluxInstrumentationAutoConfiguration diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfigurationTest.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfigurationTest.java index 0529c70e9e94..722a08a2bab2 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/OpenTelemetryAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java similarity index 97% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java index d9c9053b53ea..705dd7df4e5b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationAnnotationsAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java index 9d6818b367bf..1f02761d908d 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/annotations/InstrumentationWithSpanAspectTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java index 2994c26414f4..023f6876bdeb 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.micrometer; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.micrometer; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java index 118076a97dea..498d96961347 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java index 108cb5d3efed..99a61434390c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/web/SpringWebInstrumentationAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java index 6ec594630095..7c42fff130e6 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java index 5aca77fd32ce..d52c34f99e3b 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webflux/WebClientBeanPostProcessorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java index 31835cbe93c7..a97bca9fc3ae 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/webmvc/SpringWebMvcInstrumentation5AutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webmvc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webmvc; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeFalse; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterPropertiesTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterPropertiesTest.java similarity index 96% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterPropertiesTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterPropertiesTest.java index 4d6ea10115ae..a40ac7437599 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/properties/OtlpExporterPropertiesTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/properties/OtlpExporterPropertiesTest.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import java.util.Arrays; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProviderTest.java similarity index 94% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProviderTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProviderTest.java index e05fa73fc36c..418ea639d53c 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/DistroVersionResourceProviderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/DistroVersionResourceProviderTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources; import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableMap; import io.opentelemetry.api.common.AttributeKey; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import org.junit.jupiter.api.DisplayName; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringConfigPropertiesTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringConfigPropertiesTest.java similarity index 82% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringConfigPropertiesTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringConfigPropertiesTest.java index 44cc94df327b..36a04e8a1760 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringConfigPropertiesTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringConfigPropertiesTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.SpringConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import java.util.HashMap; import java.util.Map; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProviderTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProviderTest.java similarity index 84% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProviderTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProviderTest.java index 001ebf398f5a..aadf7da6cfb8 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/resources/SpringResourceProviderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/resources/SpringResourceProviderTest.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.SpringConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.testing.assertj.AttributesAssert; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderTest.java similarity index 99% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderTest.java index 818296833e76..743a143869b5 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackAppenderTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackAppender/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackAppenderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackAppender/resources/logback-test.xml b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackAppender/resources/logback-test.xml similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackAppender/resources/logback-test.xml rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackAppender/resources/logback-test.xml diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackMissingTest.java b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackMissingTest.java similarity index 95% rename from instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackMissingTest.java rename to instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackMissingTest.java index f4beb3e47205..7f4dac2d32e8 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/instrumentation/logging/LogbackMissingTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-2.7/src/testLogbackMissing/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2_7/internal/instrumentation/logging/LogbackMissingTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging; +package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring.factories b/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f06e51c2e314..000000000000 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,15 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations.InstrumentationAnnotationsAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging.OpenTelemetryAppenderAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc.JdbcInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.micrometer.MicrometerBridgeAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc.R2dbcInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web.SpringWebInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux.SpringWebfluxInstrumentationAutoConfiguration,\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webmvc.SpringWebMvc5InstrumentationAutoConfiguration - -org.springframework.context.ApplicationListener=\ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging.LogbackAppenderApplicationListener diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index f8be45c43e75..000000000000 --- a/instrumentation/spring/spring-boot-autoconfigure-2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,10 +0,0 @@ -io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations.InstrumentationAnnotationsAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging.OpenTelemetryAppenderAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc.JdbcInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.micrometer.MicrometerBridgeAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc.R2dbcInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web.SpringWebInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux.SpringWebfluxInstrumentationAutoConfiguration diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/README.md b/instrumentation/spring/spring-boot-autoconfigure-3.0/README.md similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-3/README.md rename to instrumentation/spring/spring-boot-autoconfigure-3.0/README.md diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure-3.0/build.gradle.kts similarity index 83% rename from instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts rename to instrumentation/spring/spring-boot-autoconfigure-3.0/build.gradle.kts index 0ec7f0aa4195..4907bde6f237 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("otel.japicmp-conventions") } -base.archivesName.set("opentelemetry-autoconfigure-spring-boot-3") +base.archivesName.set("opentelemetry-spring-boot-autoconfigure-3.0") group = "io.opentelemetry.instrumentation" otelJava { @@ -13,13 +13,12 @@ otelJava { dependencies { val springBootVersion = "3.2.4" library("org.springframework.boot:spring-boot-starter-web:$springBootVersion") - implementation(project(":instrumentation:spring:spring-boot-autoconfigure-2")) + implementation(project(":instrumentation:spring:spring-boot-autoconfigure-2.7")) implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library")) implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")) compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0") - testImplementation(project(":instrumentation:spring:spring-boot-autoconfigure-2")) testLibrary("org.springframework.boot:spring-boot-starter-test:$springBootVersion") { exclude("org.junit.vintage", "junit-vintage-engine") } diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/gradle.properties b/instrumentation/spring/spring-boot-autoconfigure-3.0/gradle.properties similarity index 100% rename from instrumentation/spring/spring-boot-autoconfigure-3/gradle.properties rename to instrumentation/spring/spring-boot-autoconfigure-3.0/gradle.properties diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java similarity index 95% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java index a3b48085646b..2015ad5cda5d 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/annotations/OpenTelemetryAnnotationsRuntimeHints.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.annotations; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.annotations; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientBeanPostProcessor.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientBeanPostProcessor.java similarity index 94% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientBeanPostProcessor.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientBeanPostProcessor.java index fd448ad77980..0e29a5a930e6 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientBeanPostProcessor.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientBeanPostProcessor.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.web; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry; import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java similarity index 93% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java index ef5fcca64b0f..84da8d25762d 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.web; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java similarity index 85% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java index 15ec1cf95d9b..639ae739ebce 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.webmvc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.webmvc; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil; import io.opentelemetry.instrumentation.spring.webmvc.v6_0.SpringWebMvcTelemetry; import io.opentelemetry.instrumentation.spring.webmvc.v6_0.internal.SpringMvcBuilderUtil; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/aot.factories b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/aot.factories new file mode 100644 index 000000000000..8d66a59a1476 --- /dev/null +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/aot.factories @@ -0,0 +1,2 @@ +org.springframework.aot.hint.RuntimeHintsRegistrar=\ +annotations.io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.OpenTelemetryAnnotationsRuntimeHints diff --git a/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000000..e57f68e5bbbb --- /dev/null +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +web.io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.RestClientInstrumentationAutoConfiguration +webmvc.io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.SpringWebMvc6InstrumentationAutoConfiguration diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java index 990ceb989028..4fb95dbbf0b7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/web/RestClientInstrumentationAutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.web; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.web; import static org.assertj.core.api.Assertions.assertThat; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java similarity index 98% rename from instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java rename to instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java index b50d1af4729c..720e05d7c4e5 100644 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java +++ b/instrumentation/spring/spring-boot-autoconfigure-3.0/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/v3_0/internal/instrumentation/webmvc/SpringWebMvcInstrumentation6AutoConfigurationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.webmvc; +package io.opentelemetry.instrumentation.spring.autoconfigure.v3_0.internal.instrumentation.webmvc; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeTrue; diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/aot.factories b/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/aot.factories deleted file mode 100644 index 13207fe900de..000000000000 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/aot.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.aot.hint.RuntimeHintsRegistrar=\ -io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.annotations.OpenTelemetryAnnotationsRuntimeHints diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 18b469908e99..000000000000 --- a/instrumentation/spring/spring-boot-autoconfigure-3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.web.RestClientInstrumentationAutoConfiguration -io.opentelemetry.instrumentation.spring.autoconfigure.v3.internal.instrumentation.webmvc.SpringWebMvc6InstrumentationAutoConfiguration diff --git a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts index 43427c5323d7..43494d2b1d32 100644 --- a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts +++ b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts @@ -11,8 +11,8 @@ val springBootVersion = "2.6.15" dependencies { compileOnly("org.springframework.boot:spring-boot-starter:$springBootVersion") compileOnly("org.springframework.boot:spring-boot-starter-aop:$springBootVersion") - api(project(":instrumentation:spring:spring-boot-autoconfigure-2")) - api(project(":instrumentation:spring:spring-boot-autoconfigure-3")) + api(project(":instrumentation:spring:spring-boot-autoconfigure-2.7")) + api(project(":instrumentation:spring:spring-boot-autoconfigure-3.0")) api(project(":instrumentation-annotations")) implementation(project(":instrumentation:resources:library")) implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") diff --git a/instrumentation/spring/starters/zipkin-spring-boot-starter/README.md b/instrumentation/spring/starters/zipkin-spring-boot-starter/README.md index a91e52ea4d5a..4f883582ecfe 100644 --- a/instrumentation/spring/starters/zipkin-spring-boot-starter/README.md +++ b/instrumentation/spring/starters/zipkin-spring-boot-starter/README.md @@ -1,7 +1,7 @@ # OpenTelemetry Zipkin Exporter Starter -The OpenTelemetry Exporter Starter for Java is a starter package that includes packages required to enable tracing using OpenTelemetry. It also provides the dependency and corresponding auto-configuration. Check out [opentelemetry-spring-boot-autoconfigure](../../spring-boot-autoconfigure-2/README.md#features) for the list of supported libraries and features. +The OpenTelemetry Exporter Starter for Java is a starter package that includes packages required to enable tracing using OpenTelemetry. It also provides the dependency and corresponding auto-configuration. Check out [opentelemetry-spring-boot-autoconfigure](../../spring-boot-autoconfigure-2.7/README.md#features) for the list of supported libraries and features. -OpenTelemetry Zipkin Exporter Starter is a starter package that includes the opentelemetry-api, opentelemetry-sdk, opentelemetry-extension-annotations, opentelemetry-logging-exporter, opentelemetry-spring-boot-autoconfigurations and spring framework starters required to setup distributed tracing. It also provides the [opentelemetry-exporters-zipkin](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/zipkin) artifact and corresponding exporter auto-configuration. Check out [opentelemetry-spring-boot-autoconfigure](../../spring-boot-autoconfigure-2/README.md#features) for the list of supported libraries and features. +OpenTelemetry Zipkin Exporter Starter is a starter package that includes the opentelemetry-api, opentelemetry-sdk, opentelemetry-extension-annotations, opentelemetry-logging-exporter, opentelemetry-spring-boot-autoconfigurations and spring framework starters required to setup distributed tracing. It also provides the [opentelemetry-exporters-zipkin](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/zipkin) artifact and corresponding exporter auto-configuration. Check out [opentelemetry-spring-boot-autoconfigure](../../spring-boot-autoconfigure-2.7/README.md#features) for the list of supported libraries and features. Documentation for the OpenTelemetry Zipkin Exporter Starter can be found [here](https://opentelemetry.io/docs/zero-code/java/spring-boot/#zipkin-starter). diff --git a/settings.gradle.kts b/settings.gradle.kts index 7cbfdaa083fc..b95425394d36 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -550,8 +550,8 @@ include(":instrumentation:servlet:servlet-javax-common:javaagent") include(":instrumentation:spark-2.3:javaagent") include(":instrumentation:spring:spring-batch-3.0:javaagent") include(":instrumentation:spring:spring-boot-actuator-autoconfigure-2.0:javaagent") -include(":instrumentation:spring:spring-boot-autoconfigure-2") -include(":instrumentation:spring:spring-boot-autoconfigure-3") +include(":instrumentation:spring:spring-boot-autoconfigure-2.7") +include(":instrumentation:spring:spring-boot-autoconfigure-3.0") include(":instrumentation:spring:spring-boot-resources:javaagent") include(":instrumentation:spring:spring-boot-resources:javaagent-unit-tests") include(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-2.0:javaagent") diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java index b99c537aee4c..bf5b550fb8d2 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmKafkaSpringStarterSmokeTest.java @@ -6,8 +6,8 @@ package io.opentelemetry.spring.smoketest; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka.KafkaInstrumentationAutoConfiguration; import java.time.Duration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java index 3e667e4c9e3b..dfcecb158666 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractJvmMongodbSpringStarterSmokeTest.java @@ -7,8 +7,8 @@ import com.mongodb.client.MongoClient; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.mongo.MongoClientInstrumentationAutoConfiguration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; diff --git a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java index 773c00e2cf8d..dc96af5e7a08 100644 --- a/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java @@ -12,10 +12,10 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties; -import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties; +import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.SpringConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; diff --git a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts index a1ac6fc9a58e..2bdd00b56662 100644 --- a/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { compileOnly("org.springframework.boot:spring-boot-starter") compileOnly("org.springframework.boot:spring-boot-starter-test") api(project(":testing-common")) - api(project(":instrumentation:spring:spring-boot-autoconfigure-2")) + api(project(":instrumentation:spring:spring-boot-autoconfigure-2.7")) api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi") }