URI cache for dynamodb account-id based endpoints

L-Applin · L-Applin · commit 0b0126ef0e1e · 2025-04-25T12:56:04.000-04:00
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
@@ -350,6 +350,11 @@ public class CustomizationConfig {
      */
     private boolean enableFastUnmarshaller;
 
+    /**
+     * A boolean flag to indicate if the code-generated endpoint providers class should cache the calls to URI constructors.
+     */
+    private boolean enableEndpointProviderUriCaching;
+
     private CustomizationConfig() {
     }
 
@@ -924,4 +929,12 @@ public boolean getEnableFastUnmarshaller() {
     public void setEnableFastUnmarshaller(boolean enableFastUnmarshaller) {
         this.enableFastUnmarshaller = enableFastUnmarshaller;
     }
+
+    public boolean getEnableEndpointProviderUriCaching() {
+        return enableEndpointProviderUriCaching;
+    }
+
+    public void setEnableEndpointProviderUriCaching(boolean enableEndpointProviderUriCaching) {
+        this.enableEndpointProviderUriCaching = enableEndpointProviderUriCaching;
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/CodeGeneratorVisitor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/CodeGeneratorVisitor.java
@@ -26,21 +26,25 @@
 import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
 import software.amazon.awssdk.codegen.model.config.customization.KeyTypePair;
 import software.amazon.awssdk.endpoints.Endpoint;
+import software.amazon.awssdk.utils.uri.SdkURI;
 
 public class CodeGeneratorVisitor extends WalkRuleExpressionVisitor {
     private final CodeBlock.Builder builder;
     private final RuleRuntimeTypeMirror typeMirror;
     private final SymbolTable symbolTable;
     private final Map<String, KeyTypePair> knownEndpointAttributes;
+    private final boolean endpointCaching;
 
     public CodeGeneratorVisitor(RuleRuntimeTypeMirror typeMirror,
                                 SymbolTable symbolTable,
                                 Map<String, KeyTypePair> knownEndpointAttributes,
-                                CodeBlock.Builder builder) {
+                                CodeBlock.Builder builder,
+                                boolean endpointCaching) {
         this.builder = builder;
         this.symbolTable = symbolTable;
         this.knownEndpointAttributes = knownEndpointAttributes;
         this.typeMirror = typeMirror;
+        this.endpointCaching = endpointCaching;
     }
 
     @Override
@@ -274,7 +278,11 @@ private void codegenTreeBody(RuleSetExpression expr) {
     @Override
     public Void visitEndpointExpression(EndpointExpression e) {
         builder.add("return $T.endpoint(", typeMirror.rulesResult().type());
-        builder.add("$T.builder().url($T.create(", Endpoint.class, URI.class);
+        if (endpointCaching) {
+            builder.add("$T.builder().url($T.getInstance().create(", Endpoint.class, SdkURI.class);
+        } else {
+            builder.add("$T.builder().url($T.create(", Endpoint.class, URI.class);
+        }
         e.url().accept(this);
         builder.add("))");
         e.headers().accept(this);
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/EndpointProviderSpec2.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules2/EndpointProviderSpec2.java
@@ -222,10 +222,12 @@ private MethodSpec.Builder methodBuilderForRule(RuleSetExpression expr) {
     }
 
     private void codegenExpr(RuleExpression expr, CodeBlock.Builder builder) {
+        boolean useEndpointCaching = intermediateModel.getCustomizationConfig().getEnableEndpointProviderUriCaching();
         CodeGeneratorVisitor visitor = new CodeGeneratorVisitor(typeMirror,
                                                                 utils.symbolTable(),
                                                                 knownEndpointAttributes,
-                                                                builder);
+                                                                builder,
+                                                                useEndpointCaching);
         expr.accept(visitor);
     }
 
diff --git a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverter.java b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverter.java
@@ -36,6 +36,7 @@
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
+import software.amazon.awssdk.utils.uri.SdkURI;
 
 @SdkInternalApi
 public final class CrtHttpRequestConverter {
@@ -77,7 +78,7 @@ public SdkHttpFullRequest crtRequestToHttp(SdkHttpFullRequest inputRequest, Http
             String portString = SdkHttpUtils.isUsingStandardPort(builder.protocol(), builder.port()) ? "" : ":" + builder.port();
             String encodedPath = encodedPathFromCrtFormat(inputRequest.encodedPath(), signedCrtRequest.getEncodedPath());
             String fullUriString = builder.protocol() + "://" + builder.host() + portString + encodedPath;
-            fullUri = new URI(fullUriString);
+            fullUri = SdkURI.getInstance().newURI(fullUriString);
         } catch (URISyntaxException e) {
             return null;
         }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/AwsClientEndpointProvider.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/AwsClientEndpointProvider.java
@@ -38,6 +38,7 @@
 import software.amazon.awssdk.utils.Lazy;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.OptionalUtils;
+import software.amazon.awssdk.utils.uri.SdkURI;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.internal.SystemSettingUtils;
@@ -238,7 +239,7 @@ private Optional<ClientEndpoint> clientEndpointFromServiceMetadata(Builder build
                                                           .region(builder.region)
                                                           .tags(endpointTags)
                                                           .build());
-        URI endpoint = URI.create(builder.protocol + "://" + endpointWithoutProtocol);
+        URI endpoint = SdkURI.getInstance().create(builder.protocol + "://" + endpointWithoutProtocol);
         if (endpoint.getHost() == null) {
             String error = "Configured region (" + builder.region + ") and tags (" + endpointTags + ") resulted in "
                            + "an invalid URI: " + endpoint + ". This is usually caused by an invalid region "
@@ -260,7 +261,7 @@ private Optional<ClientEndpoint> clientEndpointFromServiceMetadata(Builder build
     private Optional<URI> createUri(String source, Optional<String> uri) {
         return uri.map(u -> {
             try {
-                URI parsedUri = new URI(uri.get());
+                URI parsedUri = SdkURI.getInstance().newURI(uri.get());
                 log.trace(() -> "Client endpoint was loaded from the " + source + ": " + parsedUri);
                 return parsedUri;
             } catch (URISyntaxException e) {
diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtHttpRequestConverter.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/crt/internal/util/CrtHttpRequestConverter.java
@@ -31,6 +31,7 @@
 import software.amazon.awssdk.http.auth.aws.crt.internal.io.CrtInputStream;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
+import software.amazon.awssdk.utils.uri.SdkURI;
 
 @SdkInternalApi
 public final class CrtHttpRequestConverter {
@@ -73,7 +74,7 @@ public static SdkHttpRequest toRequest(SdkHttpRequest request, HttpRequest crtRe
             String portString = SdkHttpUtils.isUsingStandardPort(builder.protocol(), builder.port()) ? "" : ":" + builder.port();
             String encodedPath = encodedPathFromCrtFormat(request.encodedPath(), crtRequest.getEncodedPath());
             String fullUriString = builder.protocol() + "://" + builder.host() + portString + encodedPath;
-            fullUri = new URI(fullUriString);
+            fullUri = SdkURI.getInstance().newURI(fullUriString);
         } catch (URISyntaxException e) {
             throw new RuntimeException("Full URI could not be formed.", e);
         }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ServiceMetadataUtils.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ServiceMetadataUtils.java
@@ -23,6 +23,7 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceEndpointKey;
 import software.amazon.awssdk.utils.Pair;
+import software.amazon.awssdk.utils.uri.SdkURI;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.Validate;
 
@@ -38,7 +39,7 @@ public static URI endpointFor(String hostname,
                                   String endpointPrefix,
                                   String region,
                                   String dnsSuffix) {
-        return URI.create(StringUtils.replaceEach(hostname, SEARCH_LIST, new String[] { endpointPrefix, region, dnsSuffix }));
+        return SdkURI.getInstance().create(StringUtils.replaceEach(hostname, SEARCH_LIST, new String[] {endpointPrefix, region, dnsSuffix }));
     }
 
     public static Region signingRegion(ServiceEndpointKey key,
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java
@@ -38,6 +38,7 @@
 import software.amazon.awssdk.metrics.NoOpMetricCollector;
 import software.amazon.awssdk.metrics.SdkMetric;
 import software.amazon.awssdk.utils.Pair;
+import software.amazon.awssdk.utils.uri.SdkURI;
 
 /**
  * Utility methods for working with metrics.
@@ -112,7 +113,8 @@ public static void collectServiceEndpointMetrics(MetricCollector metricCollector
             // Only interested in the service endpoint so don't include any path, query, or fragment component
             URI requestUri = httpRequest.getUri();
             try {
-                URI serviceEndpoint = new URI(requestUri.getScheme(), requestUri.getAuthority(), null, null, null);
+                URI serviceEndpoint = SdkURI.getInstance().newURI(
+                    requestUri.getScheme(), requestUri.getAuthority(), null, null, null);
                 metricCollector.reportMetric(CoreMetric.SERVICE_ENDPOINT, serviceEndpoint);
             } catch (URISyntaxException e) {
                 // This should not happen since getUri() should return a valid URI
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java
@@ -26,6 +26,7 @@
 import java.util.function.BiConsumer;
 import software.amazon.awssdk.annotations.Immutable;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.utils.uri.SdkURI;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
@@ -154,7 +155,7 @@ default URI getUri() {
         // Do not include the port in the URI when using the default port for the protocol.
         String portString = SdkHttpUtils.isUsingStandardPort(protocol(), port()) ? "" : ":" + port();
 
-        return URI.create(protocol() + "://" + host() + portString + encodedPath() + encodedQueryString);
+        return SdkURI.getInstance().create(protocol() + "://" + host() + portString + encodedPath() + encodedQueryString);
     }
 
     /**
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
@@ -40,6 +40,7 @@
 import software.amazon.awssdk.http.apache.internal.ApacheHttpRequestConfig;
 import software.amazon.awssdk.http.apache.internal.RepeatableInputStreamRequestEntity;
 import software.amazon.awssdk.http.apache.internal.utils.ApacheUtils;
+import software.amazon.awssdk.utils.uri.SdkURI;
 import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
@@ -80,7 +81,7 @@ private URI sanitizeUri(SdkHttpRequest request) {
             String portString = SdkHttpUtils.isUsingStandardPort(protocol, port) ?
                                 "" : ":" + port;
 
-            return URI.create(protocol + "://" + request.host() + portString + newPath + encodedQueryString);
+            return SdkURI.getInstance().create(protocol + "://" + request.host() + portString + newPath + encodedQueryString);
         }
 
         return request.getUri();
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientBase.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientBase.java
@@ -44,6 +44,7 @@
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
+import software.amazon.awssdk.utils.uri.SdkURI;
 
 /**
  * Common functionality and configuration for the CRT Http clients.
@@ -162,8 +163,8 @@ HttpClientConnectionManager getOrCreateConnectionPool(URI uri) {
     }
 
     URI poolKey(SdkHttpRequest sdkRequest) {
-        return invokeSafely(() -> new URI(sdkRequest.protocol(), null, sdkRequest.host(),
-                                          sdkRequest.port(), null, null, null));
+        return invokeSafely(() -> SdkURI.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
+                                                              sdkRequest.port(), null, null, null));
     }
 
     @Override
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
@@ -59,6 +59,7 @@
 import software.amazon.awssdk.http.nio.netty.internal.utils.NettyClientLogger;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.Either;
+import software.amazon.awssdk.utils.uri.SdkURI;
 import software.amazon.awssdk.utils.Validate;
 
 /**
@@ -169,8 +170,8 @@ private SdkEventLoopGroup eventLoopGroup(DefaultBuilder builder) {
     }
 
     private static URI poolKey(SdkHttpRequest sdkRequest) {
-        return invokeSafely(() -> new URI(sdkRequest.protocol(), null, sdkRequest.host(),
-                                          sdkRequest.port(), null, null, null));
+        return invokeSafely(() -> SdkURI.getInstance().newURI(sdkRequest.protocol(), null, sdkRequest.host(),
+                                                              sdkRequest.port(), null, null, null));
     }
 
     private SslProvider resolveSslProvider(DefaultBuilder builder) {
diff --git a/services/dynamodb/src/main/resources/codegen-resources/dynamodb/customization.config b/services/dynamodb/src/main/resources/codegen-resources/dynamodb/customization.config
@@ -36,5 +36,6 @@
   "customRetryStrategy" : "software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy",
   "enableEndpointDiscoveryMethodRequired": true,
   "enableGenerateCompiledEndpointRules": true,
-  "enableFastUnmarshaller": false
+  "enableFastUnmarshaller": false,
+  "enableEndpointProviderUriCaching": true
 }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/cache/lru/LruCache.java b/utils/src/main/java/software/amazon/awssdk/utils/cache/lru/LruCache.java
@@ -168,6 +168,10 @@ public int size() {
         return cache.size();
     }
 
+    public boolean contains(K key) {
+        return cache.containsKey(key);
+    }
+
     public static <K, V> LruCache.Builder<K, V> builder(Function<K, V> supplier) {
         return new Builder<>(supplier);
     }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/uri/SdkURI.java b/utils/src/main/java/software/amazon/awssdk/utils/uri/SdkURI.java
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/uri/internal/UriConstructorArgs.java b/utils/src/main/java/software/amazon/awssdk/utils/uri/internal/UriConstructorArgs.java
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/SdkURITest.java b/utils/src/test/java/software/amazon/awssdk/utils/SdkURITest.java

Original file line number	Diff line number	Diff line change
`@@ -222,10 +222,12 @@ private MethodSpec.Builder methodBuilderForRule(RuleSetExpression expr) {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`private void codegenExpr(RuleExpression expr, CodeBlock.Builder builder) {`
	`225`	`+ boolean useEndpointCaching = intermediateModel.getCustomizationConfig().getEnableEndpointProviderUriCaching();`
`225`	`226`	`CodeGeneratorVisitor visitor = new CodeGeneratorVisitor(typeMirror,`
`226`	`227`	`utils.symbolTable(),`
`227`	`228`	`knownEndpointAttributes,`
`228`		`- builder);`
	`229`	`+ builder,`
	`230`	`+ useEndpointCaching);`
`229`	`231`	`expr.accept(visitor);`
`230`	`232`	`}`
`231`	`233`