Merge branch 'trunk' into fedcm

Author: pujagani

.github/workflows/bazel.yml

@@ -82,6 +82,9 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
+      - name: Pull latest changes
+        if: startsWith(github.head_ref, 'renovate/')
+        run: git pull origin ${{ github.head_ref }}
       - name: Free space
         if: inputs.os != 'windows'
         run: ./scripts/github-actions/free-disk-space.sh

.github/workflows/ci-rbe.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   format:
     name: Format
-    if: github.repository_owner == 'seleniumhq'
+    if: github.repository_owner == 'seleniumhq' && startsWith(github.head_ref, 'renovate/') != true
     uses: ./.github/workflows/bazel.yml
     with:
       name: Check format script run
@@ -20,7 +20,7 @@ jobs:
 
   test:
     name: Test
-    if: github.repository_owner == 'seleniumhq'
+    if: github.repository_owner == 'seleniumhq' && startsWith(github.head_ref, 'renovate/') != true
     uses: ./.github/workflows/bazel.yml
     with:
       name: All RBE tests

.github/workflows/ci-renovate-rbe.yml

@@ -0,0 +1,61 @@
+name: CI - Renovate - RBE
+
+on:
+  push:
+    branches:
+      - renovate/*
+  workflow_dispatch:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'seleniumhq'
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: java - repin dependencies
+        if: contains(join(github.event.commits.*.message), '[java]')
+        run: REPIN=1 bazel run @maven//:pin
+      - name: rust - repin dependencies
+        if: contains(join(github.event.commits.*.message), '[rust]')
+        run: CARGO_BAZEL_REPIN=true bazel sync --only=crates
+      - name: js - repin dependencies
+        if: contains(join(github.event.commits.*.message), '[js]')
+        run: bazel run -- @pnpm//:pnpm install --dir $PWD --lockfile-only
+      - name: dotnet - repin dependencies
+        if: contains(join(github.event.commits.*.message), '[dotnet]')
+        run: ./dotnet/update-deps.sh
+      - name: py - repin dependencies
+        if: contains(join(github.event.commits.*.message), '[py]')
+        run: bazel run //py:requirements.update
+      - name: Commit files
+        run: |
+          export CHANGES=$(git status -s)
+          if [ -n "$CHANGES" ]; then
+            git config --local user.email "[email protected]"
+            git config --local user.name "Selenium CI Bot"
+            git add .
+            git commit -m 'Repin dependencies'
+            git push
+          fi
+
+  check-format:
+    needs: format
+    name: Check format
+    if: github.repository_owner == 'seleniumhq'
+    uses: ./.github/workflows/bazel.yml
+    with:
+      name: Check format script run
+      caching: false
+      ruby-version: jruby-9.4.8.0
+      run: ./scripts/github-actions/check-format.sh
+
+  test:
+    name: Test
+    if: github.repository_owner == 'seleniumhq'
+    uses: ./.github/workflows/bazel.yml
+    with:
+      name: All RBE tests
+      caching: false
+      ruby-version: jruby-9.4.8.0
+      run: ./scripts/github-actions/ci-build.sh

dotnet/src/webdriver/SessionId.cs

@@ -17,22 +17,27 @@
 // under the License.
 // </copyright>
 
+using System;
+
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
     /// Provides a mechanism for maintaining a session for a test
     /// </summary>
     public class SessionId
     {
-        private string sessionOpaqueKey;
+        private readonly string sessionOpaqueKey;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SessionId"/> class
         /// </summary>
         /// <param name="opaqueKey">Key for the session in use</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="opaqueKey"/> is <see langword="null"/>.</exception>
         public SessionId(string opaqueKey)
         {
-            this.sessionOpaqueKey = opaqueKey;
+            this.sessionOpaqueKey = opaqueKey ?? throw new ArgumentNullException(nameof(opaqueKey));
         }
 
         /// <summary>
@@ -54,20 +59,13 @@ public override int GetHashCode()
         }
 
         /// <summary>
-        /// Compares two Sessions
+        /// Indicates whether the current session ID value is the same as <paramref name="obj"/>.
         /// </summary>
-        /// <param name="obj">Session to compare</param>
-        /// <returns>True if they are equal or False if they are not</returns>
-        public override bool Equals(object obj)
+        /// <param name="obj">The session to compare to.</param>
+        /// <returns><see langword="true"/> if the values are equal; otherwise, <see langword="false"/>.</returns>
+        public override bool Equals(object? obj)
         {
-            bool objectsAreEqual = false;
-            SessionId other = obj as SessionId;
-            if (other != null)
-            {
-                objectsAreEqual = this.sessionOpaqueKey.Equals(other.sessionOpaqueKey);
-            }
-
-            return objectsAreEqual;
+            return obj is SessionId otherSession && this.sessionOpaqueKey.Equals(otherSession.sessionOpaqueKey);
         }
     }
 }

dotnet/src/webdriver/WebDriver.cs

@@ -24,6 +24,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Threading.Tasks;
 
@@ -44,7 +45,7 @@ public class WebDriver : IWebDriver, ISearchContext, IJavaScriptExecutor, IFinds
         private IFileDetector fileDetector = new DefaultFileDetector();
         private NetworkManager network;
         private WebElementFactory elementFactory;
-        private SessionId sessionId;
+
         private List<string> registeredCommands = new List<string>();
 
         /// <summary>
@@ -191,10 +192,7 @@ public bool IsActionExecutor
         /// <summary>
         /// Gets the <see cref="SessionId"/> for the current session of this driver.
         /// </summary>
-        public SessionId SessionId
-        {
-            get { return this.sessionId; }
-        }
+        public SessionId SessionId { get; private set; }
 
         /// <summary>
         /// Gets or sets the <see cref="IFileDetector"/> responsible for detecting
@@ -612,7 +610,7 @@ protected virtual Response Execute(string driverCommandToExecute,
         /// <returns>A <see cref="Response"/> containing information about the success or failure of the command and any data returned by the command.</returns>
         protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string, object> parameters)
         {
-            Command commandToExecute = new Command(this.sessionId, driverCommandToExecute, parameters);
+            Command commandToExecute = new Command(SessionId, driverCommandToExecute, parameters);
 
             Response commandResponse;
 
@@ -641,6 +639,7 @@ protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecut
         /// Starts a session with the driver
         /// </summary>
         /// <param name="capabilities">Capabilities of the browser</param>
+        [MemberNotNull(nameof(SessionId))]
         protected void StartSession(ICapabilities capabilities)
         {
             Dictionary<string, object> parameters = new Dictionary<string, object>();
@@ -679,7 +678,9 @@ protected void StartSession(ICapabilities capabilities)
 
             ReturnedCapabilities returnedCapabilities = new ReturnedCapabilities(rawCapabilities);
             this.capabilities = returnedCapabilities;
-            this.sessionId = new SessionId(response.SessionId);
+
+            string sessionId = response.SessionId ?? throw new WebDriverException($"The remote end did not respond with ID of a session when it was required. {response.Value}");
+            this.SessionId = new SessionId(sessionId);
         }
 
         /// <summary>
@@ -723,7 +724,7 @@ protected virtual void Dispose(bool disposing)
         {
             try
             {
-                if (this.sessionId is not null)
+                if (this.SessionId is not null)
                 {
                     this.Execute(DriverCommand.Quit, null);
                 }
@@ -739,7 +740,7 @@ protected virtual void Dispose(bool disposing)
             }
             finally
             {
-                this.sessionId = null;
+                this.SessionId = null;
             }
             this.executor.Dispose();
         }

dotnet/test/common/DevTools/DevToolsProfilerTest.cs

@@ -131,12 +131,12 @@ private void ValidateProfile(CurrentCdpVersion.Profiler.Profile profiler)
         {
             Assert.That(profiler, Is.Not.Null);
             Assert.That(profiler.Nodes, Is.Not.Null);
-            Assert.That(profiler.StartTime, Is.Not.Null);
-            Assert.That(profiler.EndTime, Is.Not.Null);
+            Assert.That(profiler.StartTime, Is.Not.Zero);
+            Assert.That(profiler.EndTime, Is.Not.Zero);
             Assert.That(profiler.TimeDeltas, Is.Not.Null);
             foreach (var delta in profiler.TimeDeltas)
             {
-                Assert.That(delta, Is.Not.Null);
+                Assert.That(delta, Is.Not.Zero);
             }
 
             foreach (var node in profiler.Nodes)

dotnet/test/common/DevTools/DevToolsTestFixture.cs

@@ -39,7 +39,7 @@ public void Setup()
             devTools = driver as IDevTools;
             if (devTools == null)
             {
-                Assert.Ignore("{0} does not support Chrome DevTools Protocol", EnvironmentManager.Instance.Browser);
+                Assert.Ignore($"{EnvironmentManager.Instance.Browser} does not support Chrome DevTools Protocol");
                 return;
             }
 

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);
+  }
 }

renovate.json

@@ -1,36 +1,82 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended"],
-  "labels": ["dependencies"],
   "packageRules": [
     {
-      "matchPackageNames": ["bazel", "bazelisk"],
-      "commitMessageSuffix": "[dotnet][java][js][py][rb][rust]"
+      "matchManagers": [ "bazel", "bazel-module", "bazelisk" ],
+      "matchPackageNames": [ "!rules_java", "!rules_jvm_external", "!contrib_rules_jvm", "!rules_dotnet", "!aspect_rules_js", "!aspect_rules_ts", "!rules_nodejs", "!rules_python", "!rules_ruby", "!rules_cc" ],
+      "matchDatasources": [ "!maven" ],
+      "commitMessagePrefix": "[dotnet][java][js][py][rb][rust]",
+      "labels": [ "dependencies", "c-build" ]
     },
     {
-      "matchPackageNames": ["nuget"],
-      "commitMessagePrefix": "[dotnet]"
+      "matchManagers": [ "nuget" ],
+      "commitMessagePrefix": "[dotnet]",
+      "labels": [ "dependencies", "c-dotnet" ]
     },
     {
-      "matchPackageNames": ["maven"],
-      "commitMessagePrefix": "[java]"
+      "matchPackageNames": [ "rules_dotnet" ],
+      "commitMessagePrefix": "[dotnet]",
+      "labels": [ "dependencies", "c-dotnet" ]
     },
     {
-      "matchPackageNames": ["npm"],
-      "commitMessagePrefix": "[js]"
+      "matchManagers": [ "bazel", "bazel-module" ],
+      "matchDatasources": ["maven"],
+      "versioning": "maven",
+      "commitMessagePrefix": "[java]",
+      "labels": [ "dependencies", "c-java" ]
     },
     {
-      "matchPackageNames": ["pip_requirements"],
-      "commitMessagePrefix": "[py]"
+      "matchManagers": [ "bazel-module" ],
+      "matchPackageNames": [ "rules_java", "rules_jvm_external", "contrib_rules_jvm" ],
+      "commitMessagePrefix": "[java]",
+      "labels": [ "dependencies", "c-java" ]
     },
     {
-      "matchPackageNames": ["bundler", "ruby-version"],
-      "commitMessagePrefix": "[rb]"
+      "matchManagers": [ "maven" ],
+      "commitMessagePrefix": "[java]",
+      "labels": [ "dependencies", "c-java" ]
     },
     {
-      "matchPackageNames": ["cargo"],
-      "commitMessagePrefix": "[rust]"
+      "matchManagers": [ "npm" ],
+      "commitMessagePrefix": "[js]",
+      "labels": [ "dependencies", "c-nodejs" ]
+    },
+    {
+      "matchPackageNames": [ "aspect_rules_js", "aspect_rules_ts", "rules_nodejs" ],
+      "commitMessagePrefix": "[js]",
+      "labels": [ "dependencies", "c-nodejs" ]
+    },
+    {
+      "matchManagers": [ "pip_requirements", "pip_setup" ],
+      "commitMessagePrefix": "[py]",
+      "labels": [ "dependencies", "c-py" ]
+    },
+    {
+      "matchPackageNames": [ "rules_python" ],
+      "commitMessagePrefix": "[py]",
+      "labels": [ "dependencies", "c-py" ]
+    },
+    {
+      "matchManagers": [ "bundler", "ruby-version" ],
+      "commitMessagePrefix": "[rb]",
+      "labels": [ "dependencies", "c-rb" ]
+    },
+    {
+      "matchPackageNames": [ "rules_ruby" ],
+      "commitMessagePrefix": "[rb]",
+      "labels": [ "dependencies", "c-rb" ]
+    },
+    {
+      "matchManagers": [ "cargo" ],
+      "commitMessagePrefix": "[rust]",
+      "labels": [ "dependencies", "c-rust" ]
+    },
+    {
+      "matchPackageNames": [ "rules_cc" ],
+      "commitMessagePrefix": "[rust]",
+      "labels": [ "dependencies", "c-rust" ]
     }
   ],
-  "prConcurrentLimit": 5
+  "prConcurrentLimit": 10
 }