make spring starter stable (open-telemetry#11763)

trask · Jul 12, 2024 · 7739335 · 7739335
1 parent e5af139
commit 7739335
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 4 deletions.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-2.txt b/docs/apidiffs/current_vs_latest/opentelemetry-autoconfigure-spring-boot-2.txt
@@ -0,0 +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)
+	+++  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 (+)
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
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-autoconfigure-spring-boot-3-2.6.0-SNAPSHOT.jar against 
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.6.0-SNAPSHOT.jar against 
+No changes.
diff --git a/.../src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java b/.../src/main/java/io/opentelemetry/javaagent/instrumentation/r2dbc/v1_0/R2dbcSingletons.java
@@ -7,8 +7,8 @@
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.r2dbc.v1_0.R2dbcTelemetry;
-import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.R2dbcNetAttributesGetter;
+import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.R2dbcTelemetry;
+import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.internal.R2dbcNetAttributesGetter;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 

diff --git a/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts b/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts
@@ -23,7 +23,11 @@ tasks {
     }
     relocate(
       "io.r2dbc.proxy",
-      "io.opentelemetry.instrumentation.r2dbc.v1_0.shaded.io.r2dbc.proxy"
+      "io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.io.r2dbc.proxy"
+    )
+    relocate(
+      "io.opentelemetry.instrumentation.r2dbc.v1_0",
+      "io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded"
     )
   }
 

diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure-2/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   id("otel.library-instrumentation")
+  id("otel.japicmp-conventions")
 }
 
 base.archivesName.set("opentelemetry-autoconfigure-spring-boot-2")

diff --git a/instrumentation/spring/spring-boot-autoconfigure-2/gradle.properties b/instrumentation/spring/spring-boot-autoconfigure-2/gradle.properties
@@ -0,0 +1 @@
+otel.stable=true
diff --git a/...ring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java b/...ring/autoconfigure/v2/internal/instrumentation/r2dbc/R2dbcInstrumentingPostProcessor.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.instrumentation.r2dbc.v1_0.R2dbcTelemetry;
+import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.R2dbcTelemetry;
 import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.r2dbc.spi.ConnectionFactory;

diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure-3/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   id("otel.library-instrumentation")
+  id("otel.japicmp-conventions")
 }
 
 base.archivesName.set("opentelemetry-autoconfigure-spring-boot-3")

diff --git a/instrumentation/spring/spring-boot-autoconfigure-3/gradle.properties b/instrumentation/spring/spring-boot-autoconfigure-3/gradle.properties
@@ -0,0 +1 @@
+otel.stable=true
diff --git a/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts b/instrumentation/spring/starters/spring-boot-starter/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
   id("otel.java-conventions")
   id("otel.publish-conventions")
+  id("otel.japicmp-conventions")
 }
 
 group = "io.opentelemetry.instrumentation"

diff --git a/instrumentation/spring/starters/spring-boot-starter/gradle.properties b/instrumentation/spring/starters/spring-boot-starter/gradle.properties
@@ -0,0 +1 @@
+otel.stable=true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Comparing source compatibility of opentelemetry-autoconfigure-spring-boot-3-2.6.0-SNAPSHOT.jar against
		No changes.