Skip to content

Commit b2c026f

Browse files
authored
fix(clients): create new session for every H2 requests (#3810)
* fix(clients): create new session for every H2 requests * chore: fix java style check
1 parent 91454a9 commit b2c026f

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

clients/client-kinesis/src/runtimeConfig.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ export const getRuntimeConfig = (config: KinesisClientConfig) => {
5353
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
5454
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
5555
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
56-
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
56+
requestHandler:
57+
config?.requestHandler ??
58+
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
5759
retryMode:
5860
config?.retryMode ??
5961
loadNodeConfig({

clients/client-lex-runtime-v2/src/runtimeConfig.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: LexRuntimeV2ClientConfig) => {
5555
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
5656
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
5757
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
58-
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
58+
requestHandler:
59+
config?.requestHandler ??
60+
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
5961
retryMode:
6062
config?.retryMode ??
6163
loadNodeConfig({

clients/client-transcribe-streaming/src/runtimeConfig.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
NODE_RETRY_MODE_CONFIG_OPTIONS,
2020
} from "@aws-sdk/middleware-retry";
2121
import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
22-
import { NodeHttp2Handler, streamCollector } from "@aws-sdk/node-http-handler";
22+
import { NodeHttp2Handler as RequestHandler, streamCollector } from "@aws-sdk/node-http-handler";
2323
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
2424
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
2525
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
@@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: TranscribeStreamingClientConfig) => {
5555
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
5656
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
5757
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
58-
requestHandler: config?.requestHandler ?? new NodeHttp2Handler({ disableConcurrentStreams: true }),
58+
requestHandler:
59+
config?.requestHandler ??
60+
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
5961
retryMode:
6062
config?.retryMode ??
6163
loadNodeConfig({

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
4949
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
5050
writer.addImport("NodeHttp2Handler", "RequestHandler",
5151
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
52-
writer.write("new RequestHandler(defaultConfigProvider)");
52+
writer.openBlock("new RequestHandler(async () => ({", "}))", () -> {
53+
writer.write("...await defaultConfigProvider(),");
54+
// TODO: remove this when root cause of #3809 is found
55+
writer.write("disableConcurrentStreams: true");
56+
});
5357
});
5458
default:
5559
return Collections.emptyMap();

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddTranscribeStreamingDependency.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import software.amazon.smithy.model.Model;
2525
import software.amazon.smithy.model.shapes.ServiceShape;
2626
import software.amazon.smithy.typescript.codegen.LanguageTarget;
27-
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
2827
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
2928
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
3029
import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
@@ -77,14 +76,6 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
7776
});
7877

7978
switch (target) {
80-
case NODE:
81-
return MapUtils.of(
82-
"requestHandler", writer -> {
83-
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
84-
writer.addImport("NodeHttp2Handler", "NodeHttp2Handler",
85-
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
86-
writer.write("new NodeHttp2Handler({ disableConcurrentStreams: true })");
87-
});
8879
case REACT_NATIVE:
8980
case BROWSER:
9081
return transcribeStreamingHandlerConfig;

0 commit comments

Comments
 (0)