diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 0b046f51db1..e128fc96ad2 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -15,7 +15,7 @@ val jmhVersion = "1.37" val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.17" val opencensusVersion = "0.31.1" -val prometheusServerVersion = "1.3.10" +val prometheusServerVersion = "1.4.1" val armeriaVersion = "1.33.2" val junitVersion = "5.13.4" val okhttpVersion = "5.1.0" diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java index 4e718c78629..d463d2f5664 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java @@ -141,9 +141,9 @@ private static Stream metricMetadataArgs() { // unsupported characters are translated to "_", repeated "_" are dropped Arguments.of( createSampleMetricData("s%%ple", "%/min", MetricDataType.SUMMARY), - "s_ple_percent_per_minute summary", - "s_ple_percent_per_minute description", - "s_ple_percent_per_minute_count"), + "s__ple_percent_per_minute summary", + "s__ple_percent_per_minute description", + "s__ple_percent_per_minute_count"), // metric unit is not appended if the name already contains the unit Arguments.of( createSampleMetricData("metric_name_total", "total", MetricDataType.LONG_SUM), @@ -186,9 +186,9 @@ private static Stream metricMetadataArgs() { // metric name cannot start with a number Arguments.of( createSampleMetricData("2_metric_name", "By", MetricDataType.SUMMARY), - "_metric_name_bytes summary", - "_metric_name_bytes description", - "_metric_name_bytes_count")); + "__metric_name_bytes summary", + "__metric_name_bytes description", + "__metric_name_bytes_count")); } @ParameterizedTest diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java index 2b1f27b8a3e..0ff651133fc 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java @@ -46,7 +46,7 @@ import io.opentelemetry.sdk.resources.Resource; import io.prometheus.metrics.exporter.httpserver.HTTPServer; import io.prometheus.metrics.exporter.httpserver.MetricsHandler; -import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics; +import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_32_0.Metrics; import io.prometheus.metrics.model.registry.PrometheusRegistry; import java.io.ByteArrayInputStream; import java.io.IOException;