Add scenarios with parameters without values

Author: jeanbisutti

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractor.java

@@ -173,7 +173,7 @@ private static String redactQueryParameters(String url) {
     StringBuilder redactedParameters = new StringBuilder();
     boolean inRedactedParamValue =
         false; // To be able to skip the characters of the parameters to redact
-    boolean inParamValue = false;
+    boolean paramWithValue = false;
 
     // To build a parameter name until we reach the '=' character
     // If the parameter name is a one to redact, we will redact the value
@@ -182,24 +182,34 @@ private static String redactQueryParameters(String url) {
     for (int i = questionMarkIndex + 1; i < url.length(); i++) {
       char currentChar = url.charAt(i);
       if (currentChar == '=') {
-        inParamValue = true;
+        paramWithValue = true;
         redactedParameters.append(currentParamName);
         redactedParameters.append('=');
         if (PARAMS_TO_REDACT.contains(currentParamName.toString())) {
           redactedParameters.append("REDACTED");
           inRedactedParamValue = true;
         }
       } else if (currentChar == '&') { // New parameter delimiter
+        if (!paramWithValue) { // Example: https://service.com?AWSAccessKeyId=AKIAIOSFODNN7&ab
+          redactedParameters.append(currentParamName);
+        }
         redactedParameters.append('&');
-        inParamValue = false;
+        paramWithValue = false;
         inRedactedParamValue = false;
         currentParamName.setLength(
             0); // To avoid creating a new StringBuilder for each new parameter
       } else if (currentChar == '#') { // Reference delimiter
+        if (!paramWithValue) { // Example:
+          // https://service.com?&&AWSAccessKeyId=AKIAIOSFODNN7&a&b#fragment
+          redactedParameters.append(currentParamName);
+        }
         redactedParameters.append(url.substring(i));
         break;
-      } else if (!inParamValue) {
+      } else if (!paramWithValue) {
         currentParamName.append(currentChar);
+        if (i == url.length() - 1) { // Example: https://service.com?AWSAccessKeyId=AKIAIOSFODNN7&ab
+          redactedParameters.append(currentParamName);
+        }
       } else if (!inRedactedParamValue) {
         redactedParameters.append(currentChar);
       }

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpClientAttributesExtractorTest.java

@@ -207,7 +207,7 @@ void normal() {
   }
 
   @ParameterizedTest
-  @ArgumentsSource(StripUrlArgumentSource.class)
+  @ArgumentsSource(UrlSourceToRedact.class)
   void shouldRedactUserInfoAndQueryParameters(String url, String expectedResult) {
     Map<String, String> request = new HashMap<>();
     request.put("urlFull", url);
@@ -223,7 +223,7 @@ void shouldRedactUserInfoAndQueryParameters(String url, String expectedResult) {
     assertThat(attributes.build()).containsOnly(entry(URL_FULL, expectedResult));
   }
 
-  static final class StripUrlArgumentSource implements ArgumentsProvider {
+  static final class UrlSourceToRedact implements ArgumentsProvider {
 
     @Override
     public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
@@ -274,7 +274,22 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
               "https://service.com?AWSAccessKeyId=REDACTED&AWSAccessKeyId=REDACTED"),
           arguments(
               "https://service.com?AWSAccessKeyId=AKIAIOSFODNN7#ref",
-              "https://service.com?AWSAccessKeyId=REDACTED#ref"));
+              "https://service.com?AWSAccessKeyId=REDACTED#ref"),
+          arguments(
+              "https://service.com?AWSAccessKeyId=AKIAIOSFODNN7&aa&bb",
+              "https://service.com?AWSAccessKeyId=REDACTED&aa&bb"),
+          arguments(
+              "https://service.com?aa&bb&AWSAccessKeyId=AKIAIOSFODNN7",
+              "https://service.com?aa&bb&AWSAccessKeyId=REDACTED"),
+          arguments(
+              "https://service.com?AWSAccessKeyId=AKIAIOSFODNN7&&",
+              "https://service.com?AWSAccessKeyId=REDACTED&&"),
+          arguments(
+              "https://service.com?&&AWSAccessKeyId=AKIAIOSFODNN7",
+              "https://service.com?&&AWSAccessKeyId=REDACTED"),
+          arguments(
+              "https://service.com?AWSAccessKeyId=AKIAIOSFODNN7&a&b#fragment",
+              "https://service.com?AWSAccessKeyId=REDACTED&a&b#fragment"));
     }
   }