Merge branch 'main' into ftorres/utf-8

Author: fedetorres93

.tool-versions

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

RELEASING.md

@@ -1,4 +1,4 @@
-## Create a Release 
+## Create a Release
 
 1. Go to https://github.com/prometheus/client_java/releases/new
 2. Click on "Choose a tag", enter the tag name (e.g. `v0.1.0`), and click "Create a new tag".

docs/README.md

@@ -31,7 +31,7 @@ rm -r ./docs/static/api
 mv ./target/site/apidocs ./docs/static/api
 ```
 
-Github pages are in the `/client_java/` folder, so we link to `/client_java/api` rather than `/api`. 
+Github pages are in the `/client_java/` folder, so we link to `/client_java/api` rather than `/api`.
 To make JavaDoc work locally, create a link:
 
 ```

docs/content/getting-started/multi-target.md

@@ -103,12 +103,12 @@ Sample Prometheus scrape_config
       - source_labels: [__param_target]
         target_label: instance
       - target_label: __address__
-        replacement: localhost:9401 
+        replacement: localhost:9401
     static_configs:
       - targets: ["target1", "target2"]
 ```
 It's up to the specific MultiCollector implementation how to interpret the _target_ parameter.
 It might be an explicit real target (i.e. via host name/ip address) or as an alias in some internal configuration.
 The latter is more suitable when the MultiCollector implementation is a proxy (see https://github.com/prometheus/snmp_exporter)
 In this case, invoking real target might require extra parameters (e.g. credentials) that might be complex to manage in Prometheus configuration
-(not considering the case where the proxy might become an "open relay")
+(not considering the case where the proxy might become an "open relay")

docs/content/getting-started/quickstart.md

@@ -47,9 +47,9 @@ There are alternative exporters as well, for example if you are using a Servlet
 
 {{< hint type=note >}}
 
-If you do not use the protobuf exposition format, you can 
+If you do not use the protobuf exposition format, you can
 [exclude](../../exporters/formats#exclude-protobuf-exposition-format)
-it from the dependencies. 
+it from the dependencies.
 
 {{< /hint >}}
 

examples/example-exporter-servlet-tomcat/README.md

@@ -64,7 +64,7 @@ The exporter servlet supports a `debug` URL parameter to quickly view other form
    ```shell
    ./prometheus --enable-feature=native-histograms --enable-feature=exemplar-storage
    ```
-   
+
 Verify that the `tomcat-servlet-example` target is up on [http://localhost:9090/targets](http://localhost:9090/targets).
 
 Prometheus is now scraping metrics in Protobuf format. If you type the name `request_duration_seconds` you will see a non-human-readable representation of the histogram including the native buckets:

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_2.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.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_2.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.Metrics;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;

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.44.1</version>
+                <version>2.44.2</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_2.Metrics;
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.Metrics;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;