[java] Handle null parameters in TracedCommandExecutor (#10081)

BorisOsipov · diemol · web-flow · commit 07dfc77747d1 · 2021-12-01T15:47:09.000+01:00
Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/java/src/org/openqa/selenium/remote/TracedCommandExecutor.java b/java/src/org/openqa/selenium/remote/TracedCommandExecutor.java
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
 
 public class TracedCommandExecutor implements CommandExecutor {
 
@@ -44,7 +45,7 @@ public Response execute(Command command) throws IOException {
       Map<String, ?> parameters = command.getParameters();
       if (parameters != null && parameters.size() > 0) {
         for (Map.Entry<String, ?> parameter : parameters.entrySet()) {
-          commandSpan.setAttribute("parameter." + parameter.getKey(), parameter.getValue().toString());
+          commandSpan.setAttribute("parameter." + parameter.getKey(), Objects.toString(parameter.getValue(), "null"));
         }
       }
       return delegate.execute(command);
diff --git a/java/test/org/openqa/selenium/remote/TracedCommandExecutorTest.java b/java/test/org/openqa/selenium/remote/TracedCommandExecutorTest.java
@@ -76,6 +76,22 @@ public void canCreateSpanWithAllAttributes() throws IOException {
     verifyNoMoreInteractions(span);
   }
 
+  @Test
+  public void canCreateSpanFromNullParameter() throws IOException {
+    SessionId sessionId = new SessionId(UUID.randomUUID());
+    Map<String, Object> parameters = new HashMap<>();
+    parameters.put("param1", null);
+    Command command = new Command(sessionId, "findElement", parameters);
+
+    tracedCommandExecutor.execute(command);
+
+    verify(span, times(1)).setAttribute("sessionId", sessionId.toString());
+    verify(span, times(1)).setAttribute("command", "findElement");
+    verify(span, times(1)).setAttribute("parameter.param1", "null");
+    verify(span, times(1)).close();
+    verifyNoMoreInteractions(span);
+  }
+
   @Test
   public void canCreateSpanWithSessionIdAndCommandName() throws IOException {
     SessionId sessionId = new SessionId(UUID.randomUUID());

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`import java.io.IOException;`
`24`	`24`	`import java.util.Map;`
	`25`	`+import java.util.Objects;`
`25`	`26`
`26`	`27`	`public class TracedCommandExecutor implements CommandExecutor {`
`27`	`28`
`@@ -44,7 +45,7 @@ public Response execute(Command command) throws IOException {`
`44`	`45`	`Map<String, ?> parameters = command.getParameters();`
`45`	`46`	`if (parameters != null && parameters.size() > 0) {`
`46`	`47`	`for (Map.Entry<String, ?> parameter : parameters.entrySet()) {`
`47`		`- commandSpan.setAttribute("parameter." + parameter.getKey(), parameter.getValue().toString());`
	`48`	`+ commandSpan.setAttribute("parameter." + parameter.getKey(), Objects.toString(parameter.getValue(), "null"));`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`return delegate.execute(command);`