fix rebase

open-telemetry · Jun 28, 2024 · 06ee69f · 06ee69f
1 parent 55a79c2
commit 06ee69f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/...n/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java b/...n/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java
@@ -21,8 +21,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.ClientAttributes;
 import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
+import io.opentelemetry.semconv.ClientAttributes;
 import io.opentelemetry.semconv.HttpAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
 import io.opentelemetry.semconv.UrlAttributes;
@@ -235,13 +235,12 @@ void restTemplate() {
                         .hasAttribute(HttpAttributes.HTTP_ROUTE, "/ping")));
   }
 
-  public static void assertClientSpan(SpanDataAssert nestedClientSpan, String path) {
-    nestedClientSpan
-        .hasKind(SpanKind.CLIENT)
+  public static void assertClientSpan(SpanDataAssert span, String path) {
+    span.hasKind(SpanKind.CLIENT)
         .hasAttributesSatisfying(
-            OpenTelemetryAssertions.satisfies(UrlAttributes.URL_FULL, a -> a.endsWith(path)),
+            satisfies(UrlAttributes.URL_FULL, a -> a.endsWith(path)),
             // this attribute is set by the experimental http instrumentation
-            OpenTelemetryAssertions.satisfies(
+            satisfies(
                 AttributeKey.longKey("http.response.body.size"), AbstractLongAssert::isPositive));
   }
 }