Merge remote-tracking branch 'origin/trunk' into grid-slot-matcher

Author: VietND96

java/src/org/openqa/selenium/remote/TracedCommandExecutor.java

@@ -37,7 +37,7 @@ public TracedCommandExecutor(CommandExecutor delegate, Tracer tracer) {
 
   @Override
   public Response execute(Command command) throws IOException {
-    try (Span commandSpan = tracer.getCurrentContext().createSpan("command")) {
+    try (Span commandSpan = tracer.getCurrentContext().createSpan(command.getName())) {
       SessionId sessionId = command.getSessionId();
       if (sessionId != null) {
         commandSpan.setAttribute("sessionId", sessionId.toString());

java/test/org/openqa/selenium/remote/TracedCommandExecutorTest.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.remote;
 
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -48,7 +49,7 @@ class TracedCommandExecutorTest {
   public void createMocksAndTracedCommandExecutor() {
     MockitoAnnotations.initMocks(this);
     when(tracer.getCurrentContext()).thenReturn(traceContext);
-    when(traceContext.createSpan("command")).thenReturn(span);
+    when(traceContext.createSpan(anyString())).thenReturn(span);
     tracedCommandExecutor = new TracedCommandExecutor(commandExecutor, tracer);
   }
 
@@ -109,4 +110,18 @@ void canCreateSpanWithCommandName() throws IOException {
     verify(span, times(1)).close();
     verifyNoMoreInteractions(span);
   }
+
+  @Test
+  void canCreateSpanWithCommandNameAsSpanName() throws IOException {
+    SessionId sessionId = new SessionId(UUID.randomUUID());
+    Command command = new Command(sessionId, "findElement");
+
+    tracedCommandExecutor.execute(command);
+
+    verify(traceContext).createSpan("findElement");
+    verify(span).setAttribute("sessionId", sessionId.toString());
+    verify(span).setAttribute("command", "findElement");
+    verify(span).close();
+    verifyNoMoreInteractions(span);
+  }
 }