move javaagent detector to javaagent project

open-telemetry · Feb 23, 2024 · 927bc66 · 927bc66
1 parent 03a0fa5
commit 927bc66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/...lemetry/instrumentation/spring/autoconfigure/resources/OtelResourceAutoConfiguration.java b/...lemetry/instrumentation/spring/autoconfigure/resources/OtelResourceAutoConfiguration.java
@@ -17,7 +17,6 @@
 import io.opentelemetry.instrumentation.resources.ProcessRuntimeResourceProvider;
 import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
-import io.opentelemetry.instrumentation.spring.resources.SpringBootServiceNameDetector;
 import io.opentelemetry.instrumentation.spring.resources.SpringBootServiceVersionDetector;
 import io.opentelemetry.sdk.autoconfigure.internal.EnvironmentResourceProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -51,12 +50,6 @@ public ResourceProvider otelDistroVersionResourceProvider() {
     return new DistroVersionResourceProvider();
   }
 
-  @Bean
-  @ConditionalOnClass(SpringBootServiceNameDetector.class)
-  public ResourceProvider otelSpringBootServiceNameResourceProvider() {
-    return new SpringBootServiceNameDetector();
-  }
-
   @Bean
   @ConditionalOnClass(SpringBootServiceVersionDetector.class)
   public ResourceProvider otelSpringBootServiceVersionResourceProvider() {

diff --git a/instrumentation/spring/spring-boot-resources/javaagent/build.gradle.kts b/instrumentation/spring/spring-boot-resources/javaagent/build.gradle.kts
@@ -1,7 +1,10 @@
 plugins {
-  id("otel.javaagent-instrumentation")
+  id("otel.sdk-extension")
 }
 
+extra["mavenGroupId"] = "io.opentelemetry.javaagent.instrumentation"
+base.archivesName.set(projectDir.parentFile.name)
+
 dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 
@@ -10,7 +13,7 @@ dependencies {
   testCompileOnly("com.google.auto.service:auto-service-annotations")
 
   implementation("org.snakeyaml:snakeyaml-engine")
-  implementation(project(":instrumentation:resources:library"))
+  implementation(project(":instrumentation:spring:spring-boot-resources:library"))
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 }
diff --git a/instrumentation/spring/spring-boot-resources/library/build.gradle.kts b/instrumentation/spring/spring-boot-resources/library/build.gradle.kts
@@ -9,7 +9,5 @@ dependencies {
   compileOnly("com.google.auto.service:auto-service-annotations")
   testCompileOnly("com.google.auto.service:auto-service-annotations")
 
-  implementation(project(":instrumentation:resources:library"))
-
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 }