feat(agent): Add AWS DynamoDb Instrumentation #1037

zsistla · 2025-03-14T16:58:44Z

Added functionality to instrument

Call	                 collection(tablename)	operation	product

Create Table	TableName parameter	create_table	DynamoDB
Delete Item	TableName parameter	delete_item	DynamoDB
Delete Table	TableName parameter	delete_table	DynamoDB
Get Item	TableName parameter	get_item	DynamoDB
Put Item	TableName parameter	put_item	DynamoDB
Query	        TableName parameter	query	        DynamoDB
Scan	        TableName parameter	scan	        DynamoDB
Update Item	TableName parameter	update_item	DynamoDB

Unit tests added.
See also relevant multiverse PR.

Needed a modification to axiom to:

add db.system
modify datastore to allow for datastore that don't have concept of database name

* add db.system * modify datastore to allow for datastore that don't have concept of database name

* Added instrumentation to handle the calls specified in the agent spec * Added unit tests

newrelic-php-agent-bot · 2025-03-14T16:59:08Z

Test Suite	Status	Result
Multiverse	✅	8/8 passing
SOAK	❌	76/79 passing

codecov-commenter · 2025-03-14T17:22:39Z

Codecov Report

Attention: Patch coverage is 54.05405% with 51 lines in your changes missing coverage. Please review.

Project coverage is 77.79%. Comparing base (8124792) to head (ea34ac0).

Files with missing lines	Patch %	Lines
agent/lib_aws_sdk_php.c	47.42%	51 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #1037      +/-   ##
==========================================
- Coverage   77.87%   77.79%   -0.09%     
==========================================
  Files         198      198              
  Lines       27899    27991      +92     
==========================================
+ Hits        21727    21775      +48     
- Misses       6172     6216      +44

Flag	Coverage Δ
agent-for-php-7.2	`78.14% <100.00%> (+<0.01%)`	⬆️
agent-for-php-7.3	`78.16% <100.00%> (+<0.01%)`	⬆️
agent-for-php-7.4	`77.87% <100.00%> (+<0.01%)`	⬆️
agent-for-php-8.0	`77.26% <100.00%> (+<0.01%)`	⬆️
agent-for-php-8.1	`77.57% <54.05%> (-0.08%)`	⬇️
agent-for-php-8.2	`77.18% <54.05%> (-0.08%)`	⬇️
agent-for-php-8.3	`77.18% <54.05%> (-0.08%)`	⬇️
agent-for-php-8.4	`77.20% <54.05%> (-0.08%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

agent/lib_aws_sdk_php.c

…ewrelic-php-agent into feat/dynamodb_instrumentation

agent/lib_aws_sdk_php.h

agent/tests/test_lib_aws_sdk_php.c

Co-authored-by: bduranleau-nr <[email protected]>

agent/tests/test_lib_aws_sdk_php.c

Co-authored-by: bduranleau-nr <[email protected]>

agent/tests/test_lib_aws_sdk_php.c

Co-authored-by: bduranleau-nr <[email protected]>

mfulb · 2025-03-28T17:57:04Z

agent/lib_aws_sdk_php.c

+  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(


What would be the best behavior here if cloud_attrs->cloud_resource_id was non-NULL?

Best behavior? if non-NULL it gets passed back to caller who uses it to end the segment before freeing it.

zsistla · 2025-03-28T17:58:22Z

agent/lib_aws_sdk_php.c

+#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-]+))?"


Format only.

mfulb · 2025-03-28T18:01:41Z

agent/lib_aws_sdk_php.c

+        } 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");


Would this just be the default port if unset?

No because we were able to extract a host just not a port. Once we've extracted a host, we cannot assume a port to go with it. Default port only ever pairs with default host.

zsistla · 2025-03-28T18:13:51Z

agent/lib_aws_sdk_php.c

-  nr_segment_cloud_attrs_t cloud_attrs = {
-      .cloud_platform = "aws_lambda"
-  };
+  nr_segment_cloud_attrs_t cloud_attrs = {.cloud_platform = "aws_lambda"};


Format only

agent/lib_aws_sdk_php.c

zsistla · 2025-03-28T20:26:42Z

agent/lib_aws_sdk_php.c

  }
  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


format only

zsistla · 2025-03-28T20:28:14Z

agent/lib_aws_sdk_php.c

+void nr_aws_sdk_lambda_client_invoke_parse_args(
+    NR_EXECUTE_PROTO,
+    nr_segment_cloud_attrs_t* cloud_attrs) {


format only

zsistla · 2025-03-28T20:28:46Z

agent/lib_aws_sdk_php.c

+  zval* lambda_name
+      = nr_php_zend_hash_find(Z_ARRVAL_P(lambda_args), "FunctionName");


format only

zsistla · 2025-03-28T20:29:00Z

agent/lib_aws_sdk_php.c

+  nr_regex_substrings_t* matches = nr_regex_match_capture(
+      aws_arn_regex, Z_STRVAL_P(lambda_name), Z_STRLEN_P(lambda_name));


format only

zsistla · 2025-03-28T20:29:24Z

agent/lib_aws_sdk_php.c

+    if (NULL != execute_data->func
+        && NULL != execute_data->func->common.scope) {
+      base_class = execute_data->func->common.scope;


format only

zsistla · 2025-03-28T20:29:46Z

agent/lib_aws_sdk_php.c

+      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);


format only

zsistla added 2 commits March 14, 2025 09:33

feat(axiom): Update datastore handling to support DynamoDb

9e20b93

* add db.system * modify datastore to allow for datastore that don't have concept of database name

feat(agent): Add AWS DynamoDb Instrumentation

dd22e39

* Added instrumentation to handle the calls specified in the agent spec * Added unit tests

zsistla added the ready for review label Mar 14, 2025

zsistla added 3 commits March 14, 2025 10:35

Merge branch 'dev' into feat/dynamodb_instrumentation

6352455

Merge branch 'dev' into feat/dynamodb_instrumentation

931bd9d

Merge branch 'dev' into feat/dynamodb_instrumentation

afa5f03

bduranleau-nr reviewed Mar 27, 2025

View reviewed changes

agent/lib_aws_sdk_php.c Show resolved Hide resolved

bduranleau-nr reviewed Mar 27, 2025

View reviewed changes

agent/lib_aws_sdk_php.c Show resolved Hide resolved

zsistla added 2 commits March 27, 2025 15:15

fix(agent): expand scope of if statement for func->common.scope check

29627f0

Merge branch 'feat/dynamodb_instrumentation' of github.com:newrelic/n…

1fbc50d

…ewrelic-php-agent into feat/dynamodb_instrumentation

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/lib_aws_sdk_php.h Show resolved Hide resolved

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/lib_aws_sdk_php.h Outdated Show resolved Hide resolved

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/tests/test_lib_aws_sdk_php.c Outdated Show resolved Hide resolved

mfulb self-requested a review March 28, 2025 16:51

zsistla and others added 3 commits March 28, 2025 09:52

Update agent/tests/test_lib_aws_sdk_php.c

714494f

Co-authored-by: bduranleau-nr <[email protected]>

Update agent/lib_aws_sdk_php.h

6aea190

Co-authored-by: bduranleau-nr <[email protected]>

Merge branch 'dev' into feat/dynamodb_instrumentation

138d51f

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/tests/test_lib_aws_sdk_php.c Outdated Show resolved Hide resolved

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/tests/test_lib_aws_sdk_php.c Outdated Show resolved Hide resolved

Update agent/tests/test_lib_aws_sdk_php.c

7c3f818

Co-authored-by: bduranleau-nr <[email protected]>

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/tests/test_lib_aws_sdk_php.c Outdated Show resolved Hide resolved

zsistla and others added 2 commits March 28, 2025 10:47

fix(agent): test name is arg 1 not 3

efd8799

Update agent/tests/test_lib_aws_sdk_php.c

ea34ac0

Co-authored-by: bduranleau-nr <[email protected]>

mfulb reviewed Mar 28, 2025

View reviewed changes

zsistla commented Mar 28, 2025

View reviewed changes

mfulb reviewed Mar 28, 2025

View reviewed changes

zsistla commented Mar 28, 2025

View reviewed changes

bduranleau-nr reviewed Mar 28, 2025

View reviewed changes

agent/lib_aws_sdk_php.c Show resolved Hide resolved

zsistla commented Mar 28, 2025

View reviewed changes

bduranleau-nr approved these changes Mar 28, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(agent): Add AWS DynamoDb Instrumentation #1037

feat(agent): Add AWS DynamoDb Instrumentation #1037

zsistla commented Mar 14, 2025

newrelic-php-agent-bot commented Mar 14, 2025 •

edited

Loading

codecov-commenter commented Mar 14, 2025 •

edited

Loading

mfulb Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

mfulb Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

zsistla Mar 28, 2025

		zval* lambda_name
		= nr_php_zend_hash_find(Z_ARRVAL_P(lambda_args), "FunctionName");

		nr_regex_substrings_t* matches = nr_regex_match_capture(
		aws_arn_regex, Z_STRVAL_P(lambda_name), Z_STRLEN_P(lambda_name));

feat(agent): Add AWS DynamoDb Instrumentation #1037

Are you sure you want to change the base?

feat(agent): Add AWS DynamoDb Instrumentation #1037

Conversation

zsistla commented Mar 14, 2025

newrelic-php-agent-bot commented Mar 14, 2025 • edited Loading

codecov-commenter commented Mar 14, 2025 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

newrelic-php-agent-bot commented Mar 14, 2025 •

edited

Loading

codecov-commenter commented Mar 14, 2025 •

edited

Loading