cleanup test code

Author: zeitlinger

instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/SpymemcachedTest.java

@@ -29,17 +29,14 @@
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.net.InetSocketAddress;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -263,22 +260,15 @@ void getTimeout() throws InterruptedException {
                                             EXCEPTION_STACKTRACE,
                                             val -> val.isInstanceOf(String.class))))
                         .hasAttributesSatisfyingExactly(
-                            withErrorType(
-                                "net.spy.memcached.internal.CheckedOperationTimeoutException",
-                                equalTo(
-                                    maybeStable(DB_SYSTEM),
-                                    DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
-                                equalTo(maybeStable(DB_OPERATION), "get")))));
-  }
-
-  private static List<AttributeAssertion> withErrorType(
-      String errorType, AttributeAssertion... assertions) {
-    List<AttributeAssertion> list = new ArrayList<>(Arrays.asList(assertions));
-
-    if (SemconvStability.emitStableDatabaseSemconv()) {
-      list.add(equalTo(ERROR_TYPE, errorType));
-    }
-    return list;
+                            equalTo(
+                                ERROR_TYPE,
+                                SemconvStability.emitStableDatabaseSemconv()
+                                    ? "net.spy.memcached.internal.CheckedOperationTimeoutException"
+                                    : null),
+                            equalTo(
+                                maybeStable(DB_SYSTEM),
+                                DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
+                            equalTo(maybeStable(DB_OPERATION), "get"))));
   }
 
   @Test
@@ -896,12 +886,15 @@ void decrException() {
                         .hasException(
                             new IllegalArgumentException("Key is too long (maxlen = 250)"))
                         .hasAttributesSatisfyingExactly(
-                            withErrorType(
-                                "java.lang.IllegalArgumentException",
-                                equalTo(
-                                    maybeStable(DB_SYSTEM),
-                                    DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
-                                equalTo(maybeStable(DB_OPERATION), "decr")))));
+                            equalTo(
+                                ERROR_TYPE,
+                                SemconvStability.emitStableDatabaseSemconv()
+                                    ? "java.lang.IllegalArgumentException"
+                                    : null),
+                            equalTo(
+                                maybeStable(DB_SYSTEM),
+                                DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
+                            equalTo(maybeStable(DB_OPERATION), "decr"))));
   }
 
   @Test
@@ -984,12 +977,15 @@ void incrException() {
                         .hasException(
                             new IllegalArgumentException("Key is too long (maxlen = 250)"))
                         .hasAttributesSatisfyingExactly(
-                            withErrorType(
-                                "java.lang.IllegalArgumentException",
-                                equalTo(
-                                    maybeStable(DB_SYSTEM),
-                                    DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
-                                equalTo(maybeStable(DB_OPERATION), "incr")))));
+                            equalTo(
+                                ERROR_TYPE,
+                                SemconvStability.emitStableDatabaseSemconv()
+                                    ? "java.lang.IllegalArgumentException"
+                                    : null),
+                            equalTo(
+                                maybeStable(DB_SYSTEM),
+                                DbIncubatingAttributes.DbSystemIncubatingValues.MEMCACHED),
+                            equalTo(maybeStable(DB_OPERATION), "incr"))));
   }
 
   private static String key(String k) {