Fix some assertions

trask · trask · commit 70a28903f3a1 · 2024-10-26T10:28:07.000-07:00
diff --git a/instrumentation/azure-core/azure-core-1.14/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkTest.java b/instrumentation/azure-core/azure-core-1.14/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_14/AzureSdkTest.java
@@ -55,6 +55,6 @@ void testSpan() {
                     span.hasName("hello")
                         .hasKind(SpanKind.INTERNAL)
                         .hasStatus(StatusData.ok())
-                        .hasAttributesSatisfying(Attributes::isEmpty)));
+                        .hasAttributes(Attributes.empty())));
   }
 }
diff --git a/instrumentation/azure-core/azure-core-1.19/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkTest.java b/instrumentation/azure-core/azure-core-1.19/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_19/AzureSdkTest.java
@@ -55,6 +55,6 @@ void testSpan() {
                     span.hasName("hello")
                         .hasKind(SpanKind.INTERNAL)
                         .hasStatus(StatusData.ok())
-                        .hasAttributesSatisfying(Attributes::isEmpty)));
+                        .hasAttributes(Attributes.empty())));
   }
 }
diff --git a/instrumentation/azure-core/azure-core-1.36/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTest.java b/instrumentation/azure-core/azure-core-1.36/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTest.java
@@ -45,7 +45,7 @@ void testSpan() {
                     span.hasName("hello")
                         .hasKind(SpanKind.INTERNAL)
                         .hasStatus(StatusData.unset())
-                        .hasAttributesSatisfying(Attributes::isEmpty)));
+                        .hasAttributes(Attributes.empty())));
   }
 
   private static com.azure.core.util.tracing.Tracer createAzTracer() {
diff --git a/instrumentation/azure-core/azure-core-1.36/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTestOld.java b/instrumentation/azure-core/azure-core-1.36/javaagent/src/testAzure/java/io/opentelemetry/javaagent/instrumentation/azurecore/v1_36/AzureSdkTestOld.java
@@ -50,7 +50,7 @@ void testSpan() {
                     span.hasName("hello")
                         .hasKind(SpanKind.INTERNAL)
                         .hasStatus(StatusData.unset())
-                        .hasAttributesSatisfying(Attributes::isEmpty)));
+                        .hasAttributes(Attributes.empty())));
   }
 
   private static com.azure.core.util.tracing.Tracer createAzTracer() {
diff --git a/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java b/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java
@@ -165,7 +165,7 @@ public SpanDataAssert assertResponseSpan(
     } else {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 
@@ -178,13 +178,13 @@ public List<Consumer<SpanDataAssert>> errorPageSpanAssertions(
             span.hasName(
                     endpoint == NOT_FOUND ? "ErrorController.notFound" : "ErrorController.index")
                 .hasKind(SpanKind.INTERNAL)
-                .hasAttributesSatisfying(Attributes::isEmpty));
+                .hasAttributes(Attributes.empty()));
     if (endpoint == NOT_FOUND) {
       spanAssertions.add(
           span ->
               span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"))
                   .hasKind(SpanKind.INTERNAL)
-                  .hasAttributesSatisfying(Attributes::isEmpty));
+                  .hasAttributes(Attributes.empty()));
     }
     return spanAssertions;
   }
diff --git a/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common/testing/src/main/java/io/opentelemetry/instrumentation/graphql/AbstractGraphqlTest.java
@@ -238,7 +238,7 @@ void parseError() {
                         span.hasName("GraphQL Operation")
                             .hasKind(SpanKind.INTERNAL)
                             .hasNoParent()
-                            .hasAttributesSatisfying(Attributes::isEmpty)
+                            .hasAttributes(Attributes.empty())
                             .hasStatus(StatusData.error())
                             .hasEventsSatisfyingExactly(
                                 event ->
@@ -280,7 +280,7 @@ void validationError() {
                         span.hasName("GraphQL Operation")
                             .hasKind(SpanKind.INTERNAL)
                             .hasNoParent()
-                            .hasAttributesSatisfying(Attributes::isEmpty)
+                            .hasAttributes(Attributes.empty())
                             .hasStatus(StatusData.error())
                             .hasEventsSatisfyingExactly(
                                 event ->
diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java
@@ -94,7 +94,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint == ERROR) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 
diff --git a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java
@@ -74,7 +74,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint == ERROR) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 
diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java
@@ -94,7 +94,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint == ERROR) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java
@@ -149,7 +149,7 @@ protected List<Consumer<SpanDataAssert>> errorPageSpanAssertions(
         span ->
             span.hasName("BasicErrorController.error")
                 .hasKind(SpanKind.INTERNAL)
-                .hasAttributesSatisfying(Attributes::isEmpty));
+                .hasAttributes(Attributes.empty()));
     return spanAssertions;
   }
 
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java
@@ -98,7 +98,7 @@ protected List<Consumer<SpanDataAssert>> errorPageSpanAssertions(
         span ->
             span.hasName("BasicErrorController.error")
                 .hasKind(SpanKind.INTERNAL)
-                .hasAttributesSatisfying(Attributes::isEmpty));
+                .hasAttributes(Attributes.empty()));
     return spanAssertions;
   }
 
diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java
@@ -121,7 +121,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint.equals(NOT_FOUND)) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 }
diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java
@@ -121,7 +121,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint.equals(NOT_FOUND)) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 }
diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java
@@ -116,7 +116,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint.equals(NOT_FOUND)) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 }
diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java
@@ -121,7 +121,7 @@ protected SpanDataAssert assertResponseSpan(
     } else if (endpoint.equals(NOT_FOUND)) {
       span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));
     }
-    span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);
+    span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());
     return span;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ void testSpan() {`
`55`	`55`	`span.hasName("hello")`
`56`	`56`	`.hasKind(SpanKind.INTERNAL)`
`57`	`57`	`.hasStatus(StatusData.ok())`
`58`		`- .hasAttributesSatisfying(Attributes::isEmpty)));`
	`58`	`+ .hasAttributes(Attributes.empty())));`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void testSpan() {`
`45`	`45`	`span.hasName("hello")`
`46`	`46`	`.hasKind(SpanKind.INTERNAL)`
`47`	`47`	`.hasStatus(StatusData.unset())`
`48`		`- .hasAttributesSatisfying(Attributes::isEmpty)));`
	`48`	`+ .hasAttributes(Attributes.empty())));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private static com.azure.core.util.tracing.Tracer createAzTracer() {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void testSpan() {`
`50`	`50`	`span.hasName("hello")`
`51`	`51`	`.hasKind(SpanKind.INTERNAL)`
`52`	`52`	`.hasStatus(StatusData.unset())`
`53`		`- .hasAttributesSatisfying(Attributes::isEmpty)));`
	`53`	`+ .hasAttributes(Attributes.empty())));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`private static com.azure.core.util.tracing.Tracer createAzTracer() {`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public SpanDataAssert assertResponseSpan(`
`165`	`165`	`} else {`
`166`	`166`	`span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));`
`167`	`167`	`}`
`168`		`- span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);`
	`168`	`+ span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());`
`169`	`169`	`return span;`
`170`	`170`	`}`
`171`	`171`
`@@ -178,13 +178,13 @@ public List<Consumer<SpanDataAssert>> errorPageSpanAssertions(`
`178`	`178`	`span.hasName(`
`179`	`179`	`endpoint == NOT_FOUND ? "ErrorController.notFound" : "ErrorController.index")`
`180`	`180`	`.hasKind(SpanKind.INTERNAL)`
`181`		`- .hasAttributesSatisfying(Attributes::isEmpty));`
	`181`	`+ .hasAttributes(Attributes.empty()));`
`182`	`182`	`if (endpoint == NOT_FOUND) {`
`183`	`183`	`spanAssertions.add(`
`184`	`184`	`span ->`
`185`	`185`	`span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"))`
`186`	`186`	`.hasKind(SpanKind.INTERNAL)`
`187`		`- .hasAttributesSatisfying(Attributes::isEmpty));`
	`187`	`+ .hasAttributes(Attributes.empty()));`
`188`	`188`	`}`
`189`	`189`	`return spanAssertions;`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected SpanDataAssert assertResponseSpan(`
`94`	`94`	`} else if (endpoint == ERROR) {`
`95`	`95`	`span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));`
`96`	`96`	`}`
`97`		`- span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);`
	`97`	`+ span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());`
`98`	`98`	`return span;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ protected SpanDataAssert assertResponseSpan(`
`74`	`74`	`} else if (endpoint == ERROR) {`
`75`	`75`	`span.satisfies(spanData -> assertThat(spanData.getName()).endsWith(".sendError"));`
`76`	`76`	`}`
`77`		`- span.hasKind(SpanKind.INTERNAL).hasAttributesSatisfying(Attributes::isEmpty);`
	`77`	`+ span.hasKind(SpanKind.INTERNAL).hasAttributes(Attributes.empty());`
`78`	`78`	`return span;`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ protected List<Consumer<SpanDataAssert>> errorPageSpanAssertions(`
`149`	`149`	`span ->`
`150`	`150`	`span.hasName("BasicErrorController.error")`
`151`	`151`	`.hasKind(SpanKind.INTERNAL)`
`152`		`- .hasAttributesSatisfying(Attributes::isEmpty));`
	`152`	`+ .hasAttributes(Attributes.empty()));`
`153`	`153`	`return spanAssertions;`
`154`	`154`	`}`
`155`	`155`