fix smoke tests

hypertrace · Mar 18, 2024 · 0d7c40d · 0d7c40d
1 parent 2ac846c
commit 0d7c40d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java
@@ -20,7 +20,7 @@
 import com.google.protobuf.util.JsonFormat;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
-import io.opentelemetry.proto.trace.v1.InstrumentationLibrarySpans;
+import io.opentelemetry.proto.trace.v1.ScopeSpans;
 import io.opentelemetry.proto.trace.v1.Span;
 import java.io.IOException;
 import java.time.Duration;
@@ -160,11 +160,11 @@ protected static Stream<Span> getSpanStream(Collection<ExportTraceServiceRequest
         .flatMap(librarySpans -> librarySpans.getSpansList().stream());
   }
 
-  protected static Stream<InstrumentationLibrarySpans> getInstrumentationLibSpanStream(
+  protected static Stream<ScopeSpans> getInstrumentationLibSpanStream(
       Collection<ExportTraceServiceRequest> traceRequest) {
     return traceRequest.stream()
         .flatMap(request -> request.getResourceSpansList().stream())
-        .flatMap(resourceSpans -> resourceSpans.getInstrumentationLibrarySpansList().stream());
+        .flatMap(resourceSpans -> resourceSpans.getScopeSpansList().stream());
   }
 
   protected Collection<ExportTraceServiceRequest> waitForTraces(final int count) {
@@ -237,7 +237,7 @@ protected boolean hasMetricNamed(
       String metricName, Collection<ExportMetricsServiceRequest> metricRequests) {
     return metricRequests.stream()
         .flatMap(metricRequest -> metricRequest.getResourceMetricsList().stream())
-        .flatMap(resourceMetrics -> resourceMetrics.getInstrumentationLibraryMetricsList().stream())
+        .flatMap(resourceMetrics -> resourceMetrics.getScopeMetricsList().stream())
         .flatMap(
             instrumentationLibraryMetrics ->
                 instrumentationLibraryMetrics.getMetricsList().stream())

diff --git a/.../src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureSmokeTest.java b/.../src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureSmokeTest.java
@@ -82,11 +82,7 @@ public void get() throws IOException {
     Assertions.assertTrue(
         getInstrumentationLibSpanStream(traces)
             .anyMatch(
-                instLibSpan ->
-                    instLibSpan
-                        .getInstrumentationLibrary()
-                        .getVersion()
-                        .equals(currentAgentVersion)));
+                instLibSpan -> instLibSpan.getScope().getVersion().equals(currentAgentVersion)));
     Assertions.assertEquals(
         0,
         getSpanStream(traces)

diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java
@@ -18,7 +18,7 @@
 
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -126,11 +126,7 @@ public void postJson() throws IOException, InterruptedException {
     Assertions.assertTrue(
         getInstrumentationLibSpanStream(traces)
             .anyMatch(
-                instLibSpan ->
-                    instLibSpan
-                        .getInstrumentationLibrary()
-                        .getVersion()
-                        .equals(currentAgentVersion)));
+                instLibSpan -> instLibSpan.getScope().getVersion().equals(currentAgentVersion)));
     Assertions.assertTrue(
         getSpanStream(traces)
                 .flatMap(span -> span.getAttributesList().stream())