Align R2DBC instrumentation minimum with SPI 1.0

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### ⚠️ Breaking changes
 
+- Require R2DBC SPI 1.0 or later.
 - Rename the Spark Java instrumentation selector from `spark-2.3` to `spark-2.4`.
 - Spring Boot Java agent resource providers move from
   `io.opentelemetry.instrumentation.spring.resources` to

instrumentation/r2dbc-1.0/javaagent/build.gradle.kts

@@ -8,6 +8,8 @@ muzzle {
   pass {
     group.set("io.r2dbc")
     module.set("r2dbc-spi")
+    // SPI 0.9 matches the referenced API after type erasure, despite the Integer/Long
+    // update-count difference. The supported and tested minimum is SPI 1.0.
     versions.set("[0.9.0.RELEASE,)")
     assertInverse.set(true)
     extraDependency("io.projectreactor:reactor-core:3.4.12")
@@ -25,7 +27,7 @@ sourceSets {
 }
 
 dependencies {
-  library("io.r2dbc:r2dbc-spi:0.9.0.RELEASE")
+  library("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
   compileOnly(project(path = ":instrumentation:r2dbc-1.0:library-instrumentation-shaded", configuration = "shadow"))
 
   testImplementation(project(":instrumentation:r2dbc-1.0:testing"))

instrumentation/r2dbc-1.0/library/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  library("io.r2dbc:r2dbc-spi:0.9.0.RELEASE")
+  library("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
   implementation("io.r2dbc:r2dbc-proxy")
 
   testImplementation(project(":instrumentation:r2dbc-1.0:testing"))

instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/FilterAwareProxyFactory.java

@@ -100,8 +100,6 @@ private FilterAwareResult(
 
     @Override
     public Publisher<Long> getRowsUpdated() {
-      // The Publisher signature is erased; forward SPI 0.9 Integer and SPI 1.0 Long counts
-      // unchanged.
       return delegate.getRowsUpdated();
     }
 

instrumentation/r2dbc-1.0/testing/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 dependencies {
   api("io.opentelemetry.javaagent:opentelemetry-testing-common")
 
-  implementation("io.r2dbc:r2dbc-spi:0.9.0.RELEASE")
+  implementation("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
 
   implementation(project(":instrumentation-api-incubator"))
   implementation("org.testcontainers:testcontainers")