From 85d7889362cc903b488f355f79efeb2732ead5dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Dec 2025 11:01:56 +0000 Subject: [PATCH] chore(deps): bump io.micrometer.version from 1.11.5 to 1.16.1 Bumps `io.micrometer.version` from 1.11.5 to 1.16.1. Updates `io.micrometer:micrometer-core` from 1.11.5 to 1.16.1 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.5...v1.16.1) Updates `io.micrometer:micrometer-registry-prometheus` from 1.11.5 to 1.16.1 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.5...v1.16.1) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-registry-prometheus dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/che-core-metrics-core/pom.xml | 4 ++++ .../org/eclipse/che/core/metrics/MetricsBinder.java | 4 ++-- .../org/eclipse/che/core/metrics/MetricsModule.java | 2 +- .../core/metrics/PrometheusMeterRegistryProvider.java | 10 +++++----- core/commons/che-core-commons-observability/pom.xml | 4 ++++ .../observability/MeteredExecutorServiceWrapper.java | 4 ++-- pom.xml | 10 ++++++++-- 7 files changed, 26 insertions(+), 12 deletions(-) diff --git a/core/che-core-metrics-core/pom.xml b/core/che-core-metrics-core/pom.xml index 45357abaa31..fa7aaa0b084 100644 --- a/core/che-core-metrics-core/pom.xml +++ b/core/che-core-metrics-core/pom.xml @@ -42,6 +42,10 @@ io.micrometer micrometer-registry-prometheus + + io.prometheus + prometheus-metrics-model + io.prometheus simpleclient diff --git a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsBinder.java b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsBinder.java index ae67647027b..f4fb4643d36 100644 --- a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsBinder.java +++ b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsBinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2025 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -12,7 +12,7 @@ package org.eclipse.che.core.metrics; import io.micrometer.core.instrument.binder.MeterBinder; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsModule.java b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsModule.java index a2578ca543f..ce008ee7615 100644 --- a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsModule.java +++ b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/MetricsModule.java @@ -26,7 +26,7 @@ import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics; import io.micrometer.core.instrument.binder.system.ProcessorMetrics; import io.micrometer.core.instrument.binder.system.UptimeMetrics; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import io.prometheus.client.CollectorRegistry; @Beta diff --git a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/PrometheusMeterRegistryProvider.java b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/PrometheusMeterRegistryProvider.java index 2886f687dbc..7877874426c 100644 --- a/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/PrometheusMeterRegistryProvider.java +++ b/core/che-core-metrics-core/src/main/java/org/eclipse/che/core/metrics/PrometheusMeterRegistryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2025 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -13,9 +13,9 @@ import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Metrics; -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; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; @@ -29,7 +29,7 @@ public class PrometheusMeterRegistryProvider implements Providerjakarta.validation jakarta.validation-api + + org.eclipse.che.core + che-core-commons-annotations + org.eclipse.che.core che-core-commons-lang diff --git a/core/commons/che-core-commons-observability/src/main/java/org/eclipse/che/commons/observability/MeteredExecutorServiceWrapper.java b/core/commons/che-core-commons-observability/src/main/java/org/eclipse/che/commons/observability/MeteredExecutorServiceWrapper.java index 09f35a0bdea..a6bdba235e4 100644 --- a/core/commons/che-core-commons-observability/src/main/java/org/eclipse/che/commons/observability/MeteredExecutorServiceWrapper.java +++ b/core/commons/che-core-commons-observability/src/main/java/org/eclipse/che/commons/observability/MeteredExecutorServiceWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2021 Red Hat, Inc. + * Copyright (c) 2012-2025 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -15,7 +15,6 @@ import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; import io.micrometer.core.instrument.internal.TimedCronExecutorService; -import io.micrometer.core.lang.Nullable; import java.lang.reflect.Field; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -23,6 +22,7 @@ import java.util.concurrent.ThreadPoolExecutor; import javax.inject.Inject; import javax.inject.Singleton; +import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.commons.schedule.executor.CronExecutorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pom.xml b/pom.xml index 01902e4f3b2..994ed5b6623 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@