Skip to content
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.

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

build(deps): bump io.micrometer:micrometer-registry-prometheus from 1.12.6 to 1.13.2 #537

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
implementation group: 'org.apache.olingo', name: 'odata-server-core-ext', version: olingo_version

implementation group: 'com.sap.cds', name: 'cds4j-core', version: '2.9.2'
implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: '1.12.6'
implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: '1.13.2'
implementation group: 'org.ow2.asm', name: 'asm', version: '9.7'

implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static io.vertx.core.Future.succeededFuture;

import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import io.neonbee.NeonBee;
import io.neonbee.config.EndpointConfig;
import io.neonbee.endpoint.Endpoint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package io.neonbee.endpoint.metrics;

import io.micrometer.core.instrument.Clock;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.prometheus.client.CollectorRegistry;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.prometheus.metrics.model.registry.PrometheusRegistry;

class NeonBeePrometheusMeterRegistry extends PrometheusMeterRegistry {
NeonBeePrometheusMeterRegistry(PrometheusConfig config) {
super(config);
}

NeonBeePrometheusMeterRegistry(PrometheusConfig config, CollectorRegistry registry, Clock clock) {
NeonBeePrometheusMeterRegistry(PrometheusConfig config, PrometheusRegistry registry, Clock clock) {
super(config, registry, clock);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.neonbee.logging.LoggingFacade;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.prometheus.client.exporter.common.TextFormat;
import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.RoutingContext;
import io.vertx.micrometer.backends.BackendRegistries;
Expand Down Expand Up @@ -46,7 +45,9 @@ private static void noPrometheusMeterRegistryPresent(RoutingContext rc) {
}

private static void handleWithPrometheusMeterRegistry(RoutingContext rc, PrometheusMeterRegistry pmr) {
rc.response().putHeader(HttpHeaders.CONTENT_TYPE, TextFormat.CONTENT_TYPE_004).end(pmr.scrape());
rc.response()
.putHeader(HttpHeaders.CONTENT_TYPE, "text/plain; version=0.0.4; charset=utf-8")
.end(pmr.scrape());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/neonbee/config/NeonBeeConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.neonbee.config.metrics.MicrometerRegistryLoader;
import io.neonbee.test.base.NeonBeeTestBase;
import io.neonbee.test.helper.WorkingDirectoryBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
import org.mockito.junit.jupiter.MockitoExtension;

import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.prometheus.client.exporter.common.TextFormat;
import io.vertx.core.Future;
import io.vertx.core.http.HttpHeaders;
import io.vertx.core.http.HttpServerResponse;
Expand Down Expand Up @@ -68,7 +67,8 @@ void testPrometheusMeterRegistry() {
nph.handle(rcMock);

assertThat(contentTypeCaptor.getValue().toString()).isEqualTo(HttpHeaders.CONTENT_TYPE.toString());
assertThat(contentTypeCaptor004.getValue().toString()).isEqualTo(TextFormat.CONTENT_TYPE_004);
assertThat(contentTypeCaptor004.getValue().toString())
.isEqualTo("text/plain; version=0.0.4; charset=utf-8");
}
}
}
Loading