add parameter test

Author: shalk

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java

@@ -55,6 +55,7 @@
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -437,8 +438,9 @@ void redirectToSecuredCopiesAuthHeader() throws Exception {
 
   // TODO: add basic auth scenario
 
-  @Test
-  void errorSpan() {
+  @ParameterizedTest
+  @CsvSource({"/error,500", "/client-error,400"})
+  void errorSpan(String path, int resposeCode) {
     String method = "GET";
     URI uri = resolveAddress("/error");
 
@@ -1029,34 +1031,6 @@ void spanEndsAfterHeadersReceived() throws Exception {
         });
   }
 
-  @Test
-  void requestClientError() throws Exception {
-    assumeTrue(options.getTestClientError());
-
-    URI uri = resolveAddress("/client-error");
-    String method = "GET";
-
-    testing.runWithSpan(
-        "parent",
-        () -> {
-          try {
-            doRequest(method, uri);
-          } catch (Throwable ignored) {
-            // ignored
-          }
-        });
-
-    testing.waitAndAssertTraces(
-        trace ->
-            trace.hasSpansSatisfyingExactly(
-                span -> span.hasName("parent").hasKind(SpanKind.INTERNAL).hasNoParent(),
-                span ->
-                    assertClientSpan(span, uri, method, 400, null)
-                        .hasParent(trace.getSpan(0))
-                        .hasStatus(StatusData.error()),
-                span -> assertServerSpan(span).hasParent(trace.getSpan(1))));
-  }
-
   // Visible for spock bridge.
   SpanDataAssert assertClientSpan(
       SpanDataAssert span,

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestOptions.java

@@ -89,8 +89,6 @@ public boolean isLowLevelInstrumentation() {
 
   public abstract boolean getTestNonStandardHttpMethod();
 
-  public abstract boolean getTestClientError();
-
   public abstract Function<URI, String> getHttpProtocolVersion();
 
   @Nullable
@@ -133,7 +131,6 @@ default Builder withDefaults() {
           .setTestCallbackWithParent(true)
           .setTestErrorWithCallback(true)
           .setTestNonStandardHttpMethod(true)
-          .setTestClientError(true)
           .setHttpProtocolVersion(uri -> "1.1");
     }
 
@@ -177,8 +174,6 @@ default Builder withDefaults() {
 
     Builder setTestNonStandardHttpMethod(boolean value);
 
-    Builder setTestClientError(boolean value);
-
     Builder setHttpProtocolVersion(Function<URI, String> value);
 
     @CanIgnoreReturnValue