Skip to content

Commit fc75a5a

Browse files
committed
format
1 parent 4a53c58 commit fc75a5a

File tree

5 files changed

+27
-13
lines changed

5 files changed

+27
-13
lines changed

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ final class Otel2PrometheusConverter {
9494
/**
9595
* Constructor with feature flag parameter.
9696
*
97-
* @param otelScopeMode enable generation of the OpenTelemetry instrumentation scope info
98-
* metric and labels.
97+
* @param otelScopeMode enable generation of the OpenTelemetry instrumentation scope info metric
98+
* and labels.
9999
* @param allowedResourceAttributesFilter if not {@code null}, resource attributes with keys
100100
* matching this predicate will be added as labels on each exported metric
101101
*/
@@ -125,7 +125,8 @@ MetricSnapshots convert(@Nullable Collection<MetricData> metricDataCollection) {
125125
if (resource == null) {
126126
resource = metricData.getResource();
127127
}
128-
if (otelScopeMode.isEnabled() && !metricData.getInstrumentationScopeInfo().getAttributes().isEmpty()) {
128+
if (otelScopeMode.isEnabled()
129+
&& !metricData.getInstrumentationScopeInfo().getAttributes().isEmpty()) {
129130
scopes.add(metricData.getInstrumentationScopeInfo());
130131
}
131132
}
@@ -458,7 +459,7 @@ private InfoSnapshot makeScopeInfo(Set<InstrumentationScopeInfo> scopes) {
458459
*
459460
* @param resource optional resource (attributes) to be converted.
460461
* @param scope will be converted to {@code otel_scope_*} labels if {@code otelScopeMode} is
461-
* {@link OtelScopeMode#isEnabled()}.
462+
* {@link OtelScopeMode#isEnabled()}.
462463
* @param attributes the attributes to be converted.
463464
* @param additionalAttributes optional list of key/value pairs, may be empty.
464465
*/

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/OtelScopeMode.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.exporter.prometheus;
27

38
public enum OtelScopeMode {

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public class PrometheusMetricReader implements MetricReader, MultiCollector {
3232
/** See {@link Otel2PrometheusConverter#Otel2PrometheusConverter(OtelScopeMode, Predicate)}. */
3333
public PrometheusMetricReader(
3434
OtelScopeMode otelScopeMode, @Nullable Predicate<String> allowedResourceAttributesFilter) {
35-
this.converter =
36-
new Otel2PrometheusConverter(otelScopeMode, allowedResourceAttributesFilter);
35+
this.converter = new Otel2PrometheusConverter(otelScopeMode, allowedResourceAttributesFilter);
3736
}
3837

3938
@Override

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ class Otel2PrometheusConverterTest {
7171
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
7272

7373
private final Otel2PrometheusConverter converter =
74-
new Otel2PrometheusConverter(OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
74+
new Otel2PrometheusConverter(
75+
OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
7576

7677
@ParameterizedTest
7778
@MethodSource("metricMetadataArgs")
@@ -201,7 +202,8 @@ void resourceAttributesAddition(
201202
throws IOException {
202203

203204
Otel2PrometheusConverter converter =
204-
new Otel2PrometheusConverter(OtelScopeMode.LABELS_AND_SCOPE_INFO, allowedResourceAttributesFilter);
205+
new Otel2PrometheusConverter(
206+
OtelScopeMode.LABELS_AND_SCOPE_INFO, allowedResourceAttributesFilter);
205207

206208
ByteArrayOutputStream out = new ByteArrayOutputStream();
207209
MetricSnapshots snapshots = converter.convert(Collections.singletonList(metricData));
@@ -501,7 +503,9 @@ void validateCacheIsBounded() {
501503
};
502504

503505
Otel2PrometheusConverter otel2PrometheusConverter =
504-
new Otel2PrometheusConverter(OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ countPredicate);
506+
new Otel2PrometheusConverter(
507+
OtelScopeMode.LABELS_AND_SCOPE_INFO,
508+
/* allowedResourceAttributesFilter= */ countPredicate);
505509

506510
// Create 20 different metric data objects with 2 different resource attributes;
507511
Resource resource1 = Resource.builder().put("cluster", "cluster1").build();

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ class PrometheusMetricReaderTest {
6161
void setUp() {
6262
this.testClock.setTime(Instant.ofEpochMilli((System.currentTimeMillis() / 100) * 100));
6363
this.createdTimestamp = convertTimestamp(testClock.now());
64-
this.reader = new PrometheusMetricReader(OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
64+
this.reader =
65+
new PrometheusMetricReader(
66+
OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
6567
this.meter =
6668
SdkMeterProvider.builder()
6769
.setClock(testClock)
@@ -776,7 +778,8 @@ void exponentialHistogramBucketConversion() {
776778
int otelScale = random.nextInt(24) - 4;
777779
int prometheusScale = Math.min(otelScale, 8);
778780
PrometheusMetricReader reader =
779-
new PrometheusMetricReader(OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
781+
new PrometheusMetricReader(
782+
OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ null);
780783
Meter meter =
781784
SdkMeterProvider.builder()
782785
.registerMetricReader(reader)
@@ -1029,7 +1032,8 @@ void otelScopeComplete() throws IOException {
10291032
@Test
10301033
void otelScopeDisabled() throws IOException {
10311034
PrometheusMetricReader reader =
1032-
new PrometheusMetricReader(OtelScopeMode.DISABLED, /* allowedResourceAttributesFilter= */ null);
1035+
new PrometheusMetricReader(
1036+
OtelScopeMode.DISABLED, /* allowedResourceAttributesFilter= */ null);
10331037
Meter meter =
10341038
SdkMeterProvider.builder()
10351039
.setClock(testClock)
@@ -1060,7 +1064,8 @@ void otelScopeDisabled() throws IOException {
10601064
void addResourceAttributesWorks() throws IOException {
10611065
PrometheusMetricReader reader =
10621066
new PrometheusMetricReader(
1063-
OtelScopeMode.LABELS_AND_SCOPE_INFO, /* allowedResourceAttributesFilter= */ Predicates.is("cluster"));
1067+
OtelScopeMode.LABELS_AND_SCOPE_INFO,
1068+
/* allowedResourceAttributesFilter= */ Predicates.is("cluster"));
10641069
Meter meter =
10651070
SdkMeterProvider.builder()
10661071
.setClock(testClock)

0 commit comments

Comments
 (0)