feat(agent): Add aws-sdk-php SQS instrumentation #1003
Merged
Conversation
This file contains 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
Set segment type enum Create nr_segment_message_t struct Add to the nr_segment_typed_attributes_t union
…hp-agent into feat/message_segment
* Create enums for message attributes attributes * Add MESSAGE enum to nr_span_category_t span category * create nr_span_event_set_message
create `nr_span_event_set_spankind` for generic,http,datastore the logic of nr_span_event_set_category is overloaded because according agent-specs/Span-Events.md, span.kind could only ever be “client” for datastore and http spans and empty for generic spans. I debated extracting all the logic and making nr_span_event_set_spankind calls for those categories in nr_segment.c; however, since the span.kind values are always the same for those span categories, I left it in for now. Message spans however, will call nr_span_event_set_spankind separately and nr_span_event_set_category will only be used to set the category.
add message_type to nr_segment_message_t to inform the spankind since message_type is on nr_segment_message_t, give a default in case the message span is created but the nr_segment_message_t is not accessible added function nr_populate_message_spans added function nr_segment_set_message added message segment handling to nr_segment_to_span_event
Add the message_tracer_segment_parameters_enabled value to opts for use in axiom.
Includes creating metrics and ending the message segment.
* test get/set spankind * test get/set message span members
Sorry clang-format added some unrelated formatting.
Rollups happen in 2 places in nr_txn.c nr_error_to_event And nr_txn_event_intrinsics * fixed externalCallCount was getting set in nr_error_to_event but not in nr_txn_event_intrinsics * Added messageCallCount/messageDuration to both functions
Handle NULL/empty str and provide the `<unknown>` string.
Set segment type enum Create nr_segment_message_t struct Add to the nr_segment_typed_attributes_t union
Use a macro to determine class. Remove all previously defined strings and lengths.
lavarou
reviewed
Jan 17, 2025
| #define COMMAND_NAME_LEN_FOR_TEST sizeof(COMMAND_NAME_FOR_TEST) - 1 | ||
| #define ARG_TO_FIND_FOR_TEST AWS_SDK_PHP_SQSCLIENT_QUEUEURL_ARG | ||
|
|
||
| /* These wrappers are used so we don't have to mock up zend_execute_data. */ |
There was a problem hiding this comment.
This is great! I really like this idea!
lavarou
reviewed
Jan 17, 2025
|
|
||
| /* Add cloud attributes, if available. */ | ||
|
|
||
| nr_segment_traces_add_cloud_attributes(segment, &cloud_attrs); |
There was a problem hiding this comment.
Just for posterity (because it took me a moment to figure this out) - no char * pointers in could_attrs need to be freed because they're either pointers into command_arg_value which is freed before returning from this function or it is a pointer to command_name_string which is also freed.
lavarou
reviewed
Jan 17, 2025
lavarou
previously approved these changes
Jan 17, 2025
Co-authored-by: Michal Nowacki <[email protected]>
lavarou
reviewed
Jan 22, 2025
lavarou
reviewed
Jan 22, 2025
lavarou
reviewed
Jan 22, 2025
lavarou
reviewed
Jan 22, 2025
lavarou
reviewed
Jan 22, 2025
Co-authored-by: Michal Nowacki <[email protected]>
Co-authored-by: Michal Nowacki <[email protected]>
…ic-php-agent into feat/sqs_instrumentation
Co-authored-by: Michal Nowacki <[email protected]>
…ic-php-agent into feat/sqs_instrumentation
lavarou
approved these changes
Jan 22, 2025
mfulb
approved these changes
Jan 22, 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.
Uses message segments to create SQS instrumentation.
Added unit tests and multiverse tests.