dynamodb: removing reference to field only available in newer versions of the sdk (#2118)

Author: meiao

instrumentation/aws-java-sdk-dynamodb-2.15.34/src/main/java/com/nr/instrumentation/dynamodb_v2/DynamoDBMetricUtil.java

@@ -7,7 +7,6 @@
 import com.newrelic.api.agent.NewRelic;
 import com.newrelic.api.agent.TracedMethod;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
-import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.regions.Region;
@@ -58,7 +57,7 @@ static String getArn(String tableName, Object sdkClient, SdkClientConfiguration
             return null;
         }
 
-        String region = findRegion(clientConfiguration, host);
+        String region = findRegion(clientConfiguration);
         if (region == null) {
             NewRelic.getAgent().getLogger().log(Level.FINEST, "Unable to assemble ARN. Region is null.");
             return null;
@@ -69,19 +68,11 @@ static String getArn(String tableName, Object sdkClient, SdkClientConfiguration
     }
 
     // visible for testing
-    static String findRegion(SdkClientConfiguration clientConfig, String host) {
-        Boolean endpointOverridden = clientConfig.option(SdkClientOption.ENDPOINT_OVERRIDDEN);
-        if (endpointOverridden == Boolean.TRUE) { // endpointOverridden could be null
-            Region dynamodb = AwsHostNameUtils.parseSigningRegion(host, "dynamodb").orElse(null);
-            return dynamodb == null ? null : dynamodb.id();
-        }
-
+    static String findRegion(SdkClientConfiguration clientConfig) {
+        // it is possible to specify an endpoint, and it may not match the region of the client
+        // unfortunately early versions of the v2 SDK do not provide info when that happens
         Region awsRegion = clientConfig.option(AwsClientOption.AWS_REGION);
-        if (awsRegion != null) {
-            return awsRegion.id();
-        }
-
-        return null;
+        return awsRegion == null ? null : awsRegion.id();
     }
 
     private static Integer getPort(URI endpoint) {

instrumentation/aws-java-sdk-dynamodb-2.15.34/src/test/java/com/nr/instrumentation/dynamodb_v2/DynamoDBMetricUtilTest.java

@@ -46,32 +46,18 @@ public void tearDown() {
     }
 
     @Test
-    public void testFindRegion_fromRegion() {
-        String host = "dynamodb.us-west-2.amazonaws.com";
+    public void testFindRegion() {
         SdkClientConfiguration clientConfig = SdkClientConfiguration.builder()
                 .option(AwsClientOption.AWS_REGION, Region.US_WEST_2)
-                .option(SdkClientOption.ENDPOINT, URI.create("https://" + host))
                 .build();
-        assertEquals("us-west-2", DynamoDBMetricUtil.findRegion(clientConfig, host));
-    }
-
-    @Test
-    public void testFindRegion_fromEndpoint() {
-        String host = "dynamodb.ap-east-1.amazonaws.com";
-        SdkClientConfiguration clientConfig = SdkClientConfiguration.builder()
-                .option(AwsClientOption.AWS_REGION, Region.US_WEST_2)
-                .option(SdkClientOption.ENDPOINT, URI.create("https://" + host))
-                .option(SdkClientOption.ENDPOINT_OVERRIDDEN, Boolean.TRUE)
-                .build();
-        assertEquals("ap-east-1", DynamoDBMetricUtil.findRegion(clientConfig, host));
+        assertEquals("us-west-2", DynamoDBMetricUtil.findRegion(clientConfig));
     }
 
     @Test
     public void testFindRegion_fail() {
         SdkClientConfiguration clientConfig = SdkClientConfiguration.builder()
                 .build();
-        String host = null;
-        assertNull(DynamoDBMetricUtil.findRegion(clientConfig, host));
+        assertNull(DynamoDBMetricUtil.findRegion(clientConfig));
     }