diff --git a/api/src/main/java/io/opentelemetry/api/common/LabelConsumer.java b/api/src/main/java/io/opentelemetry/api/common/LabelConsumer.java deleted file mode 100644 index 7bbd8c9d7c..0000000000 --- a/api/src/main/java/io/opentelemetry/api/common/LabelConsumer.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.api.common; - -/** Convenience interface for consuming {@link Labels}. */ -@FunctionalInterface -public interface LabelConsumer { - void accept(String key, String value); -} diff --git a/api/src/main/java/io/opentelemetry/api/common/Labels.java b/api/src/main/java/io/opentelemetry/api/common/Labels.java index 77c471c7bd..472861b48a 100644 --- a/api/src/main/java/io/opentelemetry/api/common/Labels.java +++ b/api/src/main/java/io/opentelemetry/api/common/Labels.java @@ -8,6 +8,7 @@ package io.opentelemetry.api.common; import com.google.auto.value.AutoValue; import java.util.ArrayList; import java.util.List; +import java.util.function.BiConsumer; import javax.annotation.concurrent.Immutable; /** An immutable container for labels, which are pairs of {@link String}. */ @@ -16,7 +17,7 @@ public abstract class Labels extends ImmutableKeyValuePairs { private static final Labels EMPTY = Labels.builder().build(); - public abstract void forEach(LabelConsumer consumer); + public abstract void forEach(BiConsumer consumer); @AutoValue @Immutable @@ -27,7 +28,7 @@ public abstract class Labels extends ImmutableKeyValuePairs { abstract List data(); @Override - public void forEach(LabelConsumer consumer) { + public void forEach(BiConsumer consumer) { List data = data(); for (int i = 0; i < data.size(); i += 2) { consumer.accept((String) data.get(i), (String) data.get(i + 1)); diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java index 319ff177ff..f134527111 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java @@ -7,7 +7,6 @@ package io.opentelemetry.exporters.prometheus; import static io.prometheus.client.Collector.doubleToGoString; -import io.opentelemetry.api.common.LabelConsumer; import io.opentelemetry.api.common.Labels; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.MetricData.DoublePoint; @@ -22,6 +21,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.function.BiConsumer; /** * Util methods to convert OpenTelemetry Metrics data models to Prometheus data models. @@ -117,7 +117,7 @@ final class MetricAdapter { return Collector.sanitizeMetricName(labelKey); } - private static final class Consumer implements LabelConsumer { + private static final class Consumer implements BiConsumer { final List labelNames; final List labelValues;