Convert the usages of the LabelSetSdk to use the Labels class. (#1338)

open-telemetry · Jun 17, 2020 · fccc6d9 · fccc6d9
1 parent f1f5975
commit fccc6d9
Show file tree

Hide file tree

Showing 86 changed files with 499 additions and 825 deletions.
diff --git a/api/src/main/java/io/opentelemetry/common/Labels.java b/api/src/main/java/io/opentelemetry/common/Labels.java
@@ -102,6 +102,10 @@ public static Labels of(
         key5, value5);
   }
 
+  public static Labels of(String[] keyValueLabelPairs) {
+    return sortAndFilterToLabels((Object[]) keyValueLabelPairs);
+  }
+
   private static Labels sortAndFilterToLabels(Object... data) {
     return new AutoValue_Labels_ArrayBackedLabels(sortAndFilter(data));
   }

diff --git a/api/src/main/java/io/opentelemetry/metrics/DefaultMeter.java b/api/src/main/java/io/opentelemetry/metrics/DefaultMeter.java
@@ -16,9 +16,9 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.internal.Utils;
-import java.util.Map;
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -621,9 +621,8 @@ public B setUnit(String unit) {
     }
 
     @Override
-    public B setConstantLabels(Map<String, String> constantLabels) {
-      Utils.checkMapKeysNotNull(
-          Utils.checkNotNull(constantLabels, "constantLabels"), "constantLabel");
+    public B setConstantLabels(Labels constantLabels) {
+      Utils.checkNotNull(constantLabels, "constantLabels");
       return getThis();
     }
 

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleCounter.java b/api/src/main/java/io/opentelemetry/metrics/DoubleCounter.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.DoubleCounter.BoundDoubleCounter;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -97,7 +97,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleCounter build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleSumObserver.java b/api/src/main/java/io/opentelemetry/metrics/DoubleSumObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -74,7 +74,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleSumObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleUpDownCounter.java b/api/src/main/java/io/opentelemetry/metrics/DoubleUpDownCounter.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.DoubleUpDownCounter.BoundDoubleUpDownCounter;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -100,7 +100,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleUpDownCounter build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleUpDownSumObserver.java b/api/src/main/java/io/opentelemetry/metrics/DoubleUpDownSumObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -74,7 +74,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleUpDownSumObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleValueObserver.java b/api/src/main/java/io/opentelemetry/metrics/DoubleValueObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -70,7 +70,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleValueObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/DoubleValueRecorder.java b/api/src/main/java/io/opentelemetry/metrics/DoubleValueRecorder.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.DoubleValueRecorder.BoundDoubleValueRecorder;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -108,7 +108,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     DoubleValueRecorder build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/Instrument.java b/api/src/main/java/io/opentelemetry/metrics/Instrument.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import java.util.Collections;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -59,7 +59,7 @@ interface Builder {
      * @param constantLabels the map of constant labels for the Instrument.
      * @return this.
      */
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     /**
      * Builds and returns a {@code Instrument} with the desired options.

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongCounter.java b/api/src/main/java/io/opentelemetry/metrics/LongCounter.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.LongCounter.BoundLongCounter;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -98,7 +98,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongCounter build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongSumObserver.java b/api/src/main/java/io/opentelemetry/metrics/LongSumObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.LongResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -74,7 +74,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongSumObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongUpDownCounter.java b/api/src/main/java/io/opentelemetry/metrics/LongUpDownCounter.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.LongUpDownCounter.BoundLongUpDownCounter;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -101,7 +101,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongUpDownCounter build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongUpDownSumObserver.java b/api/src/main/java/io/opentelemetry/metrics/LongUpDownSumObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.LongResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -74,7 +74,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongUpDownSumObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongValueObserver.java b/api/src/main/java/io/opentelemetry/metrics/LongValueObserver.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.AsynchronousInstrument.LongResult;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -70,7 +70,7 @@ interface Builder extends AsynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongValueObserver build();

diff --git a/api/src/main/java/io/opentelemetry/metrics/LongValueRecorder.java b/api/src/main/java/io/opentelemetry/metrics/LongValueRecorder.java
@@ -16,8 +16,8 @@
 
 package io.opentelemetry.metrics;
 
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.metrics.LongValueRecorder.BoundLongValueRecorder;
-import java.util.Map;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -108,7 +108,7 @@ interface Builder extends SynchronousInstrument.Builder {
     Builder setUnit(String unit);
 
     @Override
-    Builder setConstantLabels(Map<String, String> constantLabels);
+    Builder setConstantLabels(Labels constantLabels);
 
     @Override
     LongValueRecorder build();

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleCounterTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleCounterTest.java
@@ -17,11 +17,10 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.metrics.DoubleCounter.BoundDoubleCounter;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -36,8 +35,7 @@ public class DoubleCounterTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final Map<String, String> CONSTANT_LABELS =
-      Collections.singletonMap("key", "value");
+  private static final Labels CONSTANT_LABELS = Labels.of("key", "value");
 
   private final Meter meter = OpenTelemetry.getMeter("DoubleCounterTest");
 

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleSumObserverTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleSumObserverTest.java
@@ -17,12 +17,11 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.metrics.AsynchronousInstrument.Callback;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -37,8 +36,7 @@ public class DoubleSumObserverTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final Map<String, String> CONSTANT_LABELS =
-      Collections.singletonMap("key", "value");
+  private static final Labels CONSTANT_LABELS = Labels.of("key", "value");
 
   private final Meter meter = OpenTelemetry.getMeter("DoubleSumObserverTest");
 

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleUpDownCounterTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleUpDownCounterTest.java
@@ -17,11 +17,10 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.metrics.DoubleUpDownCounter.BoundDoubleUpDownCounter;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -36,8 +35,7 @@ public class DoubleUpDownCounterTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final Map<String, String> CONSTANT_LABELS =
-      Collections.singletonMap("key", "value");
+  private static final Labels CONSTANT_LABELS = Labels.of("key", "value");
 
   private final Meter meter = OpenTelemetry.getMeter("DoubleUpDownCounterTest");
 

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleUpDownSumObserverTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleUpDownSumObserverTest.java
@@ -17,12 +17,11 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.metrics.AsynchronousInstrument.Callback;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -37,8 +36,7 @@ public class DoubleUpDownSumObserverTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final Map<String, String> CONSTANT_LABELS =
-      Collections.singletonMap("key", "value");
+  private static final Labels CONSTANT_LABELS = Labels.of("key", "value");
 
   private final Meter meter = OpenTelemetry.getMeter("DoubleUpDownSumObserverTest");
 

diff --git a/api/src/test/java/io/opentelemetry/metrics/DoubleValueObserverTest.java b/api/src/test/java/io/opentelemetry/metrics/DoubleValueObserverTest.java
@@ -17,12 +17,11 @@
 package io.opentelemetry.metrics;
 
 import io.opentelemetry.OpenTelemetry;
+import io.opentelemetry.common.Labels;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.metrics.AsynchronousInstrument.Callback;
 import io.opentelemetry.metrics.AsynchronousInstrument.DoubleResult;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -37,8 +36,7 @@ public class DoubleValueObserverTest {
   private static final String NAME = "name";
   private static final String DESCRIPTION = "description";
   private static final String UNIT = "1";
-  private static final Map<String, String> CONSTANT_LABELS =
-      Collections.singletonMap("key", "value");
+  private static final Labels CONSTANT_LABELS = Labels.of("key", "value");
 
   private final Meter meter = OpenTelemetry.getMeter("DoubleSumObserverTest");