Update all impl and contrib.

census-instrumentation · Mar 8, 2019 · a88eb58 · a88eb58
1 parent 83943a7
commit a88eb58
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 35 deletions.
diff --git a/...ar_util/src/main/java/io/opencensus/contrib/exemplar/util/AttachmentValueSpanContext.java b/...ar_util/src/main/java/io/opencensus/contrib/exemplar/util/AttachmentValueSpanContext.java
@@ -17,7 +17,7 @@
 package io.opencensus.contrib.exemplar.util;
 
 import com.google.auto.value.AutoValue;
-import io.opencensus.stats.AttachmentValue;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.trace.SpanContext;
 import javax.annotation.concurrent.Immutable;
 

diff --git a/contrib/exemplar_util/src/main/java/io/opencensus/contrib/exemplar/util/ExemplarUtils.java b/contrib/exemplar_util/src/main/java/io/opencensus/contrib/exemplar/util/ExemplarUtils.java
@@ -16,7 +16,7 @@
 
 package io.opencensus.contrib.exemplar.util;
 
-import io.opencensus.stats.AggregationData.DistributionData.Exemplar;
+import io.opencensus.common.Exemplar;
 import io.opencensus.stats.MeasureMap;
 import io.opencensus.trace.SpanContext;
 import javax.annotation.Nullable;

diff --git a/...ib/exemplar_util/src/test/java/io/opencensus/contrib/exemplar/util/ExemplarUtilsTest.java b/...ib/exemplar_util/src/test/java/io/opencensus/contrib/exemplar/util/ExemplarUtilsTest.java
@@ -19,7 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static io.opencensus.contrib.exemplar.util.ExemplarUtils.ATTACHMENT_KEY_SPAN_CONTEXT;
 
-import io.opencensus.stats.AttachmentValue;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.Measure.MeasureLong;
 import io.opencensus.stats.MeasureMap;

diff --git a/...trics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/MetricsProtoUtils.java b/...trics/ocagent/src/main/java/io/opencensus/exporter/metrics/ocagent/MetricsProtoUtils.java
@@ -18,6 +18,8 @@
 
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Int64Value;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.Exemplar;
 import io.opencensus.common.Function;
 import io.opencensus.common.Functions;
 import io.opencensus.common.Timestamp;
@@ -32,6 +34,9 @@
 import io.opencensus.proto.metrics.v1.SummaryValue;
 import io.opencensus.proto.metrics.v1.TimeSeries;
 import io.opencensus.proto.resource.v1.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 import javax.annotation.Nullable;
 
 /** Utilities for converting Metrics APIs in OpenCensus Java to OpenCensus Metrics Proto. */
@@ -207,19 +212,22 @@ private static DistributionValue.Bucket toBucketProto(
       io.opencensus.metrics.export.Distribution.Bucket bucket) {
     DistributionValue.Bucket.Builder builder =
         DistributionValue.Bucket.newBuilder().setCount(bucket.getCount());
-    io.opencensus.metrics.export.Distribution.Exemplar exemplar = bucket.getExemplar();
+    Exemplar exemplar = bucket.getExemplar();
     if (exemplar != null) {
       builder.setExemplar(toExemplarProto(exemplar));
     }
     return builder.build();
   }
 
-  private static DistributionValue.Exemplar toExemplarProto(
-      io.opencensus.metrics.export.Distribution.Exemplar exemplar) {
+  private static DistributionValue.Exemplar toExemplarProto(Exemplar exemplar) {
+    Map<String, String> stringAttachments = new HashMap<>();
+    for (Entry<String, AttachmentValue> entry : exemplar.getAttachments().entrySet()) {
+      stringAttachments.put(entry.getKey(), entry.getValue().getValue());
+    }
     return DistributionValue.Exemplar.newBuilder()
         .setValue(exemplar.getValue())
         .setTimestamp(toTimestampProto(exemplar.getTimestamp()))
-        .putAllAttachments(exemplar.getAttachments())
+        .putAllAttachments(stringAttachments)
         .build();
   }
 

diff --git a/.../ocagent/src/test/java/io/opencensus/exporter/metrics/ocagent/MetricsProtoUtilsTests.java b/.../ocagent/src/test/java/io/opencensus/exporter/metrics/ocagent/MetricsProtoUtilsTests.java
@@ -20,13 +20,14 @@
 
 import com.google.protobuf.DoubleValue;
 import com.google.protobuf.Int64Value;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.Exemplar;
 import io.opencensus.common.Timestamp;
 import io.opencensus.metrics.LabelKey;
 import io.opencensus.metrics.LabelValue;
 import io.opencensus.metrics.export.Distribution;
 import io.opencensus.metrics.export.Distribution.Bucket;
 import io.opencensus.metrics.export.Distribution.BucketOptions;
-import io.opencensus.metrics.export.Distribution.Exemplar;
 import io.opencensus.metrics.export.Metric;
 import io.opencensus.metrics.export.MetricDescriptor;
 import io.opencensus.metrics.export.MetricDescriptor.Type;
@@ -88,7 +89,9 @@ public class MetricsProtoUtilsTests {
               Bucket.create(2),
               Bucket.create(1),
               Bucket.create(
-                  2, Exemplar.create(11, TIMESTAMP_1, Collections.<String, String>emptyMap())),
+                  2,
+                  Exemplar.create(
+                      11, TIMESTAMP_1, Collections.<String, AttachmentValue>emptyMap())),
               Bucket.create(0)));
   private static final Summary SUMMARY =
       Summary.create(

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/IntervalBucket.java b/impl_core/src/main/java/io/opencensus/implcore/stats/IntervalBucket.java
@@ -20,10 +20,10 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.Maps;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Timestamp;
 import io.opencensus.stats.Aggregation;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.tags.TagValue;
 import java.util.List;

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureMapImpl.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureMapImpl.java
@@ -16,7 +16,7 @@
 
 package io.opencensus.implcore.stats;
 
-import io.opencensus.stats.AttachmentValue;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.Measure.MeasureLong;
 import io.opencensus.stats.MeasureMap;

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureMapInternal.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureMapInternal.java
@@ -16,7 +16,7 @@
 
 package io.opencensus.implcore.stats;
 
-import io.opencensus.stats.AttachmentValue;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.Measure.MeasureLong;

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MeasureToViewMap.java
@@ -20,11 +20,11 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Clock;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.CurrentState.State;
 import io.opencensus.metrics.export.Metric;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.Measurement;
 import io.opencensus.stats.View;

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MetricUtils.java
@@ -17,14 +17,14 @@
 package io.opencensus.implcore.stats;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Function;
 import io.opencensus.common.Functions;
 import io.opencensus.metrics.LabelKey;
 import io.opencensus.metrics.LabelValue;
 import io.opencensus.metrics.export.MetricDescriptor;
 import io.opencensus.metrics.export.MetricDescriptor.Type;
 import io.opencensus.stats.Aggregation;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.View;
 import io.opencensus.tags.TagKey;

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableAggregation.java
@@ -20,6 +20,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.Exemplar;
 import io.opencensus.common.Timestamp;
 import io.opencensus.metrics.export.Distribution;
 import io.opencensus.metrics.export.Distribution.BucketOptions;
@@ -28,8 +30,6 @@
 import io.opencensus.stats.Aggregation;
 import io.opencensus.stats.AggregationData;
 import io.opencensus.stats.AggregationData.DistributionData;
-import io.opencensus.stats.AggregationData.DistributionData.Exemplar;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.BucketBoundaries;
 import java.util.ArrayList;
 import java.util.List;
@@ -393,21 +393,15 @@ Point toPoint(Timestamp timestamp) {
       List<Distribution.Bucket> buckets = new ArrayList<Distribution.Bucket>();
       for (int bucket = 0; bucket < bucketCounts.length; bucket++) {
         long bucketCount = bucketCounts[bucket];
-        @javax.annotation.Nullable AggregationData.DistributionData.Exemplar exemplar = null;
+        @javax.annotation.Nullable Exemplar exemplar = null;
         if (exemplars != null) {
           exemplar = exemplars[bucket];
         }
 
         Distribution.Bucket metricBucket;
         if (exemplar != null) {
           // Bucket with an Exemplar.
-          metricBucket =
-              Distribution.Bucket.create(
-                  bucketCount,
-                  Distribution.Exemplar.create(
-                      exemplar.getValue(),
-                      exemplar.getTimestamp(),
-                      MetricUtils.toStringAttachments(exemplar.getAttachments())));
+          metricBucket = Distribution.Bucket.create(bucketCount, exemplar);
         } else {
           // Bucket with no Exemplar.
           metricBucket = Distribution.Bucket.create(bucketCount);

diff --git a/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java b/impl_core/src/main/java/io/opencensus/implcore/stats/MutableViewData.java
@@ -26,6 +26,7 @@
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Function;
 import io.opencensus.common.Functions;
@@ -40,7 +41,6 @@
 import io.opencensus.metrics.export.TimeSeries;
 import io.opencensus.stats.Aggregation;
 import io.opencensus.stats.AggregationData;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.View;
 import io.opencensus.stats.ViewData;

diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/IntervalBucketTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/IntervalBucketTest.java
@@ -18,11 +18,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.stats.MutableAggregation.MutableMean;
 import io.opencensus.stats.Aggregation.Mean;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.tags.TagValue;
 import java.util.Arrays;

diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/MeasureMapInternalTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/MeasureMapInternalTest.java
@@ -19,8 +19,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.Lists;
-import io.opencensus.stats.AttachmentValue;
-import io.opencensus.stats.AttachmentValue.AttachmentValueString;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.AttachmentValue.AttachmentValueString;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.Measure.MeasureLong;

diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/MutableAggregationTest.java
@@ -20,6 +20,9 @@
 import static io.opencensus.implcore.stats.StatsTestUtil.assertAggregationDataEquals;
 
 import com.google.common.collect.ImmutableList;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.AttachmentValue.AttachmentValueString;
+import io.opencensus.common.Exemplar;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.stats.MutableAggregation.MutableCount;
 import io.opencensus.implcore.stats.MutableAggregation.MutableDistribution;
@@ -36,14 +39,11 @@
 import io.opencensus.stats.AggregationData;
 import io.opencensus.stats.AggregationData.CountData;
 import io.opencensus.stats.AggregationData.DistributionData;
-import io.opencensus.stats.AggregationData.DistributionData.Exemplar;
 import io.opencensus.stats.AggregationData.LastValueDataDouble;
 import io.opencensus.stats.AggregationData.LastValueDataLong;
 import io.opencensus.stats.AggregationData.MeanData;
 import io.opencensus.stats.AggregationData.SumDataDouble;
 import io.opencensus.stats.AggregationData.SumDataLong;
-import io.opencensus.stats.AttachmentValue;
-import io.opencensus.stats.AttachmentValue.AttachmentValueString;
 import io.opencensus.stats.BucketBoundaries;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/StatsRecorderImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/StatsRecorderImplTest.java
@@ -22,7 +22,10 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.grpc.Context;
+import io.opencensus.common.AttachmentValue;
+import io.opencensus.common.AttachmentValue.AttachmentValueString;
 import io.opencensus.common.Duration;
+import io.opencensus.common.Exemplar;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.SimpleEventQueue;
 import io.opencensus.implcore.stats.StatsTestUtil.SimpleTagContext;
@@ -31,9 +34,6 @@
 import io.opencensus.stats.Aggregation.Sum;
 import io.opencensus.stats.AggregationData.CountData;
 import io.opencensus.stats.AggregationData.DistributionData;
-import io.opencensus.stats.AggregationData.DistributionData.Exemplar;
-import io.opencensus.stats.AttachmentValue;
-import io.opencensus.stats.AttachmentValue.AttachmentValueString;
 import io.opencensus.stats.BucketBoundaries;
 import io.opencensus.stats.Measure.MeasureDouble;
 import io.opencensus.stats.MeasureMap;

diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java b/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import io.opencensus.common.AttachmentValue;
 import io.opencensus.common.Function;
 import io.opencensus.common.Functions;
 import io.opencensus.common.Timestamp;
@@ -33,7 +34,6 @@
 import io.opencensus.stats.AggregationData.MeanData;
 import io.opencensus.stats.AggregationData.SumDataDouble;
 import io.opencensus.stats.AggregationData.SumDataLong;
-import io.opencensus.stats.AttachmentValue;
 import io.opencensus.stats.Measure;
 import io.opencensus.stats.View;
 import io.opencensus.stats.ViewData;