diff --git a/agent/lib_aws_sdk_php.c b/agent/lib_aws_sdk_php.c
index 02a0ef4bb..8953d4aa3 100644
--- a/agent/lib_aws_sdk_php.c
+++ b/agent/lib_aws_sdk_php.c
@@ -14,17 +14,16 @@
 #include "fw_hooks.h"
 #include "fw_support.h"
 #include "util_logging.h"
-#include "nr_segment_message.h"
-#include "nr_segment_external.h"
 #include "lib_aws_sdk_php.h"
 
 #define PHP_PACKAGE_NAME "aws/aws-sdk-php"
-#define AWS_LAMBDA_ARN_REGEX "(arn:(aws[a-zA-Z-]*)?:lambda:)?" \
-            "((?<region>[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):)?" \
-            "((?<accountId>\\d{12}):)?" \
-            "(function:)?" \
-            "(?<functionName>[a-zA-Z0-9-\\.]+)" \
-            "(:(?<qualifier>\\$LATEST|[a-zA-Z0-9-]+))?"
+#define AWS_LAMBDA_ARN_REGEX                                      \
+  "(arn:(aws[a-zA-Z-]*)?:lambda:)?"                               \
+  "((?<region>[a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):)?" \
+  "((?<accountId>\\d{12}):)?"                                     \
+  "(function:)?"                                                  \
+  "(?<functionName>[a-zA-Z0-9-\\.]+)"                             \
+  "(:(?<qualifier>\\$LATEST|[a-zA-Z0-9-]+))?"
 
 #if ZEND_MODULE_API_NO >= ZEND_8_1_X_API_NO /* PHP8.1+ */
 /* Service instrumentation only supported above PHP 8.1+*/
@@ -309,9 +308,7 @@ void nr_lib_aws_sdk_php_lambda_handle(nr_segment_t* auto_segment,
   nr_segment_t* external_segment = NULL;
   zval** retval_ptr = NR_GET_RETURN_VALUE_PTR;
 
-  nr_segment_cloud_attrs_t cloud_attrs = {
-      .cloud_platform = "aws_lambda"
-  };
+  nr_segment_cloud_attrs_t cloud_attrs = {.cloud_platform = "aws_lambda"};
 
   if (NULL == auto_segment) {
     return;
@@ -332,7 +329,8 @@ void nr_lib_aws_sdk_php_lambda_handle(nr_segment_t* auto_segment,
   /* Determine if we instrument this command. */
   if (AWS_COMMAND_IS("invoke")) {
     /* reconstruct the ARN */
-    nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_ORIG_ARGS, &cloud_attrs);
+    nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_ORIG_ARGS,
+                                               &cloud_attrs);
   } else {
     return;
   }
@@ -362,7 +360,7 @@ void nr_lib_aws_sdk_php_lambda_handle(nr_segment_t* auto_segment,
       external_params.status = Z_LVAL_P(status_code);
     }
     zval* metadata = nr_php_zend_hash_find(Z_ARRVAL_P(data), "@metadata");
-    if (NULL != metadata  && IS_REFERENCE == Z_TYPE_P(metadata)) {
+    if (NULL != metadata && IS_REFERENCE == Z_TYPE_P(metadata)) {
       metadata = Z_REFVAL_P(metadata);
     }
     if (nr_php_is_zval_valid_array(metadata)) {
@@ -371,14 +369,13 @@ void nr_lib_aws_sdk_php_lambda_handle(nr_segment_t* auto_segment,
         external_params.uri = Z_STRVAL_P(uri);
       }
     }
-    
   }
   nr_segment_external_end(&external_segment, &external_params);
   nr_free(cloud_attrs.cloud_resource_id);
 }
 
-/* This stores the compiled regex to parse AWS ARNs. The compilation happens when
- * it is first needed and is destroyed in mshutdown
+/* This stores the compiled regex to parse AWS ARNs. The compilation happens
+ * when it is first needed and is destroyed in mshutdown
  */
 static nr_regex_t* aws_arn_regex;
 
@@ -390,7 +387,9 @@ void nr_aws_sdk_mshutdown(void) {
   nr_regex_destroy(&aws_arn_regex);
 }
 
-void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_cloud_attrs_t* cloud_attrs) {
+void nr_aws_sdk_lambda_client_invoke_parse_args(
+    NR_EXECUTE_PROTO,
+    nr_segment_cloud_attrs_t* cloud_attrs) {
   zval* call_args = nr_php_get_user_func_arg(2, NR_EXECUTE_ORIG_ARGS);
   zval* this_obj = NR_PHP_USER_FN_THIS();
   char* arn = NULL;
@@ -409,7 +408,8 @@ void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_clo
   if (!nr_php_is_zval_valid_array(lambda_args)) {
     return;
   }
-  zval* lambda_name = nr_php_zend_hash_find(Z_ARRVAL_P(lambda_args), "FunctionName");
+  zval* lambda_name
+      = nr_php_zend_hash_find(Z_ARRVAL_P(lambda_args), "FunctionName");
   if (!nr_php_is_zval_non_empty_string(lambda_name)) {
     return;
   }
@@ -420,10 +420,8 @@ void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_clo
   }
 
   /* Extract all information possible from the passed lambda name via regex */
-  nr_regex_substrings_t* matches =
-      nr_regex_match_capture(aws_arn_regex,
-                             Z_STRVAL_P(lambda_name),
-                             Z_STRLEN_P(lambda_name));
+  nr_regex_substrings_t* matches = nr_regex_match_capture(
+      aws_arn_regex, Z_STRVAL_P(lambda_name), Z_STRLEN_P(lambda_name));
   function_name = nr_regex_substrings_get_named(matches, "functionName");
   accountID = nr_regex_substrings_get_named(matches, "accountId");
   region = nr_regex_substrings_get_named(matches, "region");
@@ -449,11 +447,12 @@ void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_clo
   }
   if (nr_strempty(region)) {
     zend_class_entry* base_class = NULL;
-    if (NULL != execute_data->func && NULL!= execute_data->func->common.scope) {
-       base_class = execute_data->func->common.scope;
+    if (NULL != execute_data->func
+        && NULL != execute_data->func->common.scope) {
+      base_class = execute_data->func->common.scope;
     }
-    region_zval
-      = nr_php_get_zval_object_property_with_class(this_obj, base_class, "region");
+    region_zval = nr_php_get_zval_object_property_with_class(
+        this_obj, base_class, "region");
     if (nr_php_is_zval_valid_string(region_zval)) {
       /*
        * In this case, region is likely to be NULL, but could be an empty
@@ -467,11 +466,11 @@ void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_clo
   if (!nr_strempty(accountID) && !nr_strempty(region)) {
     /* construct the ARN */
     if (!nr_strempty(qualifier)) {
-      arn = nr_formatf("arn:aws:lambda:%s:%s:function:%s:%s",
-                       region, accountID, function_name, qualifier);
+      arn = nr_formatf("arn:aws:lambda:%s:%s:function:%s:%s", region, accountID,
+                       function_name, qualifier);
     } else {
-      arn = nr_formatf("arn:aws:lambda:%s:%s:function:%s",
-                       region, accountID, function_name);
+      arn = nr_formatf("arn:aws:lambda:%s:%s:function:%s", region, accountID,
+                       function_name);
     }
 
     /* Attach the ARN */
@@ -519,6 +518,171 @@ char* nr_lib_aws_sdk_php_get_command_arg_value(char* command_arg_name,
   return command_arg_value;
 }
 
+void nr_lib_aws_sdk_php_dynamodb_set_params(
+    nr_segment_datastore_params_t* datastore_params,
+    nr_segment_cloud_attrs_t* cloud_attrs,
+    NR_EXECUTE_PROTO) {
+  zval* endpoint_zval = NULL;
+  zval* region_zval = NULL;
+  zval* host_zval = NULL;
+  zval* port_zval = NULL;
+  zval* this_obj = NULL;
+  zend_function* func = NULL;
+  zend_class_entry* base_class = NULL;
+  char* table_name = NULL;
+  char* account_id = NULL;
+
+  if (NULL == datastore_params || NULL == cloud_attrs) {
+    return;
+  }
+
+  this_obj = NR_PHP_USER_FN_THIS();
+  func = nr_php_execute_function(NR_EXECUTE_ORIG_ARGS);
+
+  if (NULL == this_obj || NULL == func) {
+    return;
+  }
+
+  if (NULL != func->common.scope) {
+    base_class = func->common.scope;
+
+    region_zval = nr_php_get_zval_object_property_with_class(
+        this_obj, base_class, "region");
+    if (nr_php_is_zval_non_empty_string(region_zval)) {
+      cloud_attrs->cloud_region = Z_STRVAL_P(region_zval);
+    }
+
+    endpoint_zval = nr_php_get_zval_object_property_with_class(
+        this_obj, base_class, "endpoint");
+    if (nr_php_is_zval_valid_object(endpoint_zval)) {
+      host_zval = nr_php_get_zval_object_property(endpoint_zval, "host");
+      if (nr_php_is_zval_non_empty_string(host_zval)) {
+        datastore_params->instance->host = Z_STRVAL_P(host_zval);
+
+        /* Only try to get a port if we have a valid host. */
+        port_zval = nr_php_get_zval_object_property(endpoint_zval, "port");
+        if (nr_php_is_zval_valid_integer(port_zval)) {
+          /* Must be freed by caller */
+          datastore_params->instance->port_path_or_id
+              = nr_formatf(NR_INT64_FMT, Z_LVAL_P(port_zval));
+        } else {
+          /* In case where host was found but port was not, spec says return
+           * unknown for port. */
+          datastore_params->instance->port_path_or_id = nr_strdup("unknown");
+        }
+      }
+    }
+  }
+  if (NULL == datastore_params->instance->host) {
+    /* Unable to retrieve the endpoint, go with AWS defaults. */
+    datastore_params->instance->host = AWS_SDK_PHP_DYNAMODBCLIENT_DEFAULT_HOST;
+    /* Need to strdup because the calling function will free it. */
+    datastore_params->instance->port_path_or_id
+        = nr_strdup(AWS_SDK_PHP_DYNAMODBCLIENT_DEFAULT_PORT);
+  }
+
+  table_name = nr_lib_aws_sdk_php_get_command_arg_value(
+      AWS_SDK_PHP_DYNAMODBCLIENT_TABLENAME_ARG, NR_EXECUTE_ORIG_ARGS);
+  if (!nr_strempty(table_name)) {
+    /* Must be freed by caller */
+    datastore_params->collection = table_name;
+  }
+  if (!nr_strempty(NRINI(aws_account_id))) {
+    account_id = NRINI(aws_account_id);
+  }
+
+  if (NULL != datastore_params->collection && NULL != account_id
+      && NULL != cloud_attrs->cloud_region) {
+    /* Must be freed by caller */
+    cloud_attrs->cloud_resource_id = nr_formatf(
+        "arn:aws:dynamodb:%s:%s:table/%s", cloud_attrs->cloud_region,
+        account_id, datastore_params->collection);
+  }
+}
+
+void nr_lib_aws_sdk_php_dynamodb_handle(nr_segment_t* auto_segment,
+                                        char* command_name_string,
+                                        size_t command_name_len,
+                                        NR_EXECUTE_PROTO) {
+  nr_segment_t* datastore_segment = NULL;
+  nr_segment_cloud_attrs_t cloud_attrs = {0};
+  nr_datastore_instance_t instance = {0};
+  nr_segment_datastore_params_t datastore_params = {
+    .db_system = AWS_SDK_PHP_DYNAMODBCLIENT_DATASTORE_SYSTEM,
+    .datastore = {
+      .type = NR_DATASTORE_DYNAMODB,
+    },
+    .instance = &instance,
+    .callbacks = {
+      .backtrace = nr_php_backtrace_callback,
+    },
+  };
+  if (NULL == auto_segment) {
+    return;
+  }
+
+  if (NULL == command_name_string || 0 == command_name_len) {
+    return;
+  }
+
+#define AWS_COMMAND_IS(CMD) \
+  (command_name_len == (sizeof(CMD) - 1) && nr_streq(CMD, command_name_string))
+
+  /* Determine if we instrument this command. */
+  if (AWS_COMMAND_IS("createTable")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_CREATE_TABLE;
+  } else if (AWS_COMMAND_IS("deleteItem")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_DELETE_ITEM;
+  } else if (AWS_COMMAND_IS("deleteTable")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_DELETE_TABLE;
+  } else if (AWS_COMMAND_IS("getItem")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_GET_ITEM;
+  } else if (AWS_COMMAND_IS("putItem")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_PUT_ITEM;
+  } else if (AWS_COMMAND_IS("query")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_QUERY;
+  } else if (AWS_COMMAND_IS("scan")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_SCAN;
+  } else if (AWS_COMMAND_IS("updateItem")) {
+    datastore_params.operation = AWS_SDK_PHP_DYNAMODBCLIENT_UPDATE_ITEM;
+  } else {
+    /* Nothing to do here so exit. */
+    return;
+  }
+#undef AWS_COMMAND_IS
+
+  /*
+   * nr_lib_aws_sdk_php_dynamodb_set_params sets:
+   * the cloud_attrs->region and cloud_resource_id(needs to be freed)
+   * datastore->instance host and port_path_or_id(needs to be freed)
+   * datastore->collection (needs to be freed)
+   */
+  nr_lib_aws_sdk_php_dynamodb_set_params(&datastore_params, &cloud_attrs,
+                                         NR_EXECUTE_ORIG_ARGS);
+
+  /*
+   * By this point, the datastore params are decoded, grab the parent segment
+   * start time, add the special segment attributes/metrics then close the newly
+   * created segment.
+   */
+  datastore_segment = nr_segment_start(NRPRG(txn), NULL, NULL);
+  if (NULL == datastore_segment) {
+    return;
+  }
+  /* re-use start time from auto_segment started in func_begin */
+  datastore_segment->start_time = auto_segment->start_time;
+  cloud_attrs.aws_operation = command_name_string;
+
+  /* Add cloud attributes, if available. */
+  nr_segment_traces_add_cloud_attributes(datastore_segment, &cloud_attrs);
+
+  /* Now end the instrumented segment as a message segment. */
+  nr_segment_datastore_end(&datastore_segment, &datastore_params);
+  nr_free(datastore_params.collection);
+  nr_free(cloud_attrs.cloud_resource_id);
+  nr_free(instance.port_path_or_id);
+}
+
 /*
  * For Aws/AwsClient::__call see
  * https://github.com/aws/aws-sdk-php/blob/master/src/AwsClientInterface.php
@@ -580,8 +744,12 @@ NR_PHP_WRAPPER(nr_aws_client_call) {
                                   NR_EXECUTE_ORIG_ARGS);
   } else if (AWS_CLASS_IS("Aws\\Lambda\\LambdaClient", "LambdaClient")) {
     nr_lib_aws_sdk_php_lambda_handle(auto_segment, command_name_string,
-                                  Z_STRLEN_P(command_name),
-                                  NR_EXECUTE_ORIG_ARGS);
+                                     Z_STRLEN_P(command_name),
+                                     NR_EXECUTE_ORIG_ARGS);
+  } else if (AWS_CLASS_IS("Aws\\DynamoDb\\DynamoDbClient", "DynamoDbClient")) {
+    nr_lib_aws_sdk_php_dynamodb_handle(auto_segment, command_name_string,
+                                       Z_STRLEN_P(command_name),
+                                       NR_EXECUTE_ORIG_ARGS);
   }
 
 #undef AWS_CLASS_IS
diff --git a/agent/lib_aws_sdk_php.h b/agent/lib_aws_sdk_php.h
index 2e6bfc74c..d71771c05 100644
--- a/agent/lib_aws_sdk_php.h
+++ b/agent/lib_aws_sdk_php.h
@@ -8,6 +8,11 @@
 #define LIB_AWS_SDK_PHP_HDR
 
 #include "nr_segment_message.h"
+#include "nr_segment_external.h"
+#include "nr_datastore_instance.h"
+#include "nr_segment_datastore.h"
+#include "nr_segment_datastore_private.h"
+
 
 #if ZEND_MODULE_API_NO >= ZEND_8_1_X_API_NO /* PHP8.1+ */
 /* Service instrumentation only supported above PHP 8.1+*/
@@ -21,6 +26,24 @@
 #define AWS_QUEUEURL_AWS_POSTFIX "amazonaws.com/"
 #define AWS_QUEUEURL_AWS_POSTFIX_LEN sizeof(AWS_QUEUEURL_AWS_POSTFIX) - 1
 
+/* DynamoDb */
+#define AWS_SDK_PHP_DYNAMODBCLIENT_DATASTORE_SYSTEM "dynamodb"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_TABLENAME_ARG "TableName"
+/* DynamoDb uses a set host then does magic under the hood to resolve the
+ * connection. */
+#define AWS_SDK_PHP_DYNAMODBCLIENT_DEFAULT_HOST "dynamodb.amazonaws.com"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_DEFAULT_PORT "8000"
+/* Spec defined format for the operations so all agents will send consistent
+ * strings. */
+#define AWS_SDK_PHP_DYNAMODBCLIENT_CREATE_TABLE "create_table"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_DELETE_ITEM "delete_item"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_DELETE_TABLE "delete_table"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_GET_ITEM "get_item"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_PUT_ITEM "put_item"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_QUERY "query"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_SCAN "scan"
+#define AWS_SDK_PHP_DYNAMODBCLIENT_UPDATE_ITEM "update_item"
+
 #endif /* PHP 8.1+ */
 
 #define PHP_AWS_SDK_SERVICE_NAME_METRIC_PREFIX \
@@ -87,7 +110,9 @@ extern void nr_lib_aws_sdk_php_sqs_handle(nr_segment_t* segment,
  *
  * Note: The caller is responsible for freeing cloud_attrs->cloud_resource_id
  */
-void nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_PROTO, nr_segment_cloud_attrs_t* cloud_attrs);
+void nr_aws_sdk_lambda_client_invoke_parse_args(
+    NR_EXECUTE_PROTO,
+    nr_segment_cloud_attrs_t* cloud_attrs);
 
 /*
  * Purpose : Handles regex destruction during mshutdown
@@ -111,6 +136,44 @@ void nr_aws_sdk_mshutdown(void);
 extern char* nr_lib_aws_sdk_php_get_command_arg_value(char* command_arg_name,
                                                       NR_EXECUTE_PROTO);
 
+/*
+ * Purpose : Handle when a DynamoDbClient initiates a command
+ *
+ * Params  : 1. segment : end the segment as a datastore segment
+ *           2. command_name_string : the string of the command being called
+ *           3. command_name_len : the length of the command being called
+ *           4. NR_EXECUTE_ORIG_ARGS (execute_data, func_return_value)
+ *
+ * Returns :
+ *
+ */
+extern void nr_lib_aws_sdk_php_dynamodb_handle(nr_segment_t* segment,
+                                               char* command_name_string,
+                                               size_t command_name_len,
+                                               NR_EXECUTE_PROTO);
+
+/*
+ * Purpose : Populate DynamoDbClient datastore_params and cloud_attrs.  This
+ *           will extract region and host/port and set the value in the
+ *           appropriate struct.
+ *
+ *           Note: A host/port other than the AWS DynamoDb default is very
+ *           uncommon and used only for development environments
+ *
+ * Params  : 1. datastore_params : datastore params to modify
+ *           2. cloud_attrs : cloud attributes to modify
+ *           3. NR_EXECUTE_ORIG_ARGS (execute_data, func_return_value)
+ * Returns :
+ * Note: caller is responsible for freeing the cloud_attrs->cloud_resource_id
+ *       and datastore_params->collection and
+ *       datastore_params.instance.port_path_or_id
+ */
+
+extern void nr_lib_aws_sdk_php_dynamodb_set_params(
+    nr_segment_datastore_params_t* datastore_params,
+    nr_segment_cloud_attrs_t* cloud_attrs,
+    NR_EXECUTE_PROTO);
+
 #endif /* PHP8.1+ */
 
 #endif /* LIB_AWS_SDK_PHP_HDR */
diff --git a/agent/tests/test_lib_aws_sdk_php.c b/agent/tests/test_lib_aws_sdk_php.c
index 83c6962a8..4077e9d0c 100644
--- a/agent/tests/test_lib_aws_sdk_php.c
+++ b/agent/tests/test_lib_aws_sdk_php.c
@@ -61,24 +61,83 @@ NR_PHP_WRAPPER(expect_arg_value_null) {
 }
 NR_PHP_WRAPPER_END
 
+NR_PHP_WRAPPER(aws_dynamodb_set_params_wrapper) {
+  (void)wraprec;
+  nr_segment_cloud_attrs_t cloud_attrs = {0};
+  nr_datastore_instance_t instance = {0};
+  nr_segment_datastore_params_t datastore_params = {0};
+  char* expected_string = NULL;
+  char* test_name_string = NULL;
+  zval* test_name = NULL;
+  zval* expected = NULL;
+
+  datastore_params.instance = &instance;
+
+  /*
+   * argument 1 is is used to pass in the test name
+   */
+
+  test_name = nr_php_get_user_func_arg(1, NR_EXECUTE_ORIG_ARGS);
+
+  /*
+   * argument 3 is is used to pass in the expected value
+   */
+
+  expected = nr_php_get_user_func_arg(3, NR_EXECUTE_ORIG_ARGS);
+
+  /*
+   * nr_lib_aws_sdk_php_dynamodb_set_params sets:
+   * the cloud_attrs->region and cloud_resource_id(needs to be freed)
+   * datastore->instance host and port_path_or_id(needs to be freed)
+   * datastore->collection (needs to be freed)
+   */
+  NR_PHP_WRAPPER_CALL;
+  nr_lib_aws_sdk_php_dynamodb_set_params(&datastore_params, &cloud_attrs,
+                                         NR_EXECUTE_ORIG_ARGS);
+
+  char* result_string = nr_formatf(
+      "region:%s cloud_resource_id:%s host:%s port:%s collection:%s",
+      NRSAFESTR(cloud_attrs.cloud_region),
+      NRSAFESTR(cloud_attrs.cloud_resource_id), NRSAFESTR(instance.host),
+      NRSAFESTR(instance.port_path_or_id),
+      NRSAFESTR(datastore_params.collection));
+
+  if (nr_php_is_zval_valid_string(expected)) {
+    expected_string = Z_STRVAL_P(expected);
+  }
+
+  if (nr_php_is_zval_valid_string(test_name)) {
+    test_name_string = Z_STRVAL_P(test_name);
+  } else {
+    test_name_string = "Params should match expected.";
+  }
+
+  tlib_pass_if_str_equal(test_name_string, expected_string, result_string);
+
+  nr_free(datastore_params.collection);
+  nr_free(result_string);
+  nr_free(cloud_attrs.cloud_resource_id);
+  nr_free(instance.port_path_or_id);
+}
+NR_PHP_WRAPPER_END
+
 NR_PHP_WRAPPER(aws_lambda_invoke_wrapper) {
   nr_segment_cloud_attrs_t cloud_attrs = {0};
-  /* 
+  /*
    * Because argument 1 is not used in instrumentation, we will use it
    * to pass in the expected value
    */
   zval* expected = nr_php_get_user_func_arg(1, NR_EXECUTE_ORIG_ARGS);
-  nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_ORIG_ARGS, &cloud_attrs);
+  nr_aws_sdk_lambda_client_invoke_parse_args(NR_EXECUTE_ORIG_ARGS,
+                                             &cloud_attrs);
   (void)wraprec;
 
   if (nr_php_is_zval_valid_string(expected)) {
     tlib_pass_if_str_equal("Expected should match reconstructed arn",
-            Z_STRVAL_P(expected),
-            cloud_attrs.cloud_resource_id);
+                           Z_STRVAL_P(expected), cloud_attrs.cloud_resource_id);
   } else {
-    tlib_pass_if_str_equal("Expected should match reconstructed arn",
-            NULL,
-            cloud_attrs.cloud_resource_id);
+    tlib_pass_if_str_equal("Expected should match reconstructed arn", NULL,
+                           cloud_attrs.cloud_resource_id);
   }
   NR_PHP_WRAPPER_CALL;
   nr_free(cloud_attrs.cloud_resource_id);
@@ -225,8 +284,8 @@ static inline void test_message_param_queueurl_settings_expect_val(
     char* cloud_region,
     char* cloud_account_id,
     char* destination_name) {
-  tlib_pass_if_str_equal("cloud_region should match.", cloud_attrs->cloud_region,
-                         cloud_region);
+  tlib_pass_if_str_equal("cloud_region should match.",
+                         cloud_attrs->cloud_region, cloud_region);
   tlib_pass_if_str_equal("cloud_account_id should match.",
                          cloud_attrs->cloud_account_id, cloud_account_id);
   tlib_pass_if_str_equal("destination_name should match.",
@@ -237,7 +296,8 @@ static inline void test_message_param_queueurl_settings_expect_null(
     nr_segment_message_params_t* message_params,
     nr_segment_cloud_attrs_t* cloud_attrs) {
   if (NULL != cloud_attrs) {
-    tlib_pass_if_null("cloud_region should be null.", cloud_attrs->cloud_region);
+    tlib_pass_if_null("cloud_region should be null.",
+                      cloud_attrs->cloud_region);
     tlib_pass_if_null("cloud_account_id should be null.",
                       cloud_attrs->cloud_account_id);
   }
@@ -272,65 +332,76 @@ static void test_nr_lib_aws_sdk_php_sqs_parse_queueurl() {
 
   /* Test null queueurl.  Extracted message_param values should be null.*/
   nr_lib_aws_sdk_php_sqs_parse_queueurl(NULL, &message_params, &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test null message_params.  No values extracted, all values should be
    * null.*/
   nr_lib_aws_sdk_php_sqs_parse_queueurl(NULL, NULL, &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test null cloud_attrs.  No values extracted, all values should be null.*/
   nr_lib_aws_sdk_php_sqs_parse_queueurl(NULL, &message_params, NULL);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_1);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_2);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_3);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_4);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_5);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_6);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_7);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /* Test Invalid values.  Extracted message_param values should be null.*/
 
   nr_strcpy(modifiable_string, INVALID_QUEUE_URL_8);
   nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
                                         &cloud_attrs);
-  test_message_param_queueurl_settings_expect_null(&message_params, &cloud_attrs);
+  test_message_param_queueurl_settings_expect_null(&message_params,
+                                                   &cloud_attrs);
 
   /*
    * Test 'https://sqs.us-east-2.amazonaws.com/123456789012/SQS_QUEUE_NAME'.
@@ -483,12 +554,389 @@ static void test_nr_lib_aws_sdk_php_handle_version(void) {
 }
 
 #if ZEND_MODULE_API_NO >= ZEND_8_1_X_API_NO
+static void setup_inherited_classes() {
+  // clang-format off
+  const char* classes =
+      "class endpoint_class {"
+        "public ?string $host;"
+        "public ?int $port;"
+        "function __construct(?int $port = null, ?string $host = null) {"
+          "$this->host = $host;"
+          "$this->port = $port;"
+        "}"
+      "}"
+      "class base_class {"
+        "private ?string $region;"
+        "private ?endpoint_class $endpoint;"
+        "function base_func($command, $args, $expects) {return;}"
+        "function __construct(?string $region = null, ?int $port = null, ?string $host = null) {"
+          "$this->region = $region;"
+          "$this->endpoint = new endpoint_class($port, $host);"
+        "}"
+      "}"
+      "class top_class extends base_class {}";
+  // clang-format on
+  tlib_php_request_eval(classes);
+}
+static void test_nr_lib_aws_sdk_php_dynamodb_set_params() {
+  zval* obj = NULL;
+  zval* expect_arg = NULL;
+  zval* array_arg = NULL;
+  zval* command_arg = NULL;
+  zval* expr = NULL;
+  char* args = NULL;
+  char* expect = NULL;
+  char* command = NULL;
+
+  tlib_php_engine_create("");
+  tlib_php_request_start();
+
+  setup_inherited_classes();
+
+  /* Get class with all values set to NULL*/
+  obj = tlib_php_request_eval_expr("new top_class");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * no 'TableName', region is null, host is null, port is null, account id is
+   * default empty string expected values to set in structs: region:<NULL>
+   * cloud_resource_id:<NULL> host:dynamodb.amazonaws.com port:8000
+   * collection:<NULL>
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'Name' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:<NULL> cloud_resource_id:<NULL> host:dynamodb.amazonaws.com "
+        "port:8000 collection:<NULL>'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /*
+   * 'TableName' exists, region is null, host is null, port is null, account id
+   * is default empty string expected values to set in structs: region:<NULL>
+   * cloud_resource_id:<NULL> host:dynamodb.amazonaws.com port:8000
+   * collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:<NULL> cloud_resource_id:<NULL> host:dynamodb.amazonaws.com "
+        "port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where region is null, host is null, port is null*/
+  nr_php_zval_free(&obj);
+
+  /* Get class with empty string region*/
+  obj = tlib_php_request_eval_expr("new top_class(region:'')");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host is null, port is null, account id
+   * is default empty string expected values to set in structs: region:my_region
+   * cloud_resource_id:<NULL> host:dynamodb.amazonaws.com port:8000
+   * collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:<NULL> cloud_resource_id:<NULL> host:dynamodb.amazonaws.com "
+        "port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+  /* Done with obj where region is empty string*/
+  nr_php_zval_free(&obj);
+
+  /* Get class with non-empty string region*/
+  obj = tlib_php_request_eval_expr("new top_class(region:'my_region')");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host is null, port is null, account id
+   * is default empty string expected values to set in structs: region:my_region
+   * cloud_resource_id:<NULL> host:dynamodb.amazonaws.com port:8000
+   * collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region cloud_resource_id:<NULL> "
+        "host:dynamodb.amazonaws.com port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where region is non-empty string*/
+  nr_php_zval_free(&obj);
+
+  /* Get class with empty string host*/
+  obj = tlib_php_request_eval_expr(
+      "new top_class(region:'my_region', port:null, host:'')");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host is empty string, port is null,
+   * account id is default empty string expected values to set in structs:
+   * region:my_region cloud_resource_id:<NULL> host:dynamodb.amazonaws.com
+   * port:8000 collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region cloud_resource_id:<NULL> "
+        "host:dynamodb.amazonaws.com port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where host is empty string*/
+  nr_php_zval_free(&obj);
+
+  /*
+   *Get obj where host is empty string but port is valid.  Will not happen in
+   *real life, the test is just to check code paths because port without a host
+   *is useless.
+   */
+  obj = tlib_php_request_eval_expr(
+      "new top_class(region:'my_region', port:1234, host:'')");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host is empty string, port is null,
+   * account id is default empty string expected values to set in structs:
+   * region:my_region cloud_resource_id:<NULL> host:dynamodb.amazonaws.com
+   * port:8000 collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region cloud_resource_id:<NULL> "
+        "host:dynamodb.amazonaws.com port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /*
+   *Done with obj where host is empty string but port is valid.  Will not happen
+   *in real life, the test is just to check code paths.
+   */
+  nr_php_zval_free(&obj);
+
+  /* Get class with non-empty string host and valid port*/
+  obj = tlib_php_request_eval_expr(
+      "new top_class(region:'my_region', port:1234, host:'my_host')");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host is valid string, port is valid,
+   * account id is default empty string expected values to set in structs:
+   * region:my_region cloud_resource_id:<NULL> host:my_host port:1234
+   * collection:my_table_name
+   */
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region cloud_resource_id:<NULL> host:my_host port:1234 "
+        "collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where host is non-empty string and port is not null*/
+  nr_php_zval_free(&obj);
+
+  /* Get class with valid tablename, host and port are NULL so we get the most
+   * common use case with defaults*/
+  obj = tlib_php_request_eval_expr(
+      "new top_class(region:'my_region', port:NULL, host:NULL)");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host and port will revert to defaults,
+   * accountid is valid This is the only scenario that will generate an arn.
+   * expected values to set in structs:
+   * region:my_region
+   * cloud_resource_id:arn:aws:dynamodb:my_region:111122223333:table/my_table_name
+   * host:dynamodb.amazonaws.com port:8000 collection:my_table_name
+   */
+  NRINI(aws_account_id) = "111122223333";
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region "
+        "cloud_resource_id:arn:aws:dynamodb:my_region:111122223333:table/"
+        "my_table_name host:dynamodb.amazonaws.com port:8000 "
+        "collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where host is non-empty string and port is not null*/
+  nr_php_zval_free(&obj);
+
+  /* Get class with valid tablename, host and port are NULL so we get the most
+   * common use case with defaults*/
+  obj = tlib_php_request_eval_expr(
+      "new top_class(region:'my_region', port:NULL, host:NULL)");
+  tlib_pass_if_not_null("object shouldn't be NULL", obj);
+
+  nr_php_wrap_user_function(NR_PSTR("base_class::base_func"),
+                            aws_dynamodb_set_params_wrapper);
+
+  /*
+   * 'TableName' exists, region is valid, host and port will revert to defaults,
+   * accountid is NULL expected values to set in structs: region:my_region
+   * cloud_resource_id:<NULL> host:dynamodb.amazonaws.com port:8000
+   * collection:my_table_name
+   */
+  NRINI(aws_account_id) = NULL;
+  args
+      = "array("
+        "    0 => array("
+        "        'TableName' => 'my_table_name'"
+        "    )"
+        ")";
+
+  expect
+      = "'region:my_region cloud_resource_id:<NULL> "
+        "host:dynamodb.amazonaws.com port:8000 collection:my_table_name'";
+  command = "'my_command_name'";
+  command_arg = tlib_php_request_eval_expr(command);
+  array_arg = tlib_php_request_eval_expr(args);
+  expect_arg = tlib_php_request_eval_expr(expect);
+  expr = nr_php_call(obj, "base_func", command_arg, array_arg, expect_arg);
+  nr_php_zval_free(&expr);
+  nr_php_zval_free(&expect_arg);
+  nr_php_zval_free(&array_arg);
+  nr_php_zval_free(&command_arg);
+
+  /* Done with obj where host is non-empty string and port is not null*/
+  nr_php_zval_free(&obj);
+
+  tlib_php_request_end();
+  tlib_php_engine_destroy();
+}
+
 static void test_nr_lib_aws_sdk_php_lambda_invoke() {
   tlib_php_engine_create("");
   tlib_php_request_start();
 
   tlib_php_request_eval("function lambda_invoke($a, $b) { return; }");
-  nr_php_wrap_user_function(NR_PSTR("lambda_invoke"), aws_lambda_invoke_wrapper);
+  nr_php_wrap_user_function(NR_PSTR("lambda_invoke"),
+                            aws_lambda_invoke_wrapper);
 
   NRINI(aws_account_id) = "111122223333";
 
@@ -496,7 +944,8 @@ static void test_nr_lib_aws_sdk_php_lambda_invoke() {
   char* args
       = "array("
         "    0 => array("
-        "        'FunctionName' => 'us-east-2:012345678901:function:my-function'"
+        "        'FunctionName' => "
+        "'us-east-2:012345678901:function:my-function'"
         "    )"
         ")";
   zval* array_arg = tlib_php_request_eval_expr(args);
@@ -512,7 +961,8 @@ static void test_nr_lib_aws_sdk_php_lambda_invoke() {
   args
       = "array("
         "    0 => array("
-        "        'FunctionName' => 'us-east-2:012345678901:function:my-function:v1'"
+        "        'FunctionName' => "
+        "'us-east-2:012345678901:function:my-function:v1'"
         "    )"
         ")";
   array_arg = tlib_php_request_eval_expr(args);
@@ -642,16 +1092,16 @@ static void test_nr_lib_aws_sdk_ini() {
   /* test too short */
   tlib_php_engine_create("newrelic.cloud.aws.account_id=\"12345678901\"");
   tlib_php_request_start();
-  tlib_pass_if_str_equal("Expected short account id to be dropped",
-                         NULL, NRINI(aws_account_id));
+  tlib_pass_if_str_equal("Expected short account id to be dropped", NULL,
+                         NRINI(aws_account_id));
   tlib_php_request_end();
   tlib_php_engine_destroy();
 
   /* test too long */
   tlib_php_engine_create("newrelic.cloud.aws.account_id=\"1234567890123\"");
   tlib_php_request_start();
-  tlib_pass_if_str_equal("Expected short account id to be dropped",
-                         NULL, NRINI(aws_account_id));
+  tlib_pass_if_str_equal("Expected short account id to be dropped", NULL,
+                         NRINI(aws_account_id));
   tlib_php_request_end();
   tlib_php_engine_destroy();
 }
@@ -666,6 +1116,7 @@ void test_main(void* p NRUNUSED) {
   test_nr_lib_aws_sdk_php_sqs_parse_queueurl();
   test_nr_lib_aws_sdk_php_get_command_arg_value();
   test_nr_lib_aws_sdk_php_lambda_invoke();
+  test_nr_lib_aws_sdk_php_dynamodb_set_params();
 #endif /* PHP 8.1+ */
 }
 #else
diff --git a/axiom/nr_datastore.h b/axiom/nr_datastore.h
index 00d295974..c54b0cf7f 100644
--- a/axiom/nr_datastore.h
+++ b/axiom/nr_datastore.h
@@ -32,6 +32,7 @@ typedef enum {
   NR_DATASTORE_SYBASE,
   NR_DATASTORE_INFORMIX,
   NR_DATASTORE_PDO,
+  NR_DATASTORE_DYNAMODB,
   NR_DATASTORE_MUST_BE_LAST
 } nr_datastore_t;
 
diff --git a/axiom/nr_datastore_private.h b/axiom/nr_datastore_private.h
index 481c158bc..5f9c7dc09 100644
--- a/axiom/nr_datastore_private.h
+++ b/axiom/nr_datastore_private.h
@@ -32,6 +32,7 @@ static const nr_datastore_mapping_t datastore_mappings[] = {
     {NR_DATASTORE_SYBASE, "Sybase", "sybase", 1},
     {NR_DATASTORE_INFORMIX, "Informix", "informix", 1},
     {NR_DATASTORE_PDO, "PDO", "pdo", 0},
+    {NR_DATASTORE_DYNAMODB, "DynamoDB", "dynamodb", 0},
     {NR_DATASTORE_MUST_BE_LAST, NULL, NULL, 0},
 };
 static size_t datastore_mappings_len
diff --git a/axiom/nr_segment.c b/axiom/nr_segment.c
index ade63d454..366d3294a 100644
--- a/axiom/nr_segment.c
+++ b/axiom/nr_segment.c
@@ -262,6 +262,9 @@ static void nr_populate_datastore_spans(nr_span_event_t* span_event,
   nr_span_event_set_datastore(span_event, NR_SPAN_DATASTORE_COMPONENT,
                               component);
 
+  nr_span_event_set_datastore(span_event, NR_SPAN_DATASTORE_DB_SYSTEM,
+                              segment->typed_attributes->datastore.db_system);                            
+
   host = segment->typed_attributes->datastore.instance.host;
   nr_span_event_set_datastore(span_event, NR_SPAN_DATASTORE_PEER_HOSTNAME,
                               host);
@@ -595,6 +598,7 @@ bool nr_segment_set_datastore(nr_segment_t* segment,
       .input_query_json = datastore->input_query_json ? nr_strdup(datastore->input_query_json) : NULL,
       .backtrace_json = datastore->backtrace_json ? nr_strdup(datastore->backtrace_json) : NULL,
       .explain_plan_json = datastore->explain_plan_json ? nr_strdup(datastore->explain_plan_json) : NULL,
+      .db_system = datastore->db_system ? nr_strdup(datastore->db_system) : NULL,
   };
 
   segment->typed_attributes->datastore.instance = (nr_datastore_instance_t){
diff --git a/axiom/nr_segment.h b/axiom/nr_segment.h
index 1e9cce8ec..af6a756dc 100644
--- a/axiom/nr_segment.h
+++ b/axiom/nr_segment.h
@@ -99,6 +99,7 @@ typedef struct _nr_segment_datastore_t {
   char* input_query_json;
   char* backtrace_json;
   char* explain_plan_json;
+  char* db_system;
   nr_datastore_instance_t instance;
 } nr_segment_datastore_t;
 
diff --git a/axiom/nr_segment_datastore.c b/axiom/nr_segment_datastore.c
index 6ccc3391e..d6674c85b 100644
--- a/axiom/nr_segment_datastore.c
+++ b/axiom/nr_segment_datastore.c
@@ -15,6 +15,7 @@
 static char* create_metrics(nr_segment_t* segment,
                             nrtime_t duration,
                             const char* product,
+                            nr_datastore_t type,
                             const char* collection,
                             const char* operation,
                             nr_segment_datastore_t* datastore,
@@ -59,12 +60,23 @@ static char* create_metrics(nr_segment_t* segment,
   }
 
   if (txn->options.database_name_reporting_enabled) {
-    nr_datastore_instance_set_database_name(&datastore->instance,
-                                            instance->database_name);
+    /*
+     * According the agent-specs Datastore-Metrics-PORTED.md:
+     * There are datastores that do not have the notion of a database name and
+     * they are exempt from collecting it. The following list recognizes
+     * datastores for which a database name is not applicable. DynamoDb is one
+     * such case and as such the db.instance attribute should not be set.
+     */
+
+    if (NR_DATASTORE_DYNAMODB != type) {
+      nr_datastore_instance_set_database_name(&datastore->instance,
+                                              instance->database_name);
+    }
   }
 
   instance_metric = nr_formatf("Datastore/instance/%s/%s/%s", product,
                                instance->host, instance->port_path_or_id);
+
   nr_segment_add_metric(segment, instance_metric, false);
   nr_datastore_instance_set_host(&datastore->instance, instance->host);
   nr_datastore_instance_set_port_path_or_id(&datastore->instance,
@@ -208,9 +220,9 @@ bool nr_segment_datastore_end(nr_segment_t** segment_ptr,
    * The allWeb and allOther rollup metrics are created at the end of the
    * transaction since the background status may change.
    */
-  scoped_metric
-      = create_metrics(segment, duration, datastore_string, collection,
-                       operation, &datastore, params->instance);
+  scoped_metric = create_metrics(segment, duration, datastore_string,
+                                 params->datastore.type, collection, operation,
+                                 &datastore, params->instance);
 
   nr_segment_set_name(segment, scoped_metric);
 
@@ -256,8 +268,8 @@ bool nr_segment_datastore_end(nr_segment_t** segment_ptr,
         break;
     }
   }
-
   datastore.component = nr_strdup(datastore_string);
+  datastore.db_system = params->db_system;
 
   if (input_query) {
     nrobj_t* obj = nro_new_hash();
diff --git a/axiom/nr_segment_datastore.h b/axiom/nr_segment_datastore.h
index a89a2acdb..5488833cd 100644
--- a/axiom/nr_segment_datastore.h
+++ b/axiom/nr_segment_datastore.h
@@ -22,6 +22,7 @@ typedef struct _nr_segment_datastore_params_t {
                        extracted from the SQL for SQL segments. */
   char* operation;  /* The null-terminated operation; if NULL, this will be
                        extracted from the SQL for SQL segments. */
+  char* db_system;  /* Database management system (DBMS) product being used.*/
   nr_datastore_instance_t*
       instance; /* Any instance information that was collected. */
 
diff --git a/axiom/nr_segment_private.c b/axiom/nr_segment_private.c
index ea5bbf8cc..b29b72e75 100644
--- a/axiom/nr_segment_private.c
+++ b/axiom/nr_segment_private.c
@@ -23,6 +23,7 @@ void nr_segment_datastore_destroy_fields(nr_segment_datastore_t* datastore) {
   nr_free(datastore->input_query_json);
   nr_free(datastore->backtrace_json);
   nr_free(datastore->explain_plan_json);
+  nr_free(datastore->db_system);
   nr_free(datastore->instance.host);
   nr_free(datastore->instance.port_path_or_id);
   nr_free(datastore->instance.database_name);
diff --git a/axiom/nr_span_event.c b/axiom/nr_span_event.c
index 7c8c2dbe0..b9b8d48e5 100644
--- a/axiom/nr_span_event.c
+++ b/axiom/nr_span_event.c
@@ -312,6 +312,9 @@ void nr_span_event_set_datastore(nr_span_event_t* event,
     case NR_SPAN_DATASTORE_COMPONENT:
       nro_set_hash_string(event->intrinsics, "component", new_value);
       break;
+    case NR_SPAN_DATASTORE_DB_SYSTEM:
+      nro_set_hash_string(event->agent_attributes, "db.system", new_value);
+      break;
     case NR_SPAN_DATASTORE_DB_STATEMENT:
       nro_set_hash_string(event->agent_attributes, "db.statement", new_value);
       break;
@@ -525,6 +528,8 @@ const char* nr_span_event_get_datastore(
   switch (member) {
     case NR_SPAN_DATASTORE_COMPONENT:
       return nro_get_hash_string(event->intrinsics, "component", NULL);
+    case NR_SPAN_DATASTORE_DB_SYSTEM:
+      return nro_get_hash_string(event->agent_attributes, "db.system", NULL);
     case NR_SPAN_DATASTORE_DB_STATEMENT:
       return nro_get_hash_string(event->agent_attributes, "db.statement", NULL);
     case NR_SPAN_DATASTORE_DB_INSTANCE:
diff --git a/axiom/nr_span_event.h b/axiom/nr_span_event.h
index 54d52e025..432ac911d 100644
--- a/axiom/nr_span_event.h
+++ b/axiom/nr_span_event.h
@@ -67,7 +67,8 @@ typedef enum {
   NR_SPAN_DATASTORE_DB_STATEMENT,
   NR_SPAN_DATASTORE_DB_INSTANCE,
   NR_SPAN_DATASTORE_PEER_ADDRESS,
-  NR_SPAN_DATASTORE_PEER_HOSTNAME
+  NR_SPAN_DATASTORE_PEER_HOSTNAME,
+  NR_SPAN_DATASTORE_DB_SYSTEM
 } nr_span_event_datastore_member_t;
 
 /*
diff --git a/axiom/tests/test_span_event.c b/axiom/tests/test_span_event.c
index a00700a6b..a9c8fe542 100644
--- a/axiom/tests/test_span_event.c
+++ b/axiom/tests/test_span_event.c
@@ -432,6 +432,23 @@ static void test_span_event_datastore_string_get_and_set(void) {
       "set db_statement to rabbit", "rabbit",
       nr_span_event_get_datastore(event, NR_SPAN_DATASTORE_PEER_HOSTNAME));
 
+  // Test : setting and getting db.system
+  tlib_pass_if_null(
+      "if unset, the db.system should be NULL",
+      nr_span_event_get_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM));
+  nr_span_event_set_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM, NULL);
+  tlib_pass_if_null(
+      "if passed NULL, the db.system should be NULL",
+      nr_span_event_get_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM));
+  nr_span_event_set_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM, "wombat");
+  tlib_pass_if_str_equal(
+      "set db.system to wombat", "wombat",
+      nr_span_event_get_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM));
+  nr_span_event_set_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM, "rabbit");
+  tlib_pass_if_str_equal(
+      "set db.system to rabbit", "rabbit",
+      nr_span_event_get_datastore(event, NR_SPAN_DATASTORE_DB_SYSTEM));
+
   nr_span_event_destroy(&event);
 }