Skip to content

Commit 3c1f556

Browse files
fix(deps): update prometheusserverversion to v1.3.7 (#7348)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <[email protected]>
1 parent 4c6ba0a commit 3c1f556

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ val mockitoVersion = "4.11.0"
3535
val slf4jVersion = "2.0.17"
3636
val opencensusVersion = "0.31.1"
3737
val prometheusClientVersion = "0.16.0"
38-
val prometheusServerVersion = "1.3.6"
38+
val prometheusServerVersion = "1.3.7"
3939
val armeriaVersion = "1.32.5"
4040
val junitVersion = "5.12.2"
4141

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,6 @@ void endToEnd() {
134134
// Resource attributes derived from the prometheus scrape config
135135
stringKeyValue("service.name", "app"),
136136
stringKeyValue("service.instance.id", "host.testcontainers.internal:" + prometheusPort),
137-
// net.host.name, net.host.port and http.scheme are superseded by server.address,
138-
// server.port, and url.scheme respectively and will be removed by default in a future
139-
// collector release
140-
// https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/32829
141-
stringKeyValue("net.host.name", "host.testcontainers.internal"),
142-
stringKeyValue("net.host.port", String.valueOf(prometheusPort)),
143-
stringKeyValue("http.scheme", "http"),
144137
stringKeyValue("server.address", "host.testcontainers.internal"),
145138
stringKeyValue("server.port", String.valueOf(prometheusPort)),
146139
stringKeyValue("url.scheme", "http"),

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import com.google.common.collect.ImmutableList;
1414
import com.google.common.io.ByteStreams;
15+
import com.google.protobuf.TextFormat;
1516
import com.linecorp.armeria.client.WebClient;
1617
import com.linecorp.armeria.client.retry.RetryRule;
1718
import com.linecorp.armeria.client.retry.RetryingClient;
@@ -45,9 +46,8 @@
4546
import io.opentelemetry.sdk.resources.Resource;
4647
import io.prometheus.metrics.exporter.httpserver.HTTPServer;
4748
import io.prometheus.metrics.exporter.httpserver.MetricsHandler;
48-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_29_3.Metrics;
49+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_2.Metrics;
4950
import io.prometheus.metrics.model.registry.PrometheusRegistry;
50-
import io.prometheus.metrics.shaded.com_google_protobuf_4_29_3.TextFormat;
5151
import java.io.ByteArrayInputStream;
5252
import java.io.IOException;
5353
import java.net.ServerSocket;

0 commit comments

Comments
 (0)