diff --git a/checkstyle.xml b/checkstyle.xml
index ef205414d..fd483abfa 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -255,7 +255,6 @@
       <message key="ws.notPreceded"
         value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
     </module>
-    <!-- this doesn't seem to be compatible with google auto-format
     <module name="Indentation">
       <property name="basicOffset" value="2"/>
       <property name="braceAdjustment" value="2"/>
@@ -264,7 +263,6 @@
       <property name="lineWrappingIndentation" value="4"/>
       <property name="arrayInitIndent" value="2"/>
     </module>
-    -->
     <module name="OverloadMethodsDeclarationOrder"/>
     <module name="VariableDeclarationUsageDistance"/>
     <module name="CustomImportOrder">
diff --git a/integration-tests/it-spring-boot-smoke-test/pom.xml b/integration-tests/it-spring-boot-smoke-test/pom.xml
index 2121c27c0..1a421949d 100644
--- a/integration-tests/it-spring-boot-smoke-test/pom.xml
+++ b/integration-tests/it-spring-boot-smoke-test/pom.xml
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>2.44.0</version>
                 <configuration>
                     <java>
                         <googleJavaFormat/>
diff --git a/pom.xml b/pom.xml
index c84af0d57..8dc201039 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,7 @@
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>2.43.0</version>
+                    <version>2.44.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
index baca70774..7bf4f5e27 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
@@ -53,7 +53,7 @@ static String convertUnit(Unit unit) {
       return null;
     }
     switch (unit.toString()) {
-        // Time
+      // Time
       case "days":
         return "d";
       case "hours":
@@ -68,7 +68,7 @@ static String convertUnit(Unit unit) {
         return "us";
       case "nanoseconds":
         return "ns";
-        // Bytes
+      // Bytes
       case "bytes":
         return "By";
       case "kibibytes":
@@ -87,7 +87,7 @@ static String convertUnit(Unit unit) {
         return "GBy";
       case "terabytes":
         return "TBy";
-        // SI
+      // SI
       case "meters":
         return "m";
       case "volts":
@@ -100,14 +100,14 @@ static String convertUnit(Unit unit) {
         return "W";
       case "grams":
         return "g";
-        // Misc
+      // Misc
       case "celsius":
         return "Cel";
       case "hertz":
         return "Hz";
       case "percent":
         return "%";
-        // default
+      // default
       default:
         return unit.toString();
     }
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
index bd3a163ac..c050871ce 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -196,8 +197,9 @@ MetricSnapshot fromMeter(String dropwizardName, Meter meter) {
   @Override
   public MetricSnapshots collect() {
     MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
-    for (@SuppressWarnings("rawtypes")
-    Map.Entry<MetricName, Gauge> entry : registry.getGauges(metricFilter).entrySet()) {
+    @SuppressWarnings("rawtypes")
+    Set<Map.Entry<MetricName, Gauge>> entries = registry.getGauges(metricFilter).entrySet();
+    for (@SuppressWarnings("rawtypes") Map.Entry<MetricName, Gauge> entry : entries) {
       Optional.ofNullable(fromGauge(entry.getKey().getKey(), entry.getValue()))
           .ifPresent(metricSnapshots::metricSnapshot);
     }