fix(clients): re-enable default http2 session concurrency

kuhe · kuhe · commit dd7f5feae534 · 2026-04-24T13:25:29.000-04:00
diff --git a/clients/client-bedrock-runtime/src/runtimeConfig.ts b/clients/client-bedrock-runtime/src/runtimeConfig.ts
@@ -80,10 +80,7 @@ export const getRuntimeConfig = (config: BedrockRuntimeClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-bedrock-runtime/test/BedrockRuntime.e2e.spec.ts b/clients/client-bedrock-runtime/test/BedrockRuntime.e2e.spec.ts
@@ -1,3 +1,4 @@
+import type { ListAsyncInvokesCommandOutput } from "@aws-sdk/client-bedrock-runtime";
 import { BedrockRuntime } from "@aws-sdk/client-bedrock-runtime";
 import { SignatureV4 } from "@smithy/signature-v4";
 import { toBase64 } from "@smithy/util-base64";
@@ -8,6 +9,9 @@ describe("BedrockRuntime", () => {
   const client = new BedrockRuntime({
     region: "us-west-2",
     credentials: aws?.testCredentials,
+    requestHandler: {
+      maxConcurrentStreams: 3,
+    },
   });
 
   let signerCredentialProviderSpy: any;
@@ -69,6 +73,7 @@ describe("BedrockRuntime", () => {
     const inputEnd = new Promise((r) => {
       resolve = r;
     });
+    const listAsyncInvokesOutputs: ListAsyncInvokesCommandOutput[] = [];
 
     const response = await client.invokeModelWithBidirectionalStream({
       modelId,
@@ -178,6 +183,15 @@ describe("BedrockRuntime", () => {
               },
             };
 
+            // At midpoint, fire parallel requests over the same client
+            // to verify HTTP/2 session concurrency doesn't interfere with the ongoing stream.
+            if (it === 10) {
+              const results = await Promise.all(
+                Array.from({ length: 8 }, () => client.listAsyncInvokes({ maxResults: 1 }))
+              );
+              listAsyncInvokesOutputs.push(...results);
+            }
+
             if (it % 15 === 3) {
               yields.push("contentEnd");
               yield {
@@ -266,6 +280,40 @@ describe("BedrockRuntime", () => {
       "sessionEnd",
     ]);
 
+    // Verify parallel requests completed successfully during the bidirectional stream.
+    expect(listAsyncInvokesOutputs).toHaveLength(8);
+    for (const result of listAsyncInvokesOutputs) {
+      expect(result.$metadata.httpStatusCode).toBe(200);
+    }
+
+    const h2SessionState = (client.config.requestHandler as any).connectionManager?.debug?.();
+    if (h2SessionState) {
+      expect(h2SessionState).toMatchObject({
+        "https://bedrock-runtime.us-west-2.amazonaws.com/": {
+          sessions: [
+            {
+              active: expect.any(Number),
+              id: expect.any(Number),
+              maxConcurrent: 3,
+              totalRequests: 3,
+            },
+            {
+              active: expect.any(Number),
+              id: expect.any(Number),
+              maxConcurrent: 3,
+              totalRequests: 3,
+            },
+            {
+              active: expect.any(Number),
+              id: expect.any(Number),
+              maxConcurrent: 2,
+              totalRequests: 2,
+            },
+          ],
+        },
+      });
+    }
+
     // There are no other response fields currently.
     // Therefore, there is no difference in assertions for WebSocket and HTTP2.
     expect(response.body).toBeDefined();
diff --git a/clients/client-connecthealth/src/runtimeConfig.ts b/clients/client-connecthealth/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: ConnectHealthClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-kinesis/src/runtimeConfig.ts b/clients/client-kinesis/src/runtimeConfig.ts
@@ -53,10 +53,7 @@ export const getRuntimeConfig = (config: KinesisClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-lex-runtime-v2/src/runtimeConfig.ts b/clients/client-lex-runtime-v2/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: LexRuntimeV2ClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-polly/src/runtimeConfig.ts b/clients/client-polly/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: PollyClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-qbusiness/src/runtimeConfig.ts b/clients/client-qbusiness/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: QBusinessClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-sagemaker-runtime-http2/src/runtimeConfig.ts b/clients/client-sagemaker-runtime-http2/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: SageMakerRuntimeHTTP2ClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-transcribe-streaming/src/runtimeConfig.ts b/clients/client-transcribe-streaming/src/runtimeConfig.ts
@@ -55,10 +55,7 @@ export const getRuntimeConfig = (config: TranscribeStreamingClientConfig) => {
         NODE_REGION_CONFIG_OPTIONS,
         {...NODE_REGION_CONFIG_FILE_OPTIONS, ...loaderConfig}
     ),
-    requestHandler: RequestHandler.create(config?.requestHandler ?? (async () => ({
-      ...await defaultConfigProvider(),
-      disableConcurrentStreams: true
-    }))),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
     retryMode:
       config?.retryMode ??
       loadNodeConfig(
diff --git a/clients/client-transcribe-streaming/test/TranscribeStreaming.e2e.spec.ts b/clients/client-transcribe-streaming/test/TranscribeStreaming.e2e.spec.ts
@@ -53,13 +53,49 @@ describe("TranscribeStream client", { retry: 4 }, () => {
 
           expect(result.TranscriptResultStream).toBeDefined();
           const transcripts: any[] = [];
+          let parallelRequestsDone = false;
           for await (const event of result.TranscriptResultStream!) {
             transcripts.push(event);
+
+            // After receiving the first event, fire parallel read requests over the same client
+            // to verify HTTP/2 session concurrency doesn't interfere with the ongoing stream.
+            if (!parallelRequestsDone && transcripts.length === 1 && i === 0) {
+              parallelRequestsDone = true;
+              const results = await Promise.allSettled(
+                Array.from({ length: 3 }, () => client.getMedicalScribeStream({ SessionId: "non-existent-session-id" }))
+              );
+              for (const r of results) {
+                // A rejected request with a service error still proves the HTTP/2 round-trip succeeded
+                // concurrently with the active stream.
+                expect(r.status === "rejected" ? r.reason?.name : r.status).toMatch(/InternalFailure/);
+              }
+            }
           }
 
           expect(transcripts.filter((event) => event["TranscriptEvent"]).length).toBeGreaterThan(0);
         })
       );
+
+      const h2SessionState = (client.config.requestHandler as any).connectionManager?.debug?.();
+      if (h2SessionState) {
+        expect(h2SessionState).toMatchObject({
+          "https://transcribestreaming.us-west-2.amazonaws.com/": {
+            sessions: [
+              {
+                active: expect.any(Number),
+                id: expect.any(Number),
+                maxConcurrent: 3,
+                totalRequests: expect.any(Number),
+              },
+            ],
+          },
+        });
+        expect(
+          h2SessionState["https://transcribestreaming.us-west-2.amazonaws.com/"].sessions
+            .map((s: any) => s.totalRequests)
+            .reduce((a: number, b: number) => a + b, 0)
+        ).toEqual(45);
+      }
     }
   );
 });
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java
@@ -42,11 +42,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                         "RequestHandler",
                         TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER
                     );
-                    writer.openBlock("RequestHandler.create(config?.requestHandler ?? (async () => ({", "})))", () -> {
-                        writer.write("...await defaultConfigProvider(),");
-                        // TODO: remove this when root cause of #3809 is found
-                        writer.write("disableConcurrentStreams: true");
-                    });
+                    writer.write("RequestHandler.create(config?.requestHandler ?? defaultConfigProvider)");
                 });
             default:
                 return Collections.emptyMap();
