Bump to latest OTEL SDK. (#148)

jsuereth · web-flow · commit 2ebf83b8e938 · 2022-04-27T09:39:50.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -109,8 +109,8 @@ subprojects {
 		googleCloudVersion = '2.0.5'
 		googleTraceVersion = '2.0.0'
 		cloudMonitoringVersion = '3.0.0'
-		openTelemetryVersion = '1.12.0'
-		openTelemetryInstrumentationVersion = '1.12.1'
+		openTelemetryVersion = '1.13.0'
+		openTelemetryInstrumentationVersion = '1.13.0'
 		junitVersion = '4.13'
 		mockitoVersion = '3.5.10'
 		pubSubVersion = '1.111.2'
diff --git a/e2e-test-server/src/main/java/com/google/cloud/opentelemetry/endtoend/ScenarioHandlerManager.java b/e2e-test-server/src/main/java/com/google/cloud/opentelemetry/endtoend/ScenarioHandlerManager.java
@@ -87,7 +87,8 @@ private Response detectResource(Request request) {
     Resource resource =
         AutoConfiguredOpenTelemetrySdk.builder()
             .setResultAsGlobal(false)
-            .addPropertiesSupplier(() -> Map.of("otel.traces.exporter", "none"))
+            .addPropertiesSupplier(
+                () -> Map.of("otel.traces.exporter", "none", "otel.metrics.exporter", "none"))
             .registerShutdownHook(false)
             .build()
             .getResource();
diff --git a/examples/metrics/src/main/java/com/google/cloud/opentelemetry/example/metrics/MetricsExporterExample.java b/examples/metrics/src/main/java/com/google/cloud/opentelemetry/example/metrics/MetricsExporterExample.java
@@ -37,7 +37,7 @@ private static void setupMetricExporter() {
               .registerMetricReader(
                   PeriodicMetricReader.builder(metricExporter)
                       .setInterval(java.time.Duration.ofSeconds(30))
-                      .newMetricReaderFactory())
+                      .build())
               .build();
 
       METER =
diff --git a/exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricExporter.java b/exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricExporter.java
@@ -31,6 +31,7 @@
 import com.google.monitoring.v3.TimeSeries;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.DoublePointData;
 import io.opentelemetry.sdk.metrics.data.HistogramPointData;
@@ -128,6 +129,11 @@ private void exportDescriptor(MetricDescriptor descriptor) {
             .build());
   }
 
+  @Override
+  public AggregationTemporality getAggregationTemporality(InstrumentType instrumentType) {
+    return AggregationTemporality.CUMULATIVE;
+  }
+
   @Override
   public CompletableResultCode export(Collection<MetricData> metrics) {
     // General Algorithm for export:
@@ -228,11 +234,6 @@ public CompletableResultCode shutdown() {
     return CompletableResultCode.ofSuccess();
   }
 
-  @Override
-  public AggregationTemporality getPreferredTemporality() {
-    return AggregationTemporality.CUMULATIVE;
-  }
-
   // TODO: Move this to its own class.
   static class MetricWithLabels {
 
diff --git a/exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricTranslator.java b/exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricTranslator.java
@@ -29,9 +29,11 @@
 import com.google.protobuf.Timestamp;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
 import io.opentelemetry.sdk.metrics.data.HistogramData;
 import io.opentelemetry.sdk.metrics.data.HistogramPointData;
+import io.opentelemetry.sdk.metrics.data.LongExemplarData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.MetricDataType;
 import io.opentelemetry.sdk.metrics.data.SumData;
@@ -249,15 +251,26 @@ static Distribution.Builder mapDistribution(HistogramPointData point, String pro
   }
 
   private static Distribution.Exemplar mapExemplar(ExemplarData exemplar, String projectId) {
+    double value = 0;
+    if (exemplar instanceof DoubleExemplarData) {
+      value = ((DoubleExemplarData) exemplar).getValue();
+    } else if (exemplar instanceof LongExemplarData) {
+      value = ((LongExemplarData) exemplar).getValue();
+    }
+
     Distribution.Exemplar.Builder exemplarBuilder =
         Distribution.Exemplar.newBuilder()
-            .setValue(exemplar.getValueAsDouble())
+            .setValue(value)
             .setTimestamp(mapTimestamp(exemplar.getEpochNanos()));
-    if (exemplar.getSpanId() != null && exemplar.getTraceId() != null) {
+    if (exemplar.getSpanContext().isValid()) {
       exemplarBuilder.addAttachments(
           Any.pack(
               SpanContext.newBuilder()
-                  .setSpanName(makeSpanName(projectId, exemplar.getTraceId(), exemplar.getSpanId()))
+                  .setSpanName(
+                      makeSpanName(
+                          projectId,
+                          exemplar.getSpanContext().getTraceId(),
+                          exemplar.getSpanContext().getSpanId()))
                   .build()));
     }
     if (!exemplar.getFilteredAttributes().isEmpty()) {
diff --git a/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/FakeData.java b/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/FakeData.java
@@ -26,16 +26,19 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceState;
-import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
-import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
 import io.opentelemetry.sdk.metrics.data.DoublePointData;
 import io.opentelemetry.sdk.metrics.data.HistogramPointData;
 import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.SummaryPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoubleExemplarData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoublePointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData;
 import io.opentelemetry.sdk.resources.Resource;
@@ -73,18 +76,18 @@ public class FakeData {
 
   static final Resource aGceResource = Resource.create(someGceAttributes);
 
-  static final InstrumentationLibraryInfo anInstrumentationLibraryInfo =
-      InstrumentationLibraryInfo.create("instrumentName", "0");
+  static final InstrumentationScopeInfo anInstrumentationLibraryInfo =
+      InstrumentationScopeInfo.create("instrumentName", "0", "");
 
   static final LongPointData aLongPoint =
-      LongPointData.create(
+      ImmutableLongPointData.create(
           1599030114 * NANO_PER_SECOND,
           1599031814 * NANO_PER_SECOND,
           Attributes.of(stringKey("label1"), "value1", booleanKey("label2"), false),
           32L);
 
   static final DoublePointData aDoublePoint =
-      DoublePointData.create(
+      ImmutableDoublePointData.create(
           1599030114 * NANO_PER_SECOND,
           1599031814 * NANO_PER_SECOND,
           Attributes.of(stringKey("label1"), "value1", booleanKey("label2"), false),
@@ -104,7 +107,7 @@ public class FakeData {
   // and should be changed when the following issue is resolved:
   // https://github.com/googleinterns/cloud-operations-api-mock/issues/56
   static final MetricData aMetricData =
-      MetricData.createLongSum(
+      ImmutableMetricData.createLongSum(
           aGceResource,
           anInstrumentationLibraryInfo,
           "opentelemetry/name",
@@ -123,14 +126,16 @@ public class FakeData {
           1,
           Attributes.builder().put("test", "one").build(),
           3d,
+          1d, // min
+          2d, // max
           Arrays.asList(1.0),
           Arrays.asList(1L, 2L),
           Arrays.asList(
-              DoubleExemplarData.create(
+              ImmutableDoubleExemplarData.create(
                   Attributes.builder().put("test2", "two").build(), 2, aSpanContext, 3.0)));
 
   static final MetricData aHistogram =
-      MetricData.createDoubleHistogram(
+      ImmutableMetricData.createDoubleHistogram(
           aGceResource,
           anInstrumentationLibraryInfo,
           "histogram",
diff --git a/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/MetricExporterTest.java b/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/MetricExporterTest.java
@@ -63,6 +63,7 @@
 import com.google.protobuf.Timestamp;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -306,7 +307,7 @@ public void testExportWithNonSupportedMetricTypeReturnsFailure() {
             aProjectId, mockClient, MetricDescriptorStrategy.ALWAYS_SEND);
 
     MetricData metricData =
-        MetricData.createDoubleSummary(
+        ImmutableMetricData.createDoubleSummary(
             aGceResource,
             anInstrumentationLibraryInfo,
             "Metric Name",
diff --git a/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/MetricTranslatorTest.java b/exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/MetricTranslatorTest.java
@@ -45,6 +45,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
 import org.junit.Test;
@@ -102,7 +103,7 @@ public void testMapMetricDescriptorNonMonotonicSumIsGauage() {
     String description = "Metric Description";
     String unit = "ns";
     MetricData metricData =
-        MetricData.createLongSum(
+        ImmutableMetricData.createLongSum(
             aGceResource,
             anInstrumentationLibraryInfo,
             name,
@@ -132,7 +133,7 @@ public void testMapMetricDescriptorHistogramIsDistribution() {
     String description = "Metric Description";
     String unit = "ns";
     MetricData metricData =
-        MetricData.createDoubleHistogram(
+        ImmutableMetricData.createDoubleHistogram(
             aGceResource,
             anInstrumentationLibraryInfo,
             name,
@@ -161,7 +162,7 @@ public void testMapMetricDescriptorWithInvalidMetricKindReturnsNull() {
     String description = "Metric Description";
     String unit = "ns";
     MetricData metricData =
-        MetricData.createDoubleSummary(
+        ImmutableMetricData.createDoubleSummary(
             aGceResource,
             anInstrumentationLibraryInfo,
             name,
@@ -180,7 +181,7 @@ public void testMapMetricDescriptorWithDeltaSumReturnsNull() {
     String description = "Metric Description";
     String unit = "ns";
     MetricData metricData =
-        MetricData.createDoubleSum(
+        ImmutableMetricData.createDoubleSum(
             aGceResource,
             anInstrumentationLibraryInfo,
             name,
diff --git a/propagators/gcp/src/test/java/com/google/cloud/opentelemetry/propagators/AutoConfigureTest.java b/propagators/gcp/src/test/java/com/google/cloud/opentelemetry/propagators/AutoConfigureTest.java
@@ -64,7 +64,14 @@ private static ContextPropagators findsWithAutoConfigure(String propagator) {
             .setResultAsGlobal(false)
             .registerShutdownHook(false)
             .addPropertiesSupplier(
-                () -> Map.of("otel.propagators", propagator, "otel.traces.exporter", "none"))
+                () ->
+                    Map.of(
+                        "otel.propagators",
+                        propagator,
+                        "otel.traces.exporter",
+                        "none",
+                        "otel.metrics.exporter",
+                        "none"))
             .build();
     return sdk.getOpenTelemetrySdk().getPropagators();
   }
