@@ -44,7 +44,7 @@ public abstract class NewSessionQueue implements HasReadyState {
 
   public abstract boolean offerFirst(HttpRequest request, RequestId requestId);
 
-  public abstract Optional<HttpRequest> poll();
+  public abstract Optional<HttpRequest> poll(RequestId requestId);
 
   public abstract int clear();
 
// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements.  See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership.  The SFC licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License.  You may obtain a copy of the License at
//
//   http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied.  See the License for the
// specific language governing permissions and limitations
// under the License.

package org.openqa.selenium.grid.sessionqueue;

import org.openqa.selenium.grid.data.RequestId;
import org.openqa.selenium.internal.Require;

import org.openqa.selenium.remote.http.HttpRequest;
import org.openqa.selenium.remote.tracing.Tracer;
import org.openqa.selenium.status.HasReadyState;

import java.time.Duration;
import java.time.Instant;
import java.util.Optional;

public abstract class NewSessionQueue implements HasReadyState {

  protected final Tracer tracer;

  protected final Duration retryInterval;

  protected final Duration requestTimeout;

  public static final String SESSIONREQUEST_TIMESTAMP_HEADER = "new-session-request-timestamp";

  public static final String SESSIONREQUEST_ID_HEADER = "request-id";

  public abstract boolean offerLast(HttpRequest request, RequestId requestId);

  public abstract boolean offerFirst(HttpRequest request, RequestId requestId);

  public abstract Optional<HttpRequest> poll();

  public abstract int clear();

  public void addRequestHeaders(HttpRequest request, RequestId reqId) {
    long timestamp = Instant.now().getEpochSecond();
    request.addHeader(SESSIONREQUEST_TIMESTAMP_HEADER, Long.toString(timestamp));

    request.addHeader(SESSIONREQUEST_ID_HEADER, reqId.toString());
  }

  public boolean hasRequestTimedOut(HttpRequest request) {
    String enqueTimestampStr = request.getHeader(SESSIONREQUEST_TIMESTAMP_HEADER);
    Instant enque = Instant.ofEpochSecond(Long.parseLong(enqueTimestampStr));
    Instant deque = Instant.now();
    Duration duration = Duration.between(enque, deque);

    return duration.compareTo(requestTimeout) > 0;
  }

  public NewSessionQueue(Tracer tracer, Duration retryInterval, Duration requestTimeout) {
    this.tracer = Require.nonNull("Tracer", tracer);
    this.retryInterval = Require.nonNull("Session request retry interval", retryInterval);
    this.requestTimeout = Require.nonNull("Session request timeout", requestTimeout);
  }

}

The expected behaviour for `poll` would be to match what `Deque` does, which is: > Retrieves and removes the head of the queue represented by this deque As such, you shouldn't need the `RequestId` here.