remove disabled option

Author: zeitlinger

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

@@ -125,8 +125,7 @@ MetricSnapshots convert(@Nullable Collection<MetricData> metricDataCollection) {
       if (resource == null) {
         resource = metricData.getResource();
       }
-      if (otelScopeMode.isLabelOrInfo()
-          && !metricData.getInstrumentationScopeInfo().getAttributes().isEmpty()) {
+      if (!metricData.getInstrumentationScopeInfo().getAttributes().isEmpty()) {
         scopes.add(metricData.getInstrumentationScopeInfo());
       }
     }
@@ -458,8 +457,7 @@ private InfoSnapshot makeScopeInfo(Set<InstrumentationScopeInfo> scopes) {
    * Convert OpenTelemetry attributes to Prometheus labels.
    *
    * @param resource optional resource (attributes) to be converted.
-   * @param scope will be converted to {@code otel_scope_*} labels if {@code otelScopeMode} is
-   *     {@link OtelScopeMode#isLabelOrInfo()}.
+   * @param scope will be converted to {@code otel_scope_*} labels.
    * @param attributes the attributes to be converted.
    * @param additionalAttributes optional list of key/value pairs, may be empty.
    */
@@ -486,7 +484,7 @@ private Labels convertAttributes(
           requireNonNull(additionalAttributes[i]), additionalAttributes[i + 1]);
     }
 
-    if (otelScopeMode.isLabelOrInfo() && scope != null) {
+    if (scope != null) {
       labelNameToValue.putIfAbsent(OTEL_SCOPE_NAME, scope.getName());
       if (scope.getVersion() != null) {
         labelNameToValue.putIfAbsent(OTEL_SCOPE_VERSION, scope.getVersion());

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

@@ -6,8 +6,6 @@
 package io.opentelemetry.exporter.prometheus;
 
 public enum OtelScopeMode {
-  /** No scope information is exported. */
-  DISABLED,
   /**
    * Only the labels of the metrics are exported, but not the scope_info info metrics.
    *
@@ -21,10 +19,6 @@ public enum OtelScopeMode {
    */
   LABELS_AND_SCOPE_INFO;
 
-  boolean isLabelOrInfo() {
-    return this != DISABLED;
-  }
-
   boolean isScopeInfoEnabled() {
     return this == LABELS_AND_SCOPE_INFO;
   }

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

@@ -42,7 +42,7 @@ public final class PrometheusHttpServer implements MetricReader {
 
   private final String host;
   private final int port;
-  private final boolean otelScopeEnabled;
+  private final OtelScopeMode otelScopeMode;
   @Nullable private final Predicate<String> allowedResourceAttributesFilter;
   private final MemoryMode memoryMode;
   private final DefaultAggregationSelector defaultAggregationSelector;
@@ -80,7 +80,7 @@ public static PrometheusHttpServerBuilder builder() {
       @Nullable Authenticator authenticator) {
     this.host = host;
     this.port = port;
-    this.otelScopeEnabled = otelScopeEnabled;
+    this.otelScopeMode = otelScopeMode;
     this.allowedResourceAttributesFilter = allowedResourceAttributesFilter;
     this.memoryMode = memoryMode;
     this.defaultAggregationSelector = defaultAggregationSelector;
@@ -171,7 +171,7 @@ public String toString() {
     StringJoiner joiner = new StringJoiner(",", "PrometheusHttpServer{", "}");
     joiner.add("host=" + host);
     joiner.add("port=" + port);
-    joiner.add("otelScopeEnabled=" + otelScopeEnabled);
+    joiner.add("otelScopeMode=" + otelScopeMode);
     joiner.add("allowedResourceAttributesFilter=" + allowedResourceAttributesFilter);
     joiner.add("memoryMode=" + memoryMode);
     joiner.add(

exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/internal/PrometheusComponentProvider.java

@@ -6,12 +6,14 @@
 package io.opentelemetry.exporter.prometheus.internal;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.exporter.prometheus.OtelScopeMode;
 import io.opentelemetry.exporter.prometheus.PrometheusHttpServer;
 import io.opentelemetry.exporter.prometheus.PrometheusHttpServerBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.internal.IncludeExcludePredicate;
 import io.opentelemetry.sdk.metrics.export.MetricReader;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Declarative configuration SPI implementation for {@link PrometheusHttpServer}.
@@ -46,8 +48,8 @@ public MetricReader create(DeclarativeConfigProperties config) {
     }
 
     Boolean withoutScopeInfo = config.getBoolean("without_scope_info");
-    if (withoutScopeInfo != null) {
-      prometheusBuilder.setOtelScopeEnabled(!withoutScopeInfo);
+    if (Objects.equals(withoutScopeInfo, true)) {
+      prometheusBuilder.setOtelScopeMode(OtelScopeMode.LABELS_ONLY);
     }
 
     DeclarativeConfigProperties withResourceConstantLabels =

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

@@ -413,7 +413,7 @@ void stringRepresentation() {
             "PrometheusHttpServer{"
                 + "host=localhost,"
                 + "port=0,"
-                + "otelScopeEnabled=true,"
+                + "otelScopeMode=LABELS_AND_SCOPE_INFO,"
                 + "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}"
@@ -528,7 +528,7 @@ void toBuilder() {
     PrometheusHttpServerBuilder builder = PrometheusHttpServer.builder();
     builder.setHost("localhost");
     builder.setPort(1234);
-    builder.setOtelScopeMode(OtelScopeMode.DISABLED);
+    builder.setOtelScopeMode(OtelScopeMode.LABELS_ONLY);
 
     Predicate<String> resourceAttributesFilter = s -> false;
     builder.setAllowedResourceAttributesFilter(resourceAttributesFilter);
@@ -555,7 +555,7 @@ public Result authenticate(HttpExchange exchange) {
         .isInstanceOf(PrometheusHttpServerBuilder.class)
         .hasFieldOrPropertyWithValue("host", "localhost")
         .hasFieldOrPropertyWithValue("port", 1234)
-        .hasFieldOrPropertyWithValue("otelScopeMode", OtelScopeMode.DISABLED)
+        .hasFieldOrPropertyWithValue("otelScopeMode", OtelScopeMode.LABELS_ONLY)
         .hasFieldOrPropertyWithValue("allowedResourceAttributesFilter", resourceAttributesFilter)
         .hasFieldOrPropertyWithValue("executor", executor)
         .hasFieldOrPropertyWithValue("prometheusRegistry", prometheusRegistry)

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

@@ -1030,10 +1030,10 @@ void otelScopeComplete() throws IOException {
   }
 
   @Test
-  void otelScopeDisabled() throws IOException {
+  void otelScopeLabelsOnly() throws IOException {
     PrometheusMetricReader reader =
         new PrometheusMetricReader(
-            OtelScopeMode.DISABLED, /* allowedResourceAttributesFilter= */ null);
+            OtelScopeMode.LABELS_ONLY, /* allowedResourceAttributesFilter= */ null);
     Meter meter =
         SdkMeterProvider.builder()
             .setClock(testClock)
@@ -1051,8 +1051,8 @@ void otelScopeDisabled() throws IOException {
             + "# TYPE target info\n"
             + "target_info{service_name=\"unknown_service:java\",telemetry_sdk_language=\"java\",telemetry_sdk_name=\"opentelemetry\",telemetry_sdk_version=\"1.x.x\"} 1\n"
             + "# TYPE test_count counter\n"
-            + "test_count_total 1.0\n"
-            + "test_count_created "
+            + "test_count_total{otel_scope_name=\"test-scope\",otel_scope_version=\"a.b.c\"} 1.0\n"
+            + "test_count_created{otel_scope_name=\"test-scope\",otel_scope_version=\"a.b.c\"} "
             + createdTimestamp
             + "\n"
             + "# EOF\n";