Merge branch 'main' into ftorres/utf-8

Author: fedetorres93

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
     # excluding simpleclient_archive from the update is not possible, only includes are supported
     # when we use includes, we run into https://github.com/dependabot/dependabot-core/issues/10415 -
     # even if we limit to 1 PR at a time
-    # therefore we just ignore the simpleclient_archive update for now
+    # therefore we just rename pom.xml in simpleclient_archive for now
     # if this becomes a problem, we can move to renovate
     directory: "/"
     schedule:

.github/workflows/acceptance-tests.yml

@@ -37,5 +37,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: docker-compose.log
+          name: OATS logs
           path: oats/yaml/build/**/*.log

.tool-versions

@@ -1,2 +1,2 @@
 java temurin-17.0.13+11
-protoc 29.1
+protoc 29.2

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">

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_2.Metrics;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

@@ -5,7 +5,7 @@
 
 import com.google.common.io.Resources;
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_2.Metrics;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;

integration-tests/it-spring-boot-smoke-test/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
+                <version>2.44.1</version>
                 <configuration>
                     <java>
                         <googleJavaFormat/>

integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java

@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_1.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_2.Metrics;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;

pom.xml

@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
         <junit-jupiter.version>5.11.4</junit-jupiter.version>
-        <otel.instrumentation.version>2.10.0-alpha</otel.instrumentation.version>
+        <otel.instrumentation.version>2.11.0-alpha</otel.instrumentation.version>
         <java.version>8</java.version>
         <jacoco.line-coverage>0.70</jacoco.line-coverage>
         <checkstyle.skip>false</checkstyle.skip>
@@ -116,13 +116,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.14.2</version>
+            <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.26.3</version>
+            <version>3.27.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -223,7 +223,7 @@
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>2.43.0</version>
+                    <version>2.44.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

prometheus-metrics-bom/pom.xml

@@ -67,6 +67,11 @@
                 <artifactId>prometheus-metrics-exposition-formats</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.prometheus</groupId>
+                <artifactId>prometheus-metrics-instrumentation-dropwizard</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.prometheus</groupId>
                 <artifactId>prometheus-metrics-instrumentation-dropwizard5</artifactId>