feat(agent): Add AWS DynamoDb Instrumentation #1037
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #1037 +/- ##
==========================================
- Coverage 77.22% 77.14% -0.08%
==========================================
Files 198 198
Lines 27899 27990 +91
==========================================
+ Hits 21544 21592 +48
- Misses 6355 6398 +43
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
…ewrelic-php-agent into feat/dynamodb_instrumentation
Co-authored-by: bduranleau-nr <[email protected]>
Co-authored-by: bduranleau-nr <[email protected]>
Co-authored-by: bduranleau-nr <[email protected]>
Co-authored-by: bduranleau-nr <[email protected]>
mfulb
reviewed
Mar 28, 2025
zsistla
commented
Mar 28, 2025
Comment on lines
+20
to
+26
| #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-]+))?" |
mfulb
reviewed
Mar 28, 2025
zsistla
commented
Mar 28, 2025
| nr_segment_cloud_attrs_t cloud_attrs = { | ||
| .cloud_platform = "aws_lambda" | ||
| }; | ||
| nr_segment_cloud_attrs_t cloud_attrs = {.cloud_platform = "aws_lambda"}; |
zsistla
commented
Mar 28, 2025
|
|
||
| /* 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 |
zsistla
commented
Mar 28, 2025
Comment on lines
+390
to
+392
| void nr_aws_sdk_lambda_client_invoke_parse_args( | ||
| NR_EXECUTE_PROTO, | ||
| nr_segment_cloud_attrs_t* cloud_attrs) { |
zsistla
commented
Mar 28, 2025
Comment on lines
+411
to
+412
| zval* lambda_name | ||
| = nr_php_zend_hash_find(Z_ARRVAL_P(lambda_args), "FunctionName"); |
zsistla
commented
Mar 28, 2025
Comment on lines
+423
to
+424
| nr_regex_substrings_t* matches = nr_regex_match_capture( | ||
| aws_arn_regex, Z_STRVAL_P(lambda_name), Z_STRLEN_P(lambda_name)); |
zsistla
commented
Mar 28, 2025
Comment on lines
+450
to
+452
| if (NULL != execute_data->func | ||
| && NULL != execute_data->func->common.scope) { | ||
| base_class = execute_data->func->common.scope; |
zsistla
commented
Mar 28, 2025
Comment on lines
+469
to
+473
| 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); |
bduranleau-nr
previously approved these changes
Mar 28, 2025
mfulb
reviewed
Apr 7, 2025
mfulb
reviewed
Apr 7, 2025
mfulb
reviewed
Apr 7, 2025
| 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); |
There was a problem hiding this comment.
This appears to be a formatting only change.
mfulb
reviewed
Apr 7, 2025
mfulb
reviewed
Apr 7, 2025
| operation, &datastore, params->instance); | ||
| scoped_metric = create_metrics(segment, duration, datastore_string, | ||
| params->datastore.type, collection, operation, | ||
| &datastore, params->instance); |
There was a problem hiding this comment.
Formatting change only possibly?
mfulb
reviewed
Apr 7, 2025
mfulb
approved these changes
Apr 9, 2025
bduranleau-nr
approved these changes
Apr 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added functionality to instrument
Unit tests added.
See also relevant multiverse PR.
See also relevant soak test PR.
Needed a modification to axiom to: