Skip to content

Commit

Permalink
Remove the old MetricBuildItem SPI
Browse files Browse the repository at this point in the history
But keep the BuildItem in 3.8 to make sure we don't break anything.
  • Loading branch information
jmartisk authored and gsmet committed Apr 11, 2024
1 parent 0be03e1 commit 07fbab8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 160 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import static io.quarkus.smallrye.metrics.deployment.SmallRyeMetricsDotNames.TIMER_INTERFACE;

import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
Expand All @@ -27,7 +26,6 @@

import jakarta.enterprise.context.Dependent;

import org.eclipse.microprofile.metrics.MetricRegistry;
import org.eclipse.microprofile.metrics.MetricType;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
Expand Down Expand Up @@ -72,11 +70,8 @@
import io.quarkus.runtime.metrics.MetricsFactory;
import io.quarkus.smallrye.metrics.deployment.jandex.JandexBeanInfoAdapter;
import io.quarkus.smallrye.metrics.deployment.jandex.JandexMemberInfoAdapter;
import io.quarkus.smallrye.metrics.deployment.spi.MetricBuildItem;
import io.quarkus.smallrye.metrics.deployment.spi.MetricsConfigurationBuildItem;
import io.quarkus.smallrye.metrics.runtime.MetadataHolder;
import io.quarkus.smallrye.metrics.runtime.SmallRyeMetricsRecorder;
import io.quarkus.smallrye.metrics.runtime.TagHolder;
import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
import io.quarkus.vertx.http.deployment.RouteBuildItem;
import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
Expand Down Expand Up @@ -555,28 +550,8 @@ public void warnAboutMetricsFromProducers(ValidationPhaseBuildItem validationPha
@BuildStep
@Record(STATIC_INIT)
void extensionMetrics(SmallRyeMetricsRecorder recorder,
List<MetricBuildItem> additionalMetrics,
List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems,
BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
List<MetricsFactoryConsumerBuildItem> metricsFactoryConsumerBuildItems) {
if (metrics.extensionsEnabled) {
if (!additionalMetrics.isEmpty()) {
unremovableBeans.produce(new UnremovableBeanBuildItem(
new UnremovableBeanBuildItem.BeanClassNameExclusion(MetricRegistry.class.getName())));
unremovableBeans.produce(new UnremovableBeanBuildItem(
new UnremovableBeanBuildItem.BeanClassNameExclusion(MetricRegistries.class.getName())));
}
for (MetricBuildItem additionalMetric : additionalMetrics) {
if (additionalMetric.isEnabled()) {
TagHolder[] tags = Arrays.stream(additionalMetric.getTags())
.map(TagHolder::from)
.toArray(TagHolder[]::new);
recorder.registerMetric(additionalMetric.getRegistryType(),
MetadataHolder.from(additionalMetric.getMetadata()),
tags,
additionalMetric.getImplementor());
}
}

for (MetricsFactoryConsumerBuildItem item : metricsFactoryConsumerBuildItems) {
if (item.executionTime() == STATIC_INIT) {
recorder.registerMetrics(item.getConsumer());
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 07fbab8

Please sign in to comment.