Merge branch 'main' into bulk-string-writes

Author: dhoard

examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.2</version>
+            <version>11.0.4</version>
         </dependency>
     </dependencies>
 

examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.2</version>
+            <version>11.0.4</version>
         </dependency>
     </dependencies>
 

examples/example-exporter-servlet-tomcat/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.2</version>
+            <version>11.0.4</version>
         </dependency>
     </dependencies>
 

integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml

@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.2</version>
+            <version>11.0.4</version>
         </dependency>
     </dependencies>
 

pom.xml

@@ -19,7 +19,7 @@
         <automatic.module.name>--module-name-need-to-be-overriden--</automatic.module.name>
         <guava.version>33.4.0-jre</guava.version>
         <junit-jupiter.version>5.11.4</junit-jupiter.version>
-        <otel.instrumentation.version>2.12.0-alpha</otel.instrumentation.version>
+        <otel.instrumentation.version>2.13.0-alpha</otel.instrumentation.version>
         <java.version>8</java.version>
         <jacoco.line-coverage>0.70</jacoco.line-coverage>
         <checkstyle.skip>false</checkstyle.skip>

prometheus-metrics-exposition-formats/pom.xml

@@ -33,6 +33,14 @@
             <artifactId>protobuf-java</artifactId>
             <version>${protobuf-java.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-exposition-textformats</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java

@@ -0,0 +1,19 @@
+package io.prometheus.metrics.expositionformats;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.Metrics;
+import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
+import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+
+class ProtobufExpositionFormatsTest extends ExpositionFormatsTest {
+
+  @Override
+  protected void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    Metrics.MetricFamily protobufData = writer.convert(snapshot);
+    String actual = ProtobufUtil.shortDebugString(protobufData);
+    assertThat(actual).isEqualTo(expected);
+  }
+}

prometheus-metrics-exposition-textformats/pom.xml

@@ -19,6 +19,7 @@
 
     <properties>
         <automatic.module.name>io.prometheus.writer.text</automatic.module.name>
+        <jacoco.line-coverage>0.50</jacoco.line-coverage>
     </properties>
 
     <dependencies>
@@ -33,4 +34,20 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriterTest.java

@@ -0,0 +1,21 @@
+package io.prometheus.metrics.expositionformats;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import org.junit.jupiter.api.Test;
+
+class ExpositionFormatWriterTest {
+
+  private final ExpositionFormatWriter writer = new OpenMetricsTextFormatWriter(false, false);
+
+  @Test
+  void toDebugString() {
+    assertThat(writer.toDebugString(new MetricSnapshots())).isEqualTo("# EOF\n");
+  }
+
+  @Test
+  void isAvailable() {
+    assertThat(writer.isAvailable()).isTrue();
+  }
+}

…sitionformats/ExpositionFormatsTest.java …sitionformats/ExpositionFormatsTest.javaprometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java renamed to prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java renamed to prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java

@@ -2,9 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.Metrics;
-import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
-import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;
@@ -2659,10 +2656,5 @@ private void assertPrometheusTextWithoutCreated(String expected, MetricSnapshot
     assertThat(out).hasToString(expected);
   }
 
-  private void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {
-    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
-    Metrics.MetricFamily protobufData = writer.convert(snapshot);
-    String actual = ProtobufUtil.shortDebugString(protobufData);
-    assertThat(actual).isEqualTo(expected);
-  }
+  protected void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {}
 }