Skip to content

fix(clients): create new session for every H2 requests #3810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2022
Merged

fix(clients): create new session for every H2 requests #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc5958b
fix(clients): create new session for every H2 requests
AllanZhengYP Jul 20, 2022
e31200f
chore: fix java style check
AllanZhengYP Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion clients/client-kinesis/src/runtimeConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export const getRuntimeConfig = (config: KinesisClientConfig) => {
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
requestHandler:
config?.requestHandler ??
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
retryMode:
config?.retryMode ??
loadNodeConfig({
Expand Down
4 changes: 3 additions & 1 deletion clients/client-lex-runtime-v2/src/runtimeConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: LexRuntimeV2ClientConfig) => {
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
requestHandler: config?.requestHandler ?? new RequestHandler(defaultConfigProvider),
requestHandler:
config?.requestHandler ??
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
retryMode:
config?.retryMode ??
loadNodeConfig({
Expand Down
6 changes: 4 additions & 2 deletions clients/client-transcribe-streaming/src/runtimeConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
NODE_RETRY_MODE_CONFIG_OPTIONS,
} from "@aws-sdk/middleware-retry";
import { loadConfig as loadNodeConfig } from "@aws-sdk/node-config-provider";
import { NodeHttp2Handler, streamCollector } from "@aws-sdk/node-http-handler";
import { NodeHttp2Handler as RequestHandler, streamCollector } from "@aws-sdk/node-http-handler";
import { fromBase64, toBase64 } from "@aws-sdk/util-base64-node";
import { calculateBodyLength } from "@aws-sdk/util-body-length-node";
import { defaultUserAgent } from "@aws-sdk/util-user-agent-node";
Expand Down Expand Up @@ -55,7 +55,9 @@ export const getRuntimeConfig = (config: TranscribeStreamingClientConfig) => {
eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS),
region: config?.region ?? loadNodeConfig(NODE_REGION_CONFIG_OPTIONS, NODE_REGION_CONFIG_FILE_OPTIONS),
requestHandler: config?.requestHandler ?? new NodeHttp2Handler({ disableConcurrentStreams: true }),
requestHandler:
config?.requestHandler ??
new RequestHandler(async () => ({ ...(await defaultConfigProvider()), disableConcurrentStreams: true })),
retryMode:
config?.retryMode ??
loadNodeConfig({
Expand Down
6 changes: 5 additions & 1 deletion ...degen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddHttp2Dependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
writer.addImport("NodeHttp2Handler", "RequestHandler",
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
writer.write("new RequestHandler(defaultConfigProvider)");
writer.openBlock("new RequestHandler(async () => ({", "}))", () -> {
writer.write("...await defaultConfigProvider(),");
// TODO: remove this when root cause of #3809 is found
writer.write("disableConcurrentStreams: true");
});
});
default:
return Collections.emptyMap();
Expand Down
9 changes: 0 additions & 9 deletions .../java/software/amazon/smithy/aws/typescript/codegen/AddTranscribeStreamingDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.typescript.codegen.LanguageTarget;
import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
Expand Down Expand Up @@ -77,14 +76,6 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
});

switch (target) {
case NODE:
return MapUtils.of(
"requestHandler", writer -> {
writer.addDependency(TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER);
writer.addImport("NodeHttp2Handler", "NodeHttp2Handler",
TypeScriptDependency.AWS_SDK_NODE_HTTP_HANDLER.packageName);
writer.write("new NodeHttp2Handler({ disableConcurrentStreams: true })");
});
case REACT_NATIVE:
case BROWSER:
return transcribeStreamingHandlerConfig;
Expand Down