update prom exporter settings

Author: zeitlinger

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

@@ -27,7 +27,6 @@ public class PrometheusMetricReader implements MetricReader, MultiCollector {
 
   private volatile CollectionRegistration collectionRegistration = CollectionRegistration.noop();
   private final Otel2PrometheusConverter converter;
-  private final PrometheusMetricReaderBuilder builder;
 
   /** Returns a new {@link PrometheusMetricReader} with default configuration. */
   public static PrometheusMetricReader create() {
@@ -48,15 +47,10 @@ public static PrometheusMetricReaderBuilder builder() {
   @SuppressWarnings({"unused", "InconsistentOverloads"})
   public PrometheusMetricReader(
       boolean otelScopeLabelsEnabled, @Nullable Predicate<String> allowedResourceAttributesFilter) {
-    this.builder =
-        new PrometheusMetricReaderBuilder()
-            .setOtelScopeLabelsEnabled(otelScopeLabelsEnabled)
-            .setAllowedResourceAttributesFilter(allowedResourceAttributesFilter);
-    this.converter =
-        new Otel2PrometheusConverter(
-            otelScopeLabelsEnabled,
-            /* otelTargetInfoMetricEnabled= */ true,
-            allowedResourceAttributesFilter);
+    this(
+        allowedResourceAttributesFilter,
+        otelScopeLabelsEnabled,
+        /* otelTargetInfoMetricEnabled= */ true);
   }
 
   /**
@@ -66,24 +60,18 @@ public PrometheusMetricReader(
    */
   @Deprecated
   public PrometheusMetricReader(@Nullable Predicate<String> allowedResourceAttributesFilter) {
-    this.builder =
-        new PrometheusMetricReaderBuilder()
-            .setAllowedResourceAttributesFilter(allowedResourceAttributesFilter);
-    this.converter =
-        new Otel2PrometheusConverter(
-            /* otelScopeLabelsEnabled= */ true,
-            /* otelTargetInfoMetricEnabled= */ true,
-            allowedResourceAttributesFilter);
+    this(
+        allowedResourceAttributesFilter,
+        /* otelScopeLabelsEnabled= */ true,
+        /* otelTargetInfoMetricEnabled= */ true);
   }
 
   // Package-private constructor used by builder
   @SuppressWarnings("InconsistentOverloads")
   PrometheusMetricReader(
       @Nullable Predicate<String> allowedResourceAttributesFilter,
-      PrometheusMetricReaderBuilder builder,
       boolean otelScopeLabelsEnabled,
       boolean otelTargetInfoMetricEnabled) {
-    this.builder = builder;
     this.converter =
         new Otel2PrometheusConverter(
             otelScopeLabelsEnabled, otelTargetInfoMetricEnabled, allowedResourceAttributesFilter);
@@ -113,12 +101,4 @@ public CompletableResultCode shutdown() {
   public MetricSnapshots collect() {
     return converter.convert(collectionRegistration.collectAllMetrics());
   }
-
-  /**
-   * Returns a new {@link PrometheusMetricReaderBuilder} with the same configuration as this
-   * instance.
-   */
-  public PrometheusMetricReaderBuilder toBuilder() {
-    return new PrometheusMetricReaderBuilder(builder);
-  }
 }

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

@@ -65,6 +65,6 @@ public PrometheusMetricReaderBuilder setAllowedResourceAttributesFilter(
   /** Builds a new {@link PrometheusMetricReader}. */
   public PrometheusMetricReader build() {
     return new PrometheusMetricReader(
-        allowedResourceAttributesFilter, this, otelScopeLabelsEnabled, otelTargetInfoMetricEnabled);
+        allowedResourceAttributesFilter, otelScopeLabelsEnabled, otelTargetInfoMetricEnabled);
   }
 }

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

@@ -432,6 +432,8 @@ void stringRepresentation() {
             "PrometheusHttpServer{"
                 + "host=localhost,"
                 + "port=0,"
+                + "otelScopeLabelsEnabled=true,"
+                + "otelTargetInfoMetricEnabled=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}"