pr review

Author: zeitlinger

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

@@ -112,6 +112,19 @@ final class Otel2PrometheusConverter {
             : Collections.emptyMap();
   }
 
+  public boolean isOtelScopeLabelsEnabled() {
+    return otelScopeLabelsEnabled;
+  }
+
+  public boolean isTargetInfoMetricEnabled() {
+    return targetInfoMetricEnabled;
+  }
+
+  @Nullable
+  public Predicate<String> getAllowedResourceAttributesFilter() {
+    return allowedResourceAttributesFilter;
+  }
+
   MetricSnapshots convert(@Nullable Collection<MetricData> metricDataCollection) {
     if (metricDataCollection == null || metricDataCollection.isEmpty()) {
       return MetricSnapshots.of();

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

@@ -41,7 +41,6 @@ public final class PrometheusHttpServer implements MetricReader {
 
   private final String host;
   private final int port;
-  private final PrometheusMetricReaderBuilder metricReaderBuilder;
   private final MemoryMode memoryMode;
   private final DefaultAggregationSelector defaultAggregationSelector;
 
@@ -70,18 +69,17 @@ public static PrometheusHttpServerBuilder builder() {
       int port,
       @Nullable ExecutorService executor,
       PrometheusRegistry prometheusRegistry,
-      PrometheusMetricReaderBuilder metricReaderBuilder,
       MemoryMode memoryMode,
       @Nullable HttpHandler defaultHandler,
       DefaultAggregationSelector defaultAggregationSelector,
-      @Nullable Authenticator authenticator) {
+      @Nullable Authenticator authenticator,
+      PrometheusMetricReader prometheusMetricReader) {
     this.host = host;
     this.port = port;
-    this.metricReaderBuilder = metricReaderBuilder;
     this.memoryMode = memoryMode;
     this.defaultAggregationSelector = defaultAggregationSelector;
     this.builder = builder;
-    this.prometheusMetricReader = metricReaderBuilder.build();
+    this.prometheusMetricReader = prometheusMetricReader;
     this.prometheusRegistry = prometheusRegistry;
     prometheusRegistry.register(prometheusMetricReader);
     // When memory mode is REUSABLE_DATA, concurrent reads lead to data corruption. To prevent this,
@@ -166,7 +164,7 @@ public String toString() {
     StringJoiner joiner = new StringJoiner(",", "PrometheusHttpServer{", "}");
     joiner.add("host=" + host);
     joiner.add("port=" + port);
-    joiner.add("metricReader=" + metricReaderBuilder);
+    joiner.add("metricReader=" + prometheusMetricReader.toString());
     joiner.add("memoryMode=" + memoryMode);
     joiner.add(
         "defaultAggregationSelector="

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

@@ -179,10 +179,10 @@ public PrometheusHttpServer build() {
         port,
         executor,
         prometheusRegistry,
-        metricReaderBuilder,
         memoryMode,
         defaultHandler,
         defaultAggregationSelector,
-        authenticator);
+        authenticator,
+        metricReaderBuilder.build());
   }
 }

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

@@ -12,6 +12,7 @@
 import io.opentelemetry.sdk.metrics.export.MetricReader;
 import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.util.StringJoiner;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
@@ -102,4 +103,13 @@ public CompletableResultCode shutdown() {
   public MetricSnapshots collect() {
     return converter.convert(collectionRegistration.collectAllMetrics());
   }
+
+  @Override
+  public String toString() {
+    StringJoiner joiner = new StringJoiner(",", "PrometheusMetricReader{", "}");
+    joiner.add("otelScopeLabelsEnabled=" + converter.isOtelScopeLabelsEnabled());
+    joiner.add("targetInfoMetricEnabled=" + converter.isTargetInfoMetricEnabled());
+    joiner.add("allowedResourceAttributesFilter=" + converter.getAllowedResourceAttributesFilter());
+    return joiner.toString();
+  }
 }

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

@@ -65,16 +65,4 @@ public PrometheusMetricReader build() {
     return new PrometheusMetricReader(
         allowedResourceAttributesFilter, otelScopeLabelsEnabled, targetInfoMetricEnabled);
   }
-
-  @Override
-  public String toString() {
-    return "PrometheusMetricReaderBuilder{"
-        + "otelScopeLabelsEnabled="
-        + otelScopeLabelsEnabled
-        + ", targetInfoMetricEnabled="
-        + targetInfoMetricEnabled
-        + ", allowedResourceAttributesFilter="
-        + allowedResourceAttributesFilter
-        + '}';
-  }
 }

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

@@ -432,7 +432,7 @@ void stringRepresentation() {
             "PrometheusHttpServer{"
                 + "host=localhost,"
                 + "port=0,"
-                + "metricReader=PrometheusMetricReaderBuilder{otelScopeLabelsEnabled=true, targetInfoMetricEnabled=true, allowedResourceAttributesFilter=null},"
+                + "metricReader=PrometheusMetricReader{otelScopeLabelsEnabled=true,targetInfoMetricEnabled=true,allowedResourceAttributesFilter=null},"
                 + "memoryMode=REUSABLE_DATA,"
                 + "defaultAggregationSelector=DefaultAggregationSelector{COUNTER=default, UP_DOWN_COUNTER=default, HISTOGRAM=default, OBSERVABLE_COUNTER=default, OBSERVABLE_UP_DOWN_COUNTER=default, OBSERVABLE_GAUGE=default, GAUGE=default}"
                 + "}");