diff --git a/benchmarks/benchmarks-core/gradle.lockfile b/benchmarks/benchmarks-core/gradle.lockfile
index 4effcc818a..f8c3e26290 100644
--- a/benchmarks/benchmarks-core/gradle.lockfile
+++ b/benchmarks/benchmarks-core/gradle.lockfile
@@ -33,8 +33,8 @@ io.prometheus:simpleclient_common:0.15.0=jmh,jmhCompileClasspath,jmhRuntimeClass
 io.prometheus:simpleclient_tracer_common:0.15.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/build.gradle b/build.gradle
index 2dcf8bbe78..c04179c272 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
         classpath 'de.undercouch:gradle-download-task:5.2.1'
-        classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.36'
+        classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38'
 
         constraints {
             classpath('org.ow2.asm:asm:7.3.1') {
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
index d8648462c1..840db67db4 100644
--- a/buildscript-gradle.lockfile
+++ b/buildscript-gradle.lockfile
@@ -49,8 +49,8 @@ de.undercouch:gradle-download-task:5.2.1=classpath
 gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1=classpath
 info.picocli:picocli:4.3.1=classpath
 io.github.gradle-nexus:publish-plugin:1.1.0=classpath
-io.spring.javaformat:spring-javaformat-formatter-shaded:0.0.36=classpath
-io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.36=classpath
+io.spring.javaformat:spring-javaformat-formatter-shaded:0.0.38=classpath
+io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38=classpath
 io.spring.nohttp:nohttp-checkstyle:0.0.11=classpath
 io.spring.nohttp:nohttp-gradle:0.0.11=classpath
 io.spring.nohttp:nohttp:0.0.11=classpath
diff --git a/implementations/micrometer-registry-appoptics/gradle.lockfile b/implementations/micrometer-registry-appoptics/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-appoptics/gradle.lockfile
+++ b/implementations/micrometer-registry-appoptics/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-atlas/gradle.lockfile b/implementations/micrometer-registry-atlas/gradle.lockfile
index 82665be7a6..19c07efd02 100644
--- a/implementations/micrometer-registry-atlas/gradle.lockfile
+++ b/implementations/micrometer-registry-atlas/gradle.lockfile
@@ -26,8 +26,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorToDoubleGauge.java b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorToDoubleGauge.java
index b4f3063885..04ea54eec8 100644
--- a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorToDoubleGauge.java
+++ b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorToDoubleGauge.java
@@ -26,7 +26,7 @@
  * identical to com.netflix.spectator.api.ObjectGauge which is not accessible in
  * Spectator.
  */
-class SpectatorToDoubleGauge<T>extends AbstractMeter<T> implements Gauge {
+class SpectatorToDoubleGauge<T> extends AbstractMeter<T> implements Gauge {
 
     private final ToDoubleFunction<T> f;
 
diff --git a/implementations/micrometer-registry-azure-monitor/gradle.lockfile b/implementations/micrometer-registry-azure-monitor/gradle.lockfile
index 28d8cbad5b..896332fdd3 100644
--- a/implementations/micrometer-registry-azure-monitor/gradle.lockfile
+++ b/implementations/micrometer-registry-azure-monitor/gradle.lockfile
@@ -24,8 +24,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-cloudwatch/gradle.lockfile b/implementations/micrometer-registry-cloudwatch/gradle.lockfile
index 5a3e8b1bdf..f9253178f1 100644
--- a/implementations/micrometer-registry-cloudwatch/gradle.lockfile
+++ b/implementations/micrometer-registry-cloudwatch/gradle.lockfile
@@ -32,8 +32,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-cloudwatch2/gradle.lockfile b/implementations/micrometer-registry-cloudwatch2/gradle.lockfile
index 5d8d438b33..1dd0ff86a9 100644
--- a/implementations/micrometer-registry-cloudwatch2/gradle.lockfile
+++ b/implementations/micrometer-registry-cloudwatch2/gradle.lockfile
@@ -34,8 +34,8 @@ io.netty:netty-transport-classes-epoll:4.1.89.Final=default,runtimeClasspath,tes
 io.netty:netty-transport-native-unix-common:4.1.89.Final=default,runtimeClasspath,testRuntimeClasspath
 io.netty:netty-transport:4.1.89.Final=default,runtimeClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-datadog/gradle.lockfile b/implementations/micrometer-registry-datadog/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-datadog/gradle.lockfile
+++ b/implementations/micrometer-registry-datadog/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-dynatrace/gradle.lockfile b/implementations/micrometer-registry-dynatrace/gradle.lockfile
index b1ca1c8cc6..9ea711869e 100644
--- a/implementations/micrometer-registry-dynatrace/gradle.lockfile
+++ b/implementations/micrometer-registry-dynatrace/gradle.lockfile
@@ -28,8 +28,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-elastic/gradle.lockfile b/implementations/micrometer-registry-elastic/gradle.lockfile
index 8e7bf6d01d..100da23523 100644
--- a/implementations/micrometer-registry-elastic/gradle.lockfile
+++ b/implementations/micrometer-registry-elastic/gradle.lockfile
@@ -30,8 +30,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-ganglia/gradle.lockfile b/implementations/micrometer-registry-ganglia/gradle.lockfile
index e236b133f5..d80a6df265 100644
--- a/implementations/micrometer-registry-ganglia/gradle.lockfile
+++ b/implementations/micrometer-registry-ganglia/gradle.lockfile
@@ -25,8 +25,8 @@ info.picocli:picocli:4.6.2=checkstyle
 io.dropwizard.metrics:metrics-core:4.2.16=compileClasspath
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-graphite/gradle.lockfile b/implementations/micrometer-registry-graphite/gradle.lockfile
index 238a28e3b1..1fdcf94afc 100644
--- a/implementations/micrometer-registry-graphite/gradle.lockfile
+++ b/implementations/micrometer-registry-graphite/gradle.lockfile
@@ -44,8 +44,8 @@ io.netty:netty-transport:4.1.89.Final=testCompileClasspath,testRuntimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.0.27=testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-core:3.4.26=testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-health/gradle.lockfile b/implementations/micrometer-registry-health/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-health/gradle.lockfile
+++ b/implementations/micrometer-registry-health/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-humio/gradle.lockfile b/implementations/micrometer-registry-humio/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-humio/gradle.lockfile
+++ b/implementations/micrometer-registry-humio/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-influx/gradle.lockfile b/implementations/micrometer-registry-influx/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-influx/gradle.lockfile
+++ b/implementations/micrometer-registry-influx/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-jmx/gradle.lockfile b/implementations/micrometer-registry-jmx/gradle.lockfile
index d6bdcd181e..b22d39db15 100644
--- a/implementations/micrometer-registry-jmx/gradle.lockfile
+++ b/implementations/micrometer-registry-jmx/gradle.lockfile
@@ -27,8 +27,8 @@ io.dropwizard.metrics:metrics-core:4.2.16=compileClasspath,default,runtimeClassp
 io.dropwizard.metrics:metrics-jmx:4.2.16=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-kairos/gradle.lockfile b/implementations/micrometer-registry-kairos/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-kairos/gradle.lockfile
+++ b/implementations/micrometer-registry-kairos/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-new-relic/gradle.lockfile b/implementations/micrometer-registry-new-relic/gradle.lockfile
index 49cefc9f7d..4049b07a3e 100644
--- a/implementations/micrometer-registry-new-relic/gradle.lockfile
+++ b/implementations/micrometer-registry-new-relic/gradle.lockfile
@@ -24,8 +24,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-opentsdb/gradle.lockfile b/implementations/micrometer-registry-opentsdb/gradle.lockfile
index e9da3c260a..58ed6b2bd5 100644
--- a/implementations/micrometer-registry-opentsdb/gradle.lockfile
+++ b/implementations/micrometer-registry-opentsdb/gradle.lockfile
@@ -23,8 +23,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-otlp/gradle.lockfile b/implementations/micrometer-registry-otlp/gradle.lockfile
index d829af357f..13fdba7ffb 100644
--- a/implementations/micrometer-registry-otlp/gradle.lockfile
+++ b/implementations/micrometer-registry-otlp/gradle.lockfile
@@ -25,8 +25,8 @@ info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.opentelemetry.proto:opentelemetry-proto:0.16.0-alpha=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionCounter.java b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionCounter.java
index 3e7841e34a..acf6358faf 100644
--- a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionCounter.java
+++ b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionCounter.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.ToDoubleFunction;
 
-class OtlpFunctionCounter<T>extends CumulativeFunctionCounter<T> implements StartTimeAwareMeter {
+class OtlpFunctionCounter<T> extends CumulativeFunctionCounter<T> implements StartTimeAwareMeter {
 
     private final long startTimeNanos;
 
diff --git a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionTimer.java b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionTimer.java
index 2088fa5f5a..feb3a3745a 100644
--- a/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionTimer.java
+++ b/implementations/micrometer-registry-otlp/src/main/java/io/micrometer/registry/otlp/OtlpFunctionTimer.java
@@ -22,7 +22,7 @@
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToLongFunction;
 
-class OtlpFunctionTimer<T>extends CumulativeFunctionTimer<T> implements StartTimeAwareMeter {
+class OtlpFunctionTimer<T> extends CumulativeFunctionTimer<T> implements StartTimeAwareMeter {
 
     private final long startTimeNanos;
 
diff --git a/implementations/micrometer-registry-prometheus/gradle.lockfile b/implementations/micrometer-registry-prometheus/gradle.lockfile
index ae14c9caf2..b4a997b847 100644
--- a/implementations/micrometer-registry-prometheus/gradle.lockfile
+++ b/implementations/micrometer-registry-prometheus/gradle.lockfile
@@ -28,8 +28,8 @@ io.prometheus:simpleclient_common:0.15.0=compileClasspath,default,runtimeClasspa
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-signalfx/gradle.lockfile b/implementations/micrometer-registry-signalfx/gradle.lockfile
index d79242659f..49202fcf4c 100644
--- a/implementations/micrometer-registry-signalfx/gradle.lockfile
+++ b/implementations/micrometer-registry-signalfx/gradle.lockfile
@@ -24,8 +24,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-stackdriver/gradle.lockfile b/implementations/micrometer-registry-stackdriver/gradle.lockfile
index 393c643f4b..86cc583641 100644
--- a/implementations/micrometer-registry-stackdriver/gradle.lockfile
+++ b/implementations/micrometer-registry-stackdriver/gradle.lockfile
@@ -61,8 +61,8 @@ io.opencensus:opencensus-contrib-http-util:0.31.0=compileClasspath,default,runti
 io.opencensus:opencensus-proto:0.2.0=default,runtimeClasspath,testRuntimeClasspath
 io.perfmark:perfmark-api:0.23.0=default,runtimeClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-statsd/gradle.lockfile b/implementations/micrometer-registry-statsd/gradle.lockfile
index 468ac13a20..b0e53ee2a7 100644
--- a/implementations/micrometer-registry-statsd/gradle.lockfile
+++ b/implementations/micrometer-registry-statsd/gradle.lockfile
@@ -45,8 +45,8 @@ io.projectreactor.netty:reactor-netty-core:1.0.27=compileClasspath,default,runti
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-core:3.4.26=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-test:3.4.26=testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionCounter.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionCounter.java
index 1db878aec2..7860ba5187 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionCounter.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionCounter.java
@@ -27,7 +27,7 @@
  * @param <T> the type of the state object from which the counter value is extracted
  * @author Jon Schneider
  */
-public class StatsdFunctionCounter<T>extends CumulativeFunctionCounter<T> implements StatsdPollable {
+public class StatsdFunctionCounter<T> extends CumulativeFunctionCounter<T> implements StatsdPollable {
 
     private final StatsdLineBuilder lineBuilder;
 
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionTimer.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionTimer.java
index d94ce3968d..6f1f5506a4 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionTimer.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdFunctionTimer.java
@@ -23,7 +23,7 @@
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToLongFunction;
 
-public class StatsdFunctionTimer<T>extends CumulativeFunctionTimer<T> implements StatsdPollable {
+public class StatsdFunctionTimer<T> extends CumulativeFunctionTimer<T> implements StatsdPollable {
 
     private final StatsdLineBuilder lineBuilder;
 
diff --git a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java
index d42cf99339..58763fe980 100644
--- a/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java
+++ b/implementations/micrometer-registry-statsd/src/main/java/io/micrometer/statsd/StatsdGauge.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.ToDoubleFunction;
 
-public class StatsdGauge<T>extends AbstractMeter implements Gauge, StatsdPollable {
+public class StatsdGauge<T> extends AbstractMeter implements Gauge, StatsdPollable {
 
     private final StatsdLineBuilder lineBuilder;
 
diff --git a/implementations/micrometer-registry-wavefront/gradle.lockfile b/implementations/micrometer-registry-wavefront/gradle.lockfile
index 21a4f12bcc..6846374b03 100644
--- a/implementations/micrometer-registry-wavefront/gradle.lockfile
+++ b/implementations/micrometer-registry-wavefront/gradle.lockfile
@@ -31,8 +31,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/micrometer-core/gradle.lockfile b/micrometer-core/gradle.lockfile
index 89b86bd66c..34a998059b 100644
--- a/micrometer-core/gradle.lockfile
+++ b/micrometer-core/gradle.lockfile
@@ -65,8 +65,8 @@ io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspat
 io.projectreactor:reactor-core:3.4.26=testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-test:3.4.26=testCompileClasspath,testRuntimeClasspath
 io.reactivex:rxjava:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineCacheMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineCacheMetrics.java
index 91ed765950..45be5dfe1e 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineCacheMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineCacheMetrics.java
@@ -44,7 +44,7 @@
  */
 @NonNullApi
 @NonNullFields
-public class CaffeineCacheMetrics<K, V, C extends Cache<K, V>>extends CacheMeterBinder<C> {
+public class CaffeineCacheMetrics<K, V, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     private static final String DESCRIPTION_CACHE_LOAD = "The number of times cache lookup methods have successfully loaded a new value or failed to load a new value, either because no value was found or an exception was thrown while loading";
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetrics.java
index 023a058731..d6aa0caab8 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetrics.java
@@ -32,7 +32,7 @@
  */
 @NonNullApi
 @NonNullFields
-public class GuavaCacheMetrics<K, V, C extends Cache<K, V>>extends CacheMeterBinder<C> {
+public class GuavaCacheMetrics<K, V, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     private static final String DESCRIPTION_CACHE_LOAD = "The number of times cache lookup methods have successfully loaded a new value or failed to load a new value because an exception was thrown while loading";
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/JCacheMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/JCacheMetrics.java
index e442e03adb..03219374cb 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/JCacheMetrics.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/JCacheMetrics.java
@@ -41,7 +41,7 @@
  */
 @NonNullApi
 @NonNullFields
-public class JCacheMetrics<K, V, C extends Cache<K, V>>extends CacheMeterBinder<C> {
+public class JCacheMetrics<K, V, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     // VisibleForTesting
     @Nullable
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
index 1bf15d6902..047ca3ca54 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCall.java
@@ -30,7 +30,7 @@
  * @param <A> The type of message received one or more times from the server.
  * @author Daniel Theuke (daniel.theuke@heuboe.de)
  */
-class MetricCollectingClientCall<Q, A>extends SimpleForwardingClientCall<Q, A> {
+class MetricCollectingClientCall<Q, A> extends SimpleForwardingClientCall<Q, A> {
 
     private final Counter requestCounter;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCallListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCallListener.java
index 74c954ed2f..bc757d3955 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCallListener.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingClientCallListener.java
@@ -29,7 +29,7 @@
  * @param <A> The type of message received one or more times from the server.
  * @author Daniel Theuke (daniel.theuke@heuboe.de)
  */
-class MetricCollectingClientCallListener<A>extends SimpleForwardingClientCallListener<A> {
+class MetricCollectingClientCallListener<A> extends SimpleForwardingClientCallListener<A> {
 
     private final Counter responseCounter;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCall.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCall.java
index a89bc8c998..bc8c5580ea 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCall.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCall.java
@@ -29,7 +29,7 @@
  * @param <A> The type of message sent one or more times to the client.
  * @author Daniel Theuke (daniel.theuke@heuboe.de)
  */
-class MetricCollectingServerCall<Q, A>extends SimpleForwardingServerCall<Q, A> {
+class MetricCollectingServerCall<Q, A> extends SimpleForwardingServerCall<Q, A> {
 
     private final Counter responseCounter;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCallListener.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCallListener.java
index 6bec37d1c5..2d7196050d 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCallListener.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/MetricCollectingServerCallListener.java
@@ -30,7 +30,7 @@
  * @param <Q> The type of message received one or more times from the client.
  * @author Daniel Theuke (daniel.theuke@heuboe.de)
  */
-class MetricCollectingServerCallListener<Q>extends SimpleForwardingServerCallListener<Q> {
+class MetricCollectingServerCallListener<Q> extends SimpleForwardingServerCallListener<Q> {
 
     private final Counter requestCounter;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java
index 8a1273c0ed..b91faffb8d 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/AbstractCompositeMeter.java
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-abstract class AbstractCompositeMeter<T extends Meter>extends AbstractMeter implements CompositeMeter {
+abstract class AbstractCompositeMeter<T extends Meter> extends AbstractMeter implements CompositeMeter {
 
     private final AtomicBoolean childrenGuard = new AtomicBoolean();
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
index 58f909b64b..47740c9995 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionCounter.java
@@ -23,7 +23,7 @@
 import java.lang.ref.WeakReference;
 import java.util.function.ToDoubleFunction;
 
-public class CompositeFunctionCounter<T>extends AbstractCompositeMeter<FunctionCounter> implements FunctionCounter {
+public class CompositeFunctionCounter<T> extends AbstractCompositeMeter<FunctionCounter> implements FunctionCounter {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
index 627cd76cbb..9a29e0c54e 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeFunctionTimer.java
@@ -25,7 +25,7 @@
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToLongFunction;
 
-class CompositeFunctionTimer<T>extends AbstractCompositeMeter<FunctionTimer> implements FunctionTimer {
+class CompositeFunctionTimer<T> extends AbstractCompositeMeter<FunctionTimer> implements FunctionTimer {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
index ba2f8e1815..22f7874c61 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeGauge.java
@@ -24,7 +24,7 @@
 import java.lang.ref.WeakReference;
 import java.util.function.ToDoubleFunction;
 
-class CompositeGauge<T>extends AbstractCompositeMeter<Gauge> implements Gauge {
+class CompositeGauge<T> extends AbstractCompositeMeter<Gauge> implements Gauge {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
index 96601af091..9337d4b5b6 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/composite/CompositeTimeGauge.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.ToDoubleFunction;
 
-class CompositeTimeGauge<T>extends AbstractCompositeMeter<TimeGauge> implements TimeGauge {
+class CompositeTimeGauge<T> extends AbstractCompositeMeter<TimeGauge> implements TimeGauge {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/config/validate/Validated.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/config/validate/Validated.java
index 5832866626..c5a8f273b5 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/config/validate/Validated.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/config/validate/Validated.java
@@ -41,7 +41,7 @@
  * @since 1.5.0
  */
 @Incubating(since = "1.5.0")
-public interface Validated<T>extends Iterable<Validated<T>> {
+public interface Validated<T> extends Iterable<Validated<T>> {
 
     boolean isValid();
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionCounter.java
index 3f72342a87..ddc896017a 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionCounter.java
@@ -22,7 +22,7 @@
 import java.lang.ref.WeakReference;
 import java.util.function.ToDoubleFunction;
 
-public class CumulativeFunctionCounter<T>extends AbstractMeter implements FunctionCounter {
+public class CumulativeFunctionCounter<T> extends AbstractMeter implements FunctionCounter {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java
index 563a335042..803019f22f 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/cumulative/CumulativeFunctionTimer.java
@@ -30,7 +30,7 @@
  * @author Jon Schneider
  * @author Johnny Lim
  */
-public class CumulativeFunctionTimer<T>extends AbstractMeter implements FunctionTimer {
+public class CumulativeFunctionTimer<T> extends AbstractMeter implements FunctionTimer {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionCounter.java
index 6361b3427b..daa9e60e20 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionCounter.java
@@ -27,7 +27,7 @@
 /**
  * @author Jon Schneider
  */
-public class DropwizardFunctionCounter<T>extends AbstractMeter implements FunctionCounter {
+public class DropwizardFunctionCounter<T> extends AbstractMeter implements FunctionCounter {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java
index 7360d5267c..acfeeb9d80 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/dropwizard/DropwizardFunctionTimer.java
@@ -36,7 +36,7 @@
  * @author Jon Schneider
  * @author Johnny Lim
  */
-public class DropwizardFunctionTimer<T>extends AbstractMeter implements FunctionTimer {
+public class DropwizardFunctionTimer<T> extends AbstractMeter implements FunctionTimer {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/DefaultGauge.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/DefaultGauge.java
index b1574ad4ee..28e1c0f1e1 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/DefaultGauge.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/internal/DefaultGauge.java
@@ -31,7 +31,7 @@
  * @author Jon Schneider
  * @author Johnny Lim
  */
-public class DefaultGauge<T>extends AbstractMeter implements Gauge {
+public class DefaultGauge<T> extends AbstractMeter implements Gauge {
 
     private static final WarnThenDebugLogger logger = new WarnThenDebugLogger(DefaultGauge.class);
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionCounter.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionCounter.java
index 58a8ebe951..7a66ae5974 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionCounter.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/step/StepFunctionCounter.java
@@ -22,7 +22,7 @@
 import java.lang.ref.WeakReference;
 import java.util.function.ToDoubleFunction;
 
-public class StepFunctionCounter<T>extends AbstractMeter implements FunctionCounter {
+public class StepFunctionCounter<T> extends AbstractMeter implements FunctionCounter {
 
     private final WeakReference<T> ref;
 
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/AbstractPartition.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/AbstractPartition.java
index 65a5df7a3c..419a4c68ce 100644
--- a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/AbstractPartition.java
+++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/AbstractPartition.java
@@ -28,7 +28,7 @@
  * @author Jon Schneider
  * @since 1.2.2
  */
-public abstract class AbstractPartition<T>extends AbstractList<List<T>> {
+public abstract class AbstractPartition<T> extends AbstractList<List<T>> {
 
     final List<T> delegate;
 
diff --git a/micrometer-test/gradle.lockfile b/micrometer-test/gradle.lockfile
index 67acb82696..94c1e4e808 100644
--- a/micrometer-test/gradle.lockfile
+++ b/micrometer-test/gradle.lockfile
@@ -32,8 +32,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-boot2-reactive/gradle.lockfile b/samples/micrometer-samples-boot2-reactive/gradle.lockfile
index 28c9459eb1..c6963048a3 100644
--- a/samples/micrometer-samples-boot2-reactive/gradle.lockfile
+++ b/samples/micrometer-samples-boot2-reactive/gradle.lockfile
@@ -54,8 +54,8 @@ io.prometheus:simpleclient_common:0.15.0=compileClasspath,default,productionRunt
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-boot2/gradle.lockfile b/samples/micrometer-samples-boot2/gradle.lockfile
index 6abd48f55b..babb71b77b 100644
--- a/samples/micrometer-samples-boot2/gradle.lockfile
+++ b/samples/micrometer-samples-boot2/gradle.lockfile
@@ -106,8 +106,8 @@ io.prometheus:simpleclient_common:0.15.0=compileClasspath,default,productionRunt
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-core/gradle.lockfile b/samples/micrometer-samples-core/gradle.lockfile
index fa8811c130..6237997420 100644
--- a/samples/micrometer-samples-core/gradle.lockfile
+++ b/samples/micrometer-samples-core/gradle.lockfile
@@ -139,8 +139,8 @@ io.prometheus:simpleclient_pushgateway:0.15.0=compileClasspath,default,runtimeCl
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-hazelcast/gradle.lockfile b/samples/micrometer-samples-hazelcast/gradle.lockfile
index 79bab2ab5f..0516f2752e 100644
--- a/samples/micrometer-samples-hazelcast/gradle.lockfile
+++ b/samples/micrometer-samples-hazelcast/gradle.lockfile
@@ -25,8 +25,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=default,runtimeClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=default,runtimeClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-hazelcast3/gradle.lockfile b/samples/micrometer-samples-hazelcast3/gradle.lockfile
index 03f1736872..abf619f91f 100644
--- a/samples/micrometer-samples-hazelcast3/gradle.lockfile
+++ b/samples/micrometer-samples-hazelcast3/gradle.lockfile
@@ -26,8 +26,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=default,runtimeClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=default,runtimeClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-javalin/gradle.lockfile b/samples/micrometer-samples-javalin/gradle.lockfile
index 13e5cde5c0..d8abab1a14 100644
--- a/samples/micrometer-samples-javalin/gradle.lockfile
+++ b/samples/micrometer-samples-javalin/gradle.lockfile
@@ -30,8 +30,8 @@ io.prometheus:simpleclient_common:0.15.0=compileClasspath,default,runtimeClasspa
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-jersey3/gradle.lockfile b/samples/micrometer-samples-jersey3/gradle.lockfile
index aad3707492..93efdf01e6 100644
--- a/samples/micrometer-samples-jersey3/gradle.lockfile
+++ b/samples/micrometer-samples-jersey3/gradle.lockfile
@@ -24,8 +24,8 @@ info.picocli:picocli:4.3.1=nohttp
 info.picocli:picocli:4.6.2=checkstyle
 io.netty:netty-bom:4.1.89.Final=default,runtimeClasspath,testRuntimeClasspath
 io.projectreactor:reactor-bom:2020.0.27=default,runtimeClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli
diff --git a/samples/micrometer-samples-spring-integration/gradle.lockfile b/samples/micrometer-samples-spring-integration/gradle.lockfile
index 93f9ce9e68..c56cf0b0ec 100644
--- a/samples/micrometer-samples-spring-integration/gradle.lockfile
+++ b/samples/micrometer-samples-spring-integration/gradle.lockfile
@@ -37,8 +37,8 @@ io.prometheus:simpleclient_common:0.15.0=compileClasspath,default,productionRunt
 io.prometheus:simpleclient_tracer_common:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.15.0=compileClasspath,default,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.spring.javaformat:spring-javaformat-checkstyle:0.0.35=checkstyle
-io.spring.javaformat:spring-javaformat-config:0.0.35=checkstyle
+io.spring.javaformat:spring-javaformat-checkstyle:0.0.38=checkstyle
+io.spring.javaformat:spring-javaformat-config:0.0.38=checkstyle
 io.spring.nohttp:nohttp-checkstyle:0.0.11=checkstyle,nohttp
 io.spring.nohttp:nohttp-cli:0.0.11=nohttp-cli
 io.spring.nohttp:nohttp:0.0.11=checkstyle,nohttp,nohttp-cli