Fix review comment

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>

Author: VietND96

java/src/org/openqa/selenium/docker/client/CreateContainer.java

@@ -22,6 +22,9 @@
 import static org.openqa.selenium.remote.http.Contents.asJson;
 import static org.openqa.selenium.remote.http.HttpMethod.POST;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -64,8 +67,14 @@ public Container apply(ContainerConfig info) {
 
  // Build the URL with optional name parameter
  String url = String.format("/v%s/containers/create", apiVersion);
- if (info.getName() != null && !info.getName().isEmpty()) {
- url += "?name=" + info.getName();
+ if (info.getName() != null && !info.getName().trim().isEmpty()) {
+ String containerName = info.getName().trim();
+ try {
+ String encodedName = URLEncoder.encode(containerName, StandardCharsets.UTF_8.toString());
+ url += "?name=" + encodedName;
+ } catch (UnsupportedEncodingException e) {
+ throw new DockerException("Failed to encode container name: " + containerName, e);
+ }
  }
 
  HttpResponse res =

java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java

@@ -159,10 +159,17 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
  LOG.info("Starting session for " + sessionRequest.getDesiredCapabilities());
 
  int port = runningInDocker ? 4444 : PortProber.findFreePort();
- // Using timestamp + short UUID to avoid conflicts in concurrent session creation
+ // Generate unique identifier for consistent naming between browser and recorder containers
+ // Using browserName-timestamp-UUID to avoid conflicts in concurrent session creation
+ String browserName = sessionRequest.getDesiredCapabilities().getBrowserName();
+ if (browserName != null && !browserName.isEmpty()) {
+ browserName = browserName.toLowerCase();
+ } else {
+ browserName = "unknown";
+ }
  long timestamp = System.currentTimeMillis();
- String uniqueId = UUID.randomUUID().toString().substring(0, 6);
- String sessionIdentifier = timestamp + "-" + uniqueId;
+ String uniqueId = UUID.randomUUID().toString().substring(0, 8);
+ String sessionIdentifier = String.format("%s-%d-%s", browserName, timestamp, uniqueId);
  try (Span span = tracer.getCurrentContext().createSpan("docker_session_factory.apply")) {
  AttributeMap attributeMap = tracer.createAttributeMap();
  attributeMap.put(AttributeKey.LOGGER_CLASS.getKey(), this.getClass().getName());
@@ -312,8 +319,7 @@ private Container createBrowserContainer(
  long browserContainerShmMemorySize = 2147483648L; // 2GB
 
  // Generate container name: browser-<browserName>-<timestamp>-<uuid>
- String browserName = stereotype.getBrowserName().toLowerCase();
- String containerName = String.format("browser-%s-%s", browserName, sessionIdentifier);
+ String containerName = String.format("browser-%s", sessionIdentifier);
 
  ContainerConfig containerConfig =
  image(browserImage)
@@ -380,8 +386,7 @@ private Container startVideoContainer(
  Map<String, String> volumeBinds = Collections.singletonMap(hostPath, "/videos");
 
  // Generate container name: recorder-<browserName>-<timestamp>-<uuid>
- String browserName = stereotype.getBrowserName().toLowerCase();
- String containerName = String.format("recorder-%s-%s", browserName, sessionIdentifier);
+ String containerName = String.format("recorder-%s", sessionIdentifier);
 
  ContainerConfig containerConfig =
  image(videoImage)