Merge branch 'micrometer-metrics:main' into connected-metrics-metadata

Author: Mateo00

.circleci/config.yml

@@ -1,16 +1,16 @@
 version: 2.1
 
 executors:
-  circle-jdk8-executor:
+  circle-jdk17-executor:
     working_directory: ~/prometheus-rsocket-proxy
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:8.0.322
+      - image: cimg/openjdk:17.0.7
 
 jobs:
   build:
-    executor: circle-jdk8-executor
+    executor: circle-jdk17-executor
     steps:
       - checkout
 
@@ -46,7 +46,7 @@ jobs:
           path: test-results/
 
   deploy:
-    executor: circle-jdk8-executor
+    executor: circle-jdk17-executor
     steps:
       - checkout
       - restore_cache:
@@ -62,6 +62,8 @@ workflows:
     jobs:
       - build
       - deploy:
+          context:
+            - deploy
           requires:
             - build
           filters:
@@ -78,6 +80,8 @@ workflows:
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - deploy:
+          context:
+            - deploy
           requires:
             - build
           filters:

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

CONTRIBUTING.md

@@ -0,0 +1,59 @@
+# Contributing Guide
+
+This Contributing Guide is intended for those that would like to contribute to this repository.
+
+If you would like to use any of the published modules in your project, you can instead
+include the artifacts from the Maven Central repository using your build tool of choice or the published container images.
+
+## Code of Conduct
+
+See [our Contributor Code of Conduct](https://github.com/micrometer-metrics/.github/blob/main/CODE_OF_CONDUCT.md).
+
+## Contributions
+
+Contributions come in various forms and are not limited to code changes. The community benefits from
+contributions in all forms.
+
+For example, those with knowledge and experience can contribute by:
+
+* Answering [Stackoverflow questions](https://stackoverflow.com/tags/prometheus-rsocket-proxy)
+* Answering questions on the [Micrometer slack](https://slack.micrometer.io)
+* Share knowledge in other ways (e.g. presentations, blogs)
+
+The remainder of this document will focus on guidance for contributing code changes. It will help contributors to build,
+modify, or test the source code.
+
+## Include a Signed Off By Trailer
+
+All commits must include a *Signed-off-by* trailer at the end of each commit message to indicate that the contributor agrees to the [Developer Certificate of Origin](https://developercertificate.org).
+For additional details, please refer to the blog post [Hello DCO, Goodbye CLA: Simplifying Contributions to Spring](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring).
+
+## Getting the source
+
+The source code is hosted on GitHub at https://github.com/micrometer-metrics/prometheus-rsocket-proxy. You can use a
+Git client to clone the source code to your local machine.
+
+## Building
+
+This project targets Java 17.
+
+The Gradle wrapper is provided and should be used for building with a consistent version of Gradle.
+
+The wrapper can be used with a command, for example, `./gradlew check` to build the project and check conventions.
+
+## Importing into an IDE
+
+This repository should be imported as a Gradle project into your IDE of choice.
+
+## Testing changes locally
+
+Specific modules or a test class can be run from your IDE for convenience.
+
+The Gradle `check` task depends on the `test` task, and so tests will be run as part of a build as described previously.
+
+### Publishing local snapshots
+
+Run `./gradlew pTML` to publish a Maven-style snapshot to your Maven local repo. The build automatically calculates
+the "next" version for you when publishing snapshots.
+
+These local snapshots can be used in another project to test the changes.

README.md

@@ -65,7 +65,7 @@ or
 This will autoconfigure the Micrometer `PrometheusMeterRegistry`, a `PrometheusRSocketClient`, and a call to `pushAndClose` on application shutdown. The client will be configured to retry failing connections to the proxy. Retrying can be tuned with:
 
 ```yml
-management.metrics.export.prometheus.rsocket:
+micrometer.prometheus.rsocket:
   host: YOURPROXYHOSTHERE #required
   port: 7001
   max-retries: 10000 # default is Long.MAX_VALUE

build.gradle

@@ -9,19 +9,19 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.netflix.nebula:nebula-release-plugin:16.0.0'
-    classpath 'com.netflix.nebula:nebula-publishing-plugin:18.4.0'
-    classpath 'com.netflix.nebula:nebula-project-plugin:9.4.0'
-    classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
-    classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+    classpath 'com.netflix.nebula:nebula-release-plugin:18.0.8'
+    classpath 'com.netflix.nebula:nebula-publishing-plugin:21.0.0'
+    classpath 'com.netflix.nebula:nebula-project-plugin:11.0.0'
+    classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
+    classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
   }
 
   configurations.classpath.resolutionStrategy.cacheDynamicVersionsFor 0, 'minutes'
 }
 
 // TODO: remove this hack, see: https://github.com/nebula-plugins/nebula-release-plugin/issues/213
 def releaseStage = findProperty('release.stage')
-apply plugin: 'nebula.release'
+apply plugin: 'com.netflix.nebula.release'
 release.defaultVersionStrategy = nebula.plugin.release.git.opinion.Strategies.SNAPSHOT
 
 apply plugin: 'io.github.gradle-nexus.publish-plugin'
@@ -39,40 +39,40 @@ subprojects {
   apply plugin: 'java'
   apply plugin: 'checkstyle'
   apply plugin: 'io.spring.nohttp'
-  apply plugin: 'nebula.maven-publish'
-  apply plugin: 'nebula.maven-manifest'
-  apply plugin: 'nebula.maven-developer'
-  apply plugin: 'nebula.javadoc-jar'
-  apply plugin: 'nebula.source-jar'
-  apply plugin: 'nebula.maven-apache-license'
-  apply plugin: 'nebula.publish-verification'
-  apply plugin: 'nebula.contacts'
-  apply plugin: 'nebula.info'
-  apply plugin: 'nebula.project'
+  apply plugin: 'com.netflix.nebula.maven-publish'
+  apply plugin: 'com.netflix.nebula.maven-manifest'
+  apply plugin: 'com.netflix.nebula.maven-developer'
+  apply plugin: 'com.netflix.nebula.javadoc-jar'
+  apply plugin: 'com.netflix.nebula.source-jar'
+  apply plugin: 'com.netflix.nebula.maven-apache-license'
+  apply plugin: 'com.netflix.nebula.publish-verification'
+  apply plugin: 'com.netflix.nebula.contacts'
+  apply plugin: 'com.netflix.nebula.info'
+  apply plugin: 'com.netflix.nebula.project'
 
   dependencies {
     checkstyle 'io.spring.javaformat:spring-javaformat-checkstyle:latest.release'
   }
 
   compileJava {
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
-    // ensure Java 8 baseline is enforced
-    if (JavaVersion.current().isJava9Compatible()) {
-      options.release = 8
+    // ensure Java 17 baseline is enforced when building with higher versions
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+      options.release = 17
     }
   }
 
   compileTestJava {
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
-    // ensure Java 8 baseline is enforced
-    if (JavaVersion.current().isJava9Compatible()) {
-      options.release = 8
+    // ensure Java 17 baseline is enforced when building with higher versions
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+      options.release = 17
     }
   }
 
@@ -196,7 +196,7 @@ task deleteLockFiles (type: Delete) {
 }
 
 wrapper {
-  gradleVersion = '7.6'
+  gradleVersion = '8.10'
 }
 
 defaultTasks 'build'

client/build.gradle

@@ -8,11 +8,11 @@ repositories {
 
 dependencies {
   api 'io.rsocket:rsocket-core:1.1.+'
-  api 'io.micrometer:micrometer-registry-prometheus:1.9.2'
+  api 'io.micrometer:micrometer-registry-prometheus:1.13.+'
   implementation 'org.xerial.snappy:snappy-java:latest.release'
 
-  testImplementation 'ch.qos.logback:logback-classic:1.2.+'
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.8.+'
+  testImplementation 'ch.qos.logback:logback-classic:1.4.+'
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.10.+'
   testImplementation 'io.rsocket:rsocket-transport-netty:1.1.+'
   testImplementation 'io.rsocket:rsocket-transport-local:1.1.+'
   testImplementation 'org.assertj:assertj-core:latest.release'