Skip to content

Fix PrometheusHttpServerBuilder copy constructor dropping the default handler #8619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thswlsqls wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Draft

Fix PrometheusHttpServerBuilder copy constructor dropping the default handler #8619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#### Exporters

* Prometheus: Fix `PrometheusHttpServer.toBuilder()` dropping the configured default handler
([#8619](https://github.com/open-telemetry/opentelemetry-java/pull/8619))
* Logging: Output event name in `SystemOutLogRecordExporter`
([#8609](https://github.com/open-telemetry/opentelemetry-java/pull/8609))

Expand Down
1 change: 1 addition & 0 deletions ...theus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public final class PrometheusHttpServerBuilder {
this.metricReaderBuilder = new PrometheusMetricReaderBuilder(builder.metricReaderBuilder);
this.executor = builder.executor;
this.memoryMode = builder.memoryMode;
this.defaultHandler = builder.defaultHandler;
this.defaultAggregationSelector = builder.defaultAggregationSelector;
this.authenticator = builder.authenticator;
}
Expand Down
5 changes: 5 additions & 0 deletions ...ometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusHttpServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.linecorp.armeria.common.RequestHeaders;
import com.sun.net.httpserver.Authenticator;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.sun.net.httpserver.HttpPrincipal;
import io.github.netmikey.logunit.api.LogCapturer;
import io.opentelemetry.api.common.Attributes;
Expand Down Expand Up @@ -755,6 +756,9 @@ public Result authenticate(HttpExchange exchange) {
};
builder.setAuthenticator(authenticator);

HttpHandler defaultHandler = exchange -> {};
builder.setDefaultHandler(defaultHandler);

PrometheusHttpServer httpServer = builder.build();
PrometheusHttpServerBuilder fromOriginalBuilder = httpServer.toBuilder();
httpServer.close();
Expand All @@ -765,6 +769,7 @@ public Result authenticate(HttpExchange exchange) {
.hasFieldOrPropertyWithValue("executor", executor)
.hasFieldOrPropertyWithValue("prometheusRegistry", prometheusRegistry)
.hasFieldOrPropertyWithValue("authenticator", authenticator)
.hasFieldOrPropertyWithValue("defaultHandler", defaultHandler)
.extracting("metricReaderBuilder")
.usingRecursiveComparison()
.isEqualTo(
Expand Down
Loading