diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java new file mode 100644 index 000000000000..a9b35abaa391 --- /dev/null +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceNameDetector.java @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.spring.resources; + +import com.google.auto.service.AutoService; +import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; + +// In 3.0, switch the AutoService annotation to +// io.opentelemetry.javaagent.instrumentation.spring.boot.resources. +@Deprecated // to be removed in 3.0 +@AutoService(ResourceProvider.class) +public class SpringBootServiceNameDetector + extends io.opentelemetry.javaagent.instrumentation.spring.boot.resources + .SpringBootServiceNameDetector {} diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java new file mode 100644 index 000000000000..51ec030f3c91 --- /dev/null +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.spring.resources; + +import com.google.auto.service.AutoService; +import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; + +// In 3.0, switch the AutoService annotation to +// io.opentelemetry.javaagent.instrumentation.spring.boot.resources. +@Deprecated // to be removed in 3.0 +@AutoService(ResourceProvider.class) +public class SpringBootServiceVersionDetector + extends io.opentelemetry.javaagent.instrumentation.spring.boot.resources + .SpringBootServiceVersionDetector {} diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java new file mode 100644 index 000000000000..6c7a4717cb02 --- /dev/null +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java @@ -0,0 +1,17 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.instrumentation.spring.resources; + +import com.google.auto.service.AutoService; +import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; + +// In 3.0, switch the AutoService annotation to +// io.opentelemetry.javaagent.instrumentation.spring.boot.resources. +@Deprecated // to be removed in 3.0 +@AutoService(ComponentProvider.class) +public class SpringResourceComponentProvider + extends io.opentelemetry.javaagent.instrumentation.spring.boot.resources + .SpringResourceComponentProvider {} diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceNameDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceNameDetector.java index d038b7b9db5f..b810ec17e2d8 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceNameDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceNameDetector.java @@ -9,10 +9,8 @@ import static java.util.logging.Level.FINE; import static java.util.logging.Level.FINER; -import com.google.auto.service.AutoService; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; -import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider; import io.opentelemetry.sdk.resources.Resource; import java.io.IOException; @@ -55,7 +53,6 @@ *

Note: The spring starter already includes provider in * io.opentelemetry.instrumentation.spring.autoconfigure.resources.SpringResourceProvider */ -@AutoService(ResourceProvider.class) public class SpringBootServiceNameDetector implements ConditionalResourceProvider { private static final Logger logger = diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceVersionDetector.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceVersionDetector.java index 94cf112a0072..9fb63d7dfdac 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceVersionDetector.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringBootServiceVersionDetector.java @@ -8,7 +8,6 @@ import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION; import static java.util.logging.Level.FINE; -import com.google.auto.service.AutoService; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider; @@ -23,7 +22,6 @@ * Note: The spring starter already includes provider in * io.opentelemetry.instrumentation.spring.autoconfigure.resources.SpringResourceProvider */ -@AutoService(ResourceProvider.class) public class SpringBootServiceVersionDetector implements ResourceProvider { private static final Logger logger = diff --git a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringResourceComponentProvider.java b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringResourceComponentProvider.java index 6a88cc1fbf4b..40598ba209fc 100644 --- a/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringResourceComponentProvider.java +++ b/instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/boot/resources/SpringResourceComponentProvider.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.spring.boot.resources; -import com.google.auto.service.AutoService; import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider; import io.opentelemetry.sdk.resources.Resource; @@ -16,7 +15,6 @@ *

This class is internal and is hence not for public use. Its APIs are unstable and can change * at any time. */ -@AutoService(ComponentProvider.class) public class SpringResourceComponentProvider implements ComponentProvider { @Override