Skip to content

Commit 23d75e6

Browse files
zeitlingerzeitlinger
committed
rename spring autoconfigure to autoconfigure-2
1 parent 9bbfe7f commit 23d75e6

File tree

79 files changed

+150
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+150
-150
lines changed

‎docs/contributing/intellij-setup-and-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you are working on a specific instrumentation, you can load only the modules
3535
For example, to load the modules for the Spring Boot autoconfigure instrumentation, run:
3636

3737
```shell
38-
./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/
38+
./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/
3939
```
4040

4141
Install the [Kotlin executable](https://kotlinlang.org/docs/tutorials/command-line.html)

‎docs/contributing/selectModules.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ main(args)
1212

1313
fun main(args: Array<String>) {
1414
if (args.isEmpty()) {
15-
println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure/ <module to include2> ...")
15+
println("Usage: ./docs/contributing/selectModules.kts instrumentation/spring/spring-boot-autoconfigure-2/ <module to include2> ...")
1616
return
1717
}
1818

‎instrumentation/spring/spring-boot-autoconfigure/README.md renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/README.md

File renamed without changes.

‎instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts

File renamed without changes.

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/EnableOpenTelemetry.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/EnableOpenTelemetry.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2;
77

88
import java.lang.annotation.ElementType;
99
import java.lang.annotation.Retention;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/OpenTelemetryAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.api.trace.TracerProvider;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter;
11-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
12-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties;
13-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties;
14-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.PropagationProperties;
15-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.SpringConfigProperties;
16-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.resources.DistroVersionResourceProvider;
17-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.resources.SpringResourceProvider;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.MapConverter;
11+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.SdkEnabled;
12+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties;
13+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties;
14+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties;
15+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties;
16+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.DistroVersionResourceProvider;
17+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.SpringResourceProvider;
1818
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
1919
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
2020
import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/InstrumentationAnnotationsAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.instrumentation.annotations.WithSpan;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1111
import org.aspectj.lang.annotation.Aspect;
1212
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1313
import org.springframework.context.annotation.Bean;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/InstrumentationWithSpanAspect.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/InstrumentationWithSpanAspect.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import org.aspectj.lang.ProceedingJoinPoint;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/JoinPointRequest.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/JoinPointRequest.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.api.trace.SpanKind;
99
import io.opentelemetry.instrumentation.annotations.WithSpan;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/JointPointCodeAttributesExtractor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/JointPointCodeAttributesExtractor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
99

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/WithSpanAspect.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/WithSpanAspect.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.api.trace.Span;
@@ -28,7 +28,7 @@
2828
* can not be applied to constructors.
2929
*/
3030
abstract class WithSpanAspect {
31-
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-boot-autoconfigure";
31+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-boot-autoconfigure-2";
3232

3333
private final Instrumenter<JoinPointRequest, Object> instrumenter;
3434
private final JoinPointRequest.Factory requestFactory;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/annotations/WithSpanAspectParameterAttributeNamesExtractor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.annotations;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.annotations;
77

88
import io.opentelemetry.instrumentation.annotations.SpanAttribute;
99
import io.opentelemetry.instrumentation.api.annotation.support.ParameterAttributeNamesExtractor;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/jdbc/DataSourcePostProcessor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/jdbc/DataSourcePostProcessor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.jdbc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.jdbc;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry;
11-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
11+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1212
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1313
import javax.sql.DataSource;
1414
import org.springframework.aop.scope.ScopedProxyUtils;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/jdbc/JdbcInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.jdbc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.jdbc;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import javax.sql.DataSource;
1212
import org.springframework.beans.factory.ObjectProvider;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/kafka/ConcurrentKafkaListenerContainerFactoryPostProcessor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.kafka;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.kafka;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/kafka/KafkaInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.kafka;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.kafka;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1212
import org.springframework.beans.factory.ObjectProvider;
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging/LogbackAppenderApplicationListener.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/logging/LogbackAppenderApplicationListener.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.logging;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.logging;
77

88
import org.springframework.boot.SpringApplication;
99
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging/LogbackAppenderInstaller.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/logging/LogbackAppenderInstaller.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.logging;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.logging;
77

88
import ch.qos.logback.classic.LoggerContext;
99
import ch.qos.logback.classic.spi.ILoggingEvent;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/logging/OpenTelemetryAppenderAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.logging;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.logging;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1010
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1111
import org.springframework.boot.context.event.ApplicationReadyEvent;
1212
import org.springframework.context.ApplicationListener;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.micrometer;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.micrometer;
77

88
import io.micrometer.core.instrument.Clock;
99
import io.micrometer.core.instrument.MeterRegistry;
1010
import io.opentelemetry.api.OpenTelemetry;
1111
import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
12-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
12+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1313
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
1414
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
1515
import org.springframework.boot.autoconfigure.AutoConfigureAfter;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.mongo;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.mongo;
77

88
import com.mongodb.MongoClientSettings;
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry;
11-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
12-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
11+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
12+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1414
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1515
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.r2dbc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.r2dbc;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import io.r2dbc.spi.ConnectionFactory;
1212
import org.springframework.beans.factory.ObjectProvider;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.r2dbc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.r2dbc;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.instrumentation.r2dbc.v1_0.R2dbcTelemetry;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1111
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1212
import io.r2dbc.spi.ConnectionFactory;
1313
import io.r2dbc.spi.ConnectionFactoryOptions;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestTemplateBeanPostProcessor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/web/RestTemplateBeanPostProcessor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.web;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/RestTemplateInstrumentation.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/web/RestTemplateInstrumentation.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.web;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
99
import io.opentelemetry.api.OpenTelemetry;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1111
import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry;
1212
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.web;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.web;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import org.springframework.beans.factory.ObjectProvider;
1212
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webflux;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.webflux;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import org.springframework.beans.factory.ObjectProvider;
1212
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webflux/WebClientBeanPostProcessor.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/webflux/WebClientBeanPostProcessor.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webflux;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.webflux;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1010
import io.opentelemetry.instrumentation.spring.webflux.v5_3.SpringWebfluxTelemetry;
1111
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
1212
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/webmvc/SpringWebMvc5InstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webmvc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.webmvc;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1111
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.SpringWebMvcTelemetry;
1212
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/instrumentation/webmvc/SpringWebMvc6InstrumentationAutoConfiguration.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.webmvc;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.instrumentation.webmvc;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
10-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
10+
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
1111
import io.opentelemetry.instrumentation.spring.webmvc.v6_0.SpringWebMvcTelemetry;
1212
import io.opentelemetry.instrumentation.spring.webmvc.v6_0.internal.SpringMvcBuilderUtil;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/ConditionalOnEnabledInstrumentation.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/ConditionalOnEnabledInstrumentation.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import java.lang.annotation.ElementType;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/InstrumentationPropertyEnabled.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/InstrumentationPropertyEnabled.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal;
77

88
import java.util.Map;
99
import org.springframework.context.annotation.Condition;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/MapConverter.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/MapConverter.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal;
77

88
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
99
import java.util.Collections;

‎instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/SdkEnabled.java renamed to ‎instrumentation/spring/spring-boot-autoconfigure-2/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/v2/internal/SdkEnabled.java

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

6-
package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
6+
package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal;
77

88
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
99
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

0 commit comments

Comments
 (0)