convert groovy smoke tests to java

Author: zeitlinger

smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaTelemetryRetriever.java

@@ -12,12 +12,13 @@
 import io.opentelemetry.testing.internal.armeria.client.WebClient;
 import io.opentelemetry.testing.internal.jackson.core.JsonProcessingException;
 import io.opentelemetry.testing.internal.jackson.databind.ObjectMapper;
+import io.opentelemetry.testing.internal.proto.collector.logs.v1.ExportLogsServiceRequest;
+import io.opentelemetry.testing.internal.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.testing.internal.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.testing.internal.protobuf.GeneratedMessage;
 import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
 import io.opentelemetry.testing.internal.protobuf.util.JsonFormat;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
@@ -45,23 +46,21 @@ public List<SpanData> waitForTraces() {
   }
 
   public Collection<MetricData> waitForMetrics() {
-    //    try {
-    //      return TelemetryConverter.getMetricsData(singletonList(waitForContent("get-metrics")));
-    //    } catch (InterruptedException e) {
-    //      throw new RuntimeException(e);
-    //    }
-    // todo
-    return Collections.emptyList();
+    Collection<ExportMetricsServiceRequest> requests =
+        waitForTelemetry("get-metrics", () -> ExportMetricsServiceRequest.newBuilder());
+    return TelemetryConverter.getMetricsData(
+        requests.stream()
+            .flatMap(r -> r.getResourceMetricsList().stream())
+            .collect(Collectors.toList()));
   }
 
   public Collection<LogRecordData> waitForLogs() {
-    //    try {
-    //      return TelemetryConverter.getLogRecordData(singletonList(waitForContent("get-logs")));
-    //    } catch (InterruptedException e) {
-    //      throw new RuntimeException(e);
-    //    }
-    // todo
-    return Collections.emptyList();
+    Collection<ExportLogsServiceRequest> requests =
+           waitForTelemetry("get-logs", () -> ExportLogsServiceRequest.newBuilder());
+       return TelemetryConverter.getLogRecordData(
+           requests.stream()
+               .flatMap(r -> r.getResourceLogsList().stream())
+               .collect(Collectors.toList()));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/TelemetryConverter.java

@@ -44,8 +44,6 @@
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
-import io.opentelemetry.testing.internal.proto.collector.logs.v1.ExportLogsServiceRequest;
-import io.opentelemetry.testing.internal.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.testing.internal.proto.common.v1.AnyValue;
 import io.opentelemetry.testing.internal.proto.common.v1.ArrayValue;
 import io.opentelemetry.testing.internal.proto.common.v1.InstrumentationScope;
@@ -67,7 +65,6 @@
 import io.opentelemetry.testing.internal.proto.trace.v1.ScopeSpans;
 import io.opentelemetry.testing.internal.proto.trace.v1.Span;
 import io.opentelemetry.testing.internal.proto.trace.v1.Status;
-import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -168,19 +165,7 @@ public static List<SpanData> getSpanData(Collection<ResourceSpans> allResourceSp
     return spans;
   }
 
-  public static List<MetricData> getMetricsData(List<byte[]> exportRequests) {
-    List<ResourceMetrics> allResourceMetrics =
-        exportRequests.stream()
-            .map(
-                serialized -> {
-                  try {
-                    return ExportMetricsServiceRequest.parseFrom(serialized);
-                  } catch (InvalidProtocolBufferException e) {
-                    throw new AssertionError(e);
-                  }
-                })
-            .flatMap(request -> request.getResourceMetricsList().stream())
-            .collect(toList());
+  public static List<MetricData> getMetricsData(Collection<ResourceMetrics> allResourceMetrics) {
     List<MetricData> metrics = new ArrayList<>();
     for (ResourceMetrics resourceMetrics : allResourceMetrics) {
       Resource resource = resourceMetrics.getResource();
@@ -203,19 +188,7 @@ public static List<MetricData> getMetricsData(List<byte[]> exportRequests) {
     return metrics;
   }
 
-  public static List<LogRecordData> getLogRecordData(List<byte[]> exportRequests) {
-    List<ResourceLogs> allResourceLogs =
-        exportRequests.stream()
-            .map(
-                serialized -> {
-                  try {
-                    return ExportLogsServiceRequest.parseFrom(serialized);
-                  } catch (InvalidProtocolBufferException e) {
-                    throw new AssertionError(e);
-                  }
-                })
-            .flatMap(request -> request.getResourceLogsList().stream())
-            .collect(toList());
+  public static List<LogRecordData> getLogRecordData(List<ResourceLogs> allResourceLogs) {
     List<LogRecordData> logs = new ArrayList<>();
     for (ResourceLogs resourceLogs : allResourceLogs) {
       Resource resource = resourceLogs.getResource();

testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java

@@ -11,6 +11,8 @@
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.trace.data.SpanData;
+import io.opentelemetry.testing.internal.proto.collector.logs.v1.ExportLogsServiceRequest;
+import io.opentelemetry.testing.internal.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.testing.internal.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.testing.internal.proto.trace.v1.ResourceSpans;
 import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
@@ -104,7 +106,17 @@ public static List<SpanData> getExportedSpans() {
   public static List<MetricData> getExportedMetrics() {
     try {
       return TelemetryConverter.getMetricsData(
-          (List<byte[]>) getMetricExportRequests.invokeExact());
+          ((List<byte[]>) getMetricExportRequests.invokeExact()).stream()
+              .map(
+                  serialized -> {
+                    try {
+                      return ExportMetricsServiceRequest.parseFrom(serialized);
+                    } catch (InvalidProtocolBufferException e) {
+                      throw new AssertionError(e);
+                    }
+                  })
+              .flatMap(request -> request.getResourceMetricsList().stream())
+              .collect(toList()));
     } catch (Throwable t) {
       throw new AssertionError("Could not invoke getSpanExportRequests", t);
     }
@@ -113,7 +125,17 @@ public static List<MetricData> getExportedMetrics() {
   @SuppressWarnings("unchecked")
   public static List<LogRecordData> getExportedLogRecords() {
     try {
-      return TelemetryConverter.getLogRecordData((List<byte[]>) getLogExportRequests.invokeExact());
+      return TelemetryConverter.getLogRecordData(((List<byte[]>) getLogExportRequests.invokeExact()).stream()
+          .map(
+              serialized -> {
+                try {
+                  return ExportLogsServiceRequest.parseFrom(serialized);
+                } catch (InvalidProtocolBufferException e) {
+                  throw new AssertionError(e);
+                }
+              })
+          .flatMap(request -> request.getResourceLogsList().stream())
+          .collect(toList()));
     } catch (Throwable t) {
       throw new AssertionError("Could not invoke getLogExportRequests", t);
     }