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.

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

Jump to bottom

Updated prometheus version #1930

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated prometheus version #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2474a8
Specifying PrometheusMeterRegistry bean type
szczygiel-m Nov 22, 2024
8d8ba56
Specifying PrometheusConfig bean type
szczygiel-m Nov 22, 2024
7b6a912
Updated prometheus metrics
szczygiel-m Nov 22, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ allprojects {
jetty : '12.0.8',
curator : '5.4.0',
dropwizard_metrics: '4.2.25',
micrometer_metrics: '1.12.5',
micrometer_metrics: '1.13.0',
wiremock : '3.9.0',
spock : '2.4-M4-groovy-4.0',
groovy : '4.0.21',
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import java.util.concurrent.TimeUnit;
import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
import pl.allegro.tech.hermes.common.metric.counter.zookeeper.ZookeeperCounterReporter;
Expand Down
4 changes: 2 additions & 2 deletions ...-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import io.micrometer.core.instrument.MeterRegistry;
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 jakarta.inject.Named;
import java.time.Clock;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...sumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.allegro.tech.hermes.consumers.config;

import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import java.time.Duration;

public class PrometheusConfigAdapter implements PrometheusConfig {
Expand Down
2 changes: 1 addition & 1 deletion ...-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package pl.allegro.tech.hermes.consumers.config;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import java.io.IOException;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
Expand Down
2 changes: 1 addition & 1 deletion ...s-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpServer;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetSocketAddress;
Expand Down
4 changes: 2 additions & 2 deletions ...es-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import io.micrometer.core.instrument.MeterRegistry;
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 java.time.Clock;
import java.util.List;
import org.apache.curator.framework.CuratorFramework;
Expand Down
2 changes: 1 addition & 1 deletion ...end/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.allegro.tech.hermes.frontend.config;

import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.undertow.server.HttpHandler;
import java.util.Optional;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Expand Down
2 changes: 1 addition & 1 deletion ...rontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.allegro.tech.hermes.frontend.config;

import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import java.time.Duration;

public class PrometheusConfigAdapter implements PrometheusConfig {
Expand Down
2 changes: 1 addition & 1 deletion hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static org.xnio.Options.READ_TIMEOUT;
import static org.xnio.Options.SSL_CLIENT_AUTH_MODE;

import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.undertow.Undertow;
import io.undertow.server.HttpHandler;
import io.undertow.server.RoutingHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...ontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static io.undertow.util.StatusCodes.OK;

import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.undertow.server.HttpHandler;
import io.undertow.server.HttpServerExchange;

Expand Down
2 changes: 1 addition & 1 deletion ...ement/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package pl.allegro.tech.hermes.management.config;

import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import java.time.Duration;

public class PrometheusConfigAdapter implements PrometheusConfig {
Expand Down
8 changes: 4 additions & 4 deletions ...ement/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.prometheus.PrometheusConfig;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import io.micrometer.prometheusmetrics.PrometheusConfig;
import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
Expand All @@ -15,15 +15,15 @@
public class PrometheusConfiguration {

@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean(PrometheusMeterRegistry.class)
public PrometheusMeterRegistry micrometerRegistry(
MicrometerRegistryProperties properties, PrometheusConfig prometheusConfig) {
return new PrometheusMeterRegistryFactory(properties, prometheusConfig, "hermes-management")
.provide();
}

@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean(PrometheusConfig.class)
public PrometheusConfig prometheusConfig(PrometheusProperties properties) {
return new PrometheusConfigAdapter(properties);
}
Expand Down
Loading