Merge branch 'main' into ftorres/utf-8

prometheus · Jan 9, 2025 · b5260be · b5260be
2 parents 7939aba + 7d091a7
commit b5260be
Show file tree

Hide file tree

Showing 46 changed files with 1,027 additions and 990 deletions.
diff --git a/.github/dependabot.yml b/.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:

diff --git a/.github/workflows/acceptance-tests.yml b/.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
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
 java temurin-17.0.13+11
-protoc 29.1
+protoc 29.2
diff --git 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-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java b/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;

diff --git a/...ter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java b/...ter/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;

diff --git a/integration-tests/it-spring-boot-smoke-test/pom.xml b/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/>

diff --git a/...ng-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java b/...ng-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;

diff --git a/pom.xml b/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>

diff --git a/prometheus-metrics-bom/pom.xml b/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>

diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java
@@ -26,7 +26,7 @@ public class SlidingWindow<T> {
   private int currentBucket;
   private long lastRotateTimestampMillis;
   private final long durationBetweenRotatesMillis;
-  LongSupplier currentTimeMillis = System::currentTimeMillis; // to be replaced in unit tests
+  private final LongSupplier currentTimeMillis;
 
   /**
    * Example: If the {@code maxAgeSeconds} is 60 and {@code ageBuckets} is 3, then 3 instances of
@@ -39,13 +39,24 @@ public class SlidingWindow<T> {
    * @param maxAgeSeconds after this amount of time an instance of T gets evicted.
    * @param ageBuckets number of age buckets.
    */
-  @SuppressWarnings("unchecked")
   public SlidingWindow(
       Class<T> clazz,
       Supplier<T> constructor,
       ObjDoubleConsumer<T> observeFunction,
       long maxAgeSeconds,
       int ageBuckets) {
+    this(clazz, constructor, observeFunction, maxAgeSeconds, ageBuckets, System::currentTimeMillis);
+  }
+
+  // VisibleForTesting
+  @SuppressWarnings("unchecked")
+  SlidingWindow(
+      Class<T> clazz,
+      Supplier<T> constructor,
+      ObjDoubleConsumer<T> observeFunction,
+      long maxAgeSeconds,
+      int ageBuckets,
+      LongSupplier currentTimeMillis) {
     this.constructor = constructor;
     this.observeFunction = observeFunction;
     this.ringBuffer = (T[]) Array.newInstance(clazz, ageBuckets);
@@ -55,6 +66,7 @@ public SlidingWindow(
     this.currentBucket = 0;
     this.lastRotateTimestampMillis = currentTimeMillis.getAsLong();
     this.durationBetweenRotatesMillis = TimeUnit.SECONDS.toMillis(maxAgeSeconds) / ageBuckets;
+    this.currentTimeMillis = currentTimeMillis;
   }
 
   /** Get the currently active instance of {@code T}. */

diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java
@@ -6,7 +6,7 @@
 import static org.assertj.core.data.Offset.offset;
 
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
-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 io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;

diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java
@@ -9,7 +9,7 @@
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-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 io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.*;

diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java
@@ -5,7 +5,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-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 io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.EscapingScheme;

diff --git a/...heus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java b/...heus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java
@@ -48,8 +48,12 @@ public void setUp() {
     currentTimeMillis.set(startTime);
     ringBuffer =
         new SlidingWindow<>(
-            Observer.class, Observer::new, Observer::observe, maxAgeSeconds, ageBuckets);
-    ringBuffer.currentTimeMillis = currentTimeMillis::get;
+            Observer.class,
+            Observer::new,
+            Observer::observe,
+            maxAgeSeconds,
+            ageBuckets,
+            currentTimeMillis::get);
   }
 
   @Test

diff --git a/...ain/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java b/...ain/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-exposition-formats/pom.xml b/prometheus-metrics-exposition-formats/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <automatic.module.name>io.prometheus.metrics.expositionformats</automatic.module.name>
-        <protobuf-java.version>4.29.1</protobuf-java.version>
+        <protobuf-java.version>4.29.2</protobuf-java.version>
     </properties>
 
     <dependencies>