Remove labels keys from instruments

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Apr 17, 2020 · 2b7d08f · 2b7d08f
1 parent c32c776
commit 2b7d08f
Show file tree

Hide file tree

Showing 38 changed files with 13 additions and 308 deletions.
diff --git a/api/src/main/java/io/opentelemetry/internal/Utils.java b/api/src/main/java/io/opentelemetry/internal/Utils.java
@@ -115,23 +115,6 @@ public static <T> T checkNotNull(T arg, @javax.annotation.Nullable Object errorM
     return arg;
   }
 
-  /**
-   * Throws a {@link NullPointerException} if any of the list elements is null.
-   *
-   * @param list the argument list to check for null.
-   * @param errorMessage the message to use for the exception. Will be converted to a string using
-   *     {@link String#valueOf(Object)}.
-   * @param <T> type of an argument to check.
-   */
-  public static <T> void checkListElementNotNull(
-      List<T> list, @javax.annotation.Nullable Object errorMessage) {
-    for (T element : list) {
-      if (element == null) {
-        throw new NullPointerException(String.valueOf(errorMessage));
-      }
-    }
-  }
-
   /**
    * Throws a {@link NullPointerException} if any of the map elements is null.
    *

diff --git a/api/src/main/java/io/opentelemetry/metrics/Counter.java b/api/src/main/java/io/opentelemetry/metrics/Counter.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.InstrumentWithBinding.BoundInstrument;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -38,9 +37,6 @@ interface Builder extends Instrument.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/DefaultMeter.java b/api/src/main/java/io/opentelemetry/metrics/DefaultMeter.java
@@ -18,7 +18,6 @@
 
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.internal.Utils;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
@@ -406,12 +405,6 @@ public B setUnit(String unit) {
       return getThis();
     }
 
-    @Override
-    public B setLabelKeys(List<String> labelKeys) {
-      Utils.checkListElementNotNull(Utils.checkNotNull(labelKeys, "labelKeys"), "labelKey");
-      return getThis();
-    }
-
     @Override
     public B setConstantLabels(Map<String, String> constantLabels) {
       Utils.checkMapKeysNotNull(

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleCounter.java b/api/src/main/java/io/opentelemetry/metrics/DoubleCounter.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.DoubleCounter.BoundDoubleCounter;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -36,7 +35,6 @@
  *           .doubleCounterBuilder("processed_jobs")
  *           .setDescription("Processed jobs")
  *           .setUnit("1")
- *           .setLabelKeys(Collections.singletonList("Key"))
  *           .build();
  *   // It is recommended that the API user keep references to a Bound Counters.
  *   private static final BoundDoubleCounter someWorkBound =
@@ -99,9 +97,6 @@ interface Builder extends Counter.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleMeasure.java b/api/src/main/java/io/opentelemetry/metrics/DoubleMeasure.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.DoubleMeasure.BoundDoubleMeasure;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -93,9 +92,6 @@ interface Builder extends Measure.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleObserver.java b/api/src/main/java/io/opentelemetry/metrics/DoubleObserver.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.DoubleObserver.ResultDoubleObserver;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -65,9 +64,6 @@ interface Builder extends Observer.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/Instrument.java b/api/src/main/java/io/opentelemetry/metrics/Instrument.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -51,16 +50,6 @@ interface Builder {
      */
     Builder setUnit(String unit);
 
-    /**
-     * Sets the list of label keys for the Instrument.
-     *
-     * <p>Default value is {@link Collections#emptyList()}
-     *
-     * @param labelKeys the list of label keys for the Instrument.
-     * @return this.
-     */
-    Builder setLabelKeys(List<String> labelKeys);
-
     /**
      * Sets the map of constant labels (they will be added to all the Bound Instruments) for the
      * Instrument.

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongCounter.java b/api/src/main/java/io/opentelemetry/metrics/LongCounter.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.LongCounter.BoundLongCounter;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -36,7 +35,6 @@
  *           .longCounterBuilder("processed_jobs")
  *           .setDescription("Processed jobs")
  *           .setUnit("1")
- *           .setLabelKeys(Collections.singletonList("Key"))
  *           .build();
  *   // It is recommended that the API user keep a reference to a Bound Counter.
  *   private static final BoundLongCounter someWorkBound =
@@ -100,9 +98,6 @@ interface Builder extends Counter.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongMeasure.java b/api/src/main/java/io/opentelemetry/metrics/LongMeasure.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.LongMeasure.BoundLongMeasure;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -93,9 +92,6 @@ interface Builder extends Measure.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongObserver.java b/api/src/main/java/io/opentelemetry/metrics/LongObserver.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.LongObserver.ResultLongObserver;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -65,9 +64,6 @@ interface Builder extends Observer.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/Measure.java b/api/src/main/java/io/opentelemetry/metrics/Measure.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.metrics.InstrumentWithBinding.BoundInstrument;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -38,9 +37,6 @@ interface Builder extends Instrument.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/Observer.java b/api/src/main/java/io/opentelemetry/metrics/Observer.java
@@ -16,7 +16,6 @@
 
 package io.opentelemetry.metrics;
 
-import java.util.List;
 import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -56,9 +55,6 @@ interface Builder extends Instrument.Builder {
     @Override
     Builder setUnit(String unit);
 
-    @Override
-    Builder setLabelKeys(List<String> labelKeys);
-
     @Override
     Builder setConstantLabels(Map<String, String> constantLabels);
 

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleCounterTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleCounterTest.java
@@ -19,8 +19,6 @@
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.internal.StringUtils;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -35,7 +33,6 @@ public class DoubleCounterTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final List<String> LABEL_KEY = Collections.singletonList("key");
 
   private final Meter meter = OpenTelemetry.getMeterProvider().get("counter_double_test");
 
@@ -70,39 +67,17 @@ public void preventNull_Unit() {
     meter.doubleCounterBuilder("metric").setUnit(null).build();
   }
 
-  @Test
-  public void preventNull_LabelKeys() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKeys");
-    meter.doubleCounterBuilder("metric").setLabelKeys(null).build();
-  }
-
   @Test
   public void preventNull_ConstantLabels() {
     thrown.expect(NullPointerException.class);
     thrown.expectMessage("constantLabels");
     meter.doubleCounterBuilder("metric").setConstantLabels(null).build();
   }
 
-  @Test
-  public void preventNull_LabelKey() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKey");
-    meter
-        .doubleCounterBuilder("metric")
-        .setLabelKeys(Collections.<String>singletonList(null))
-        .build();
-  }
-
   @Test
   public void noopBind_WithBadLabelSet() {
     DoubleCounter doubleCounter =
-        meter
-            .doubleCounterBuilder(NAME)
-            .setDescription(DESCRIPTION)
-            .setLabelKeys(LABEL_KEY)
-            .setUnit(UNIT)
-            .build();
+        meter.doubleCounterBuilder(NAME).setDescription(DESCRIPTION).setUnit(UNIT).build();
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage("key/value");
     doubleCounter.bind("key");
@@ -111,12 +86,7 @@ public void noopBind_WithBadLabelSet() {
   @Test
   public void doesNotThrow() {
     DoubleCounter doubleCounter =
-        meter
-            .doubleCounterBuilder(NAME)
-            .setDescription(DESCRIPTION)
-            .setLabelKeys(LABEL_KEY)
-            .setUnit(UNIT)
-            .build();
+        meter.doubleCounterBuilder(NAME).setDescription(DESCRIPTION).setUnit(UNIT).build();
     doubleCounter.bind().add(1.0);
   }
 }
diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleMeasureTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleMeasureTest.java
@@ -17,7 +17,6 @@
 package io.opentelemetry.metrics;
 
 import java.util.Arrays;
-import java.util.Collections;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -61,23 +60,6 @@ public void preventNull_Unit() {
     meter.doubleMeasureBuilder("metric").setUnit(null).build();
   }
 
-  @Test
-  public void preventNull_LabelKeys() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKeys");
-    meter.doubleMeasureBuilder("metric").setLabelKeys(null).build();
-  }
-
-  @Test
-  public void preventNull_LabelKey() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKey");
-    meter
-        .doubleMeasureBuilder("metric")
-        .setLabelKeys(Collections.<String>singletonList(null))
-        .build();
-  }
-
   @Test
   public void preventNull_ConstantLabels() {
     thrown.expect(NullPointerException.class);

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleObserverTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleObserverTest.java
@@ -19,7 +19,6 @@
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.internal.StringUtils;
 import java.util.Arrays;
-import java.util.Collections;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -63,23 +62,6 @@ public void preventNull_Unit() {
     meter.doubleObserverBuilder("metric").setUnit(null).build();
   }
 
-  @Test
-  public void preventNull_LabelKeys() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKeys");
-    meter.doubleObserverBuilder("metric").setLabelKeys(null).build();
-  }
-
-  @Test
-  public void preventNull_LabelKey() {
-    thrown.expect(NullPointerException.class);
-    thrown.expectMessage("labelKey");
-    meter
-        .doubleObserverBuilder("metric")
-        .setLabelKeys(Collections.<String>singletonList(null))
-        .build();
-  }
-
   @Test
   public void preventNull_ConstantLabels() {
     thrown.expect(NullPointerException.class);