Upgrade to Spring Boot 3.3.1

This also upgrades micrometer-registry-prometheus to 1.13.1 which brings
in the 1.2.x version of the Prometheus Java Client, see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.13.0

Closes gh-82

Author: jonatan-ivanov

client/build.gradle

@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
   api 'io.rsocket:rsocket-core:1.1.+'
-  api 'io.micrometer:micrometer-registry-prometheus:1.12.+'
+  api 'io.micrometer:micrometer-registry-prometheus:1.13.+'
   implementation 'org.xerial.snappy:snappy-java:latest.release'
 
   testImplementation 'ch.qos.logback:logback-classic:1.4.+'

client/src/main/java/io/micrometer/prometheus/rsocket/PrometheusRSocketClient.java

@@ -21,7 +21,7 @@
 import io.micrometer.core.lang.Nullable;
 import io.micrometer.core.util.internal.logging.InternalLogger;
 import io.micrometer.core.util.internal.logging.InternalLoggerFactory;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
 import io.rsocket.core.RSocketConnector;

client/src/test/java/io/micrometer/prometheus/rsocket/PrometheusRSocketClientTests.java

@@ -15,8 +15,8 @@
  */
 package io.micrometer.prometheus.rsocket;
 
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
 import io.rsocket.core.RSocketServer;

client/src/test/java/io/micrometer/prometheus/rsocket/SampleClient.java

@@ -16,8 +16,8 @@
 package io.micrometer.prometheus.rsocket;
 
 import io.micrometer.core.instrument.Counter;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.rsocket.transport.netty.client.WebsocketClientTransport;
 import reactor.core.publisher.Flux;
 import reactor.util.retry.Retry;

client/src/test/java/io/micrometer/prometheus/rsocket/SampleClientThatClosesManually.java

@@ -16,8 +16,8 @@
 package io.micrometer.prometheus.rsocket;
 
 import io.micrometer.core.instrument.Counter;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.rsocket.transport.netty.client.WebsocketClientTransport;
 import reactor.core.publisher.Flux;
 

client/src/test/java/io/micrometer/prometheus/rsocket/SampleManyClients.java

@@ -18,9 +18,9 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import io.micrometer.core.instrument.Clock;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.prometheus.client.CollectorRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
@@ -39,7 +39,7 @@ public static void main(String[] args) {
 
     List<PrometheusMeterRegistry> registries = IntStream.range(0, CLIENT_COUNT)
         .mapToObj(n -> {
-          PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT, new CollectorRegistry(), Clock.SYSTEM);
+          PrometheusMeterRegistry meterRegistry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT, new PrometheusRegistry(), Clock.SYSTEM);
           meterRegistry.config().commonTags("client.id", Integer.toString(n));
 
           PrometheusRSocketClient.build(meterRegistry, TcpClientTransport.create("localhost", 7001))

client/src/test/java/io/micrometer/prometheus/rsocket/SampleServerlessClient.java

@@ -16,8 +16,8 @@
 package io.micrometer.prometheus.rsocket;
 
 import io.micrometer.core.instrument.Counter;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.rsocket.transport.netty.client.TcpClientTransport;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;

proxy-server/build.gradle

@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
     id 'java-library'
-    id 'org.springframework.boot' version '3.2.3' apply false
+    id 'org.springframework.boot' version '3.3.1' apply false
 }
 
 apply plugin: 'io.spring.dependency-management'

proxy-server/src/main/java/io/micrometer/prometheus/rsocket/PrometheusController.java

@@ -19,7 +19,7 @@
 import io.micrometer.core.instrument.DistributionSummary;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.rsocket.Payload;

proxy/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'org.springframework.boot' version '3.2.3'
+  id 'org.springframework.boot' version '3.3.1'
 }
 
 apply plugin: 'io.spring.dependency-management'

starter-spring/build.gradle

@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
   id 'java-library'
-  id 'org.springframework.boot' version '3.2.3' apply false
+  id 'org.springframework.boot' version '3.3.1' apply false
 }
 
 apply plugin: 'io.spring.dependency-management'

starter-spring/src/main/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketClientAutoConfiguration.java

@@ -16,8 +16,8 @@
 
 package io.micrometer.prometheus.rsocket.autoconfigure;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.micrometer.prometheus.rsocket.PrometheusRSocketClient;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

starter-spring/src/main/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketProxyServerAutoConfiguration.java

@@ -15,9 +15,9 @@
  */
 package io.micrometer.prometheus.rsocket.autoconfigure;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.micrometer.prometheus.rsocket.PrometheusController;
 import io.micrometer.prometheus.rsocket.PrometheusControllerProperties;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;