Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(agent): Add RabbitMQ instrumentation using the php-amqplib library #1009

Open
wants to merge 31 commits into
base: dev
Choose a base branch
from
Open

feat(agent): Add RabbitMQ instrumentation using the php-amqplib library #1009

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2df782f
feat(agent): Add RabbitMQ instrumentation using the php-amqplib library
zsistla Jan 18, 2025
0b184ca
feat(agent): Add RabbitMQ instrumentation using the php-amqplib library
zsistla Jan 18, 2025
3e7dc66
Merge branch 'feat/rabbitmq_instrumentation' of github.com:newrelic/n…
zsistla Jan 22, 2025
feba725
fix(agent): Typo remove AWS references
zsistla Jan 23, 2025
feef4be
fix(agent): typo
zsistla Jan 23, 2025
761de36
feat(agent): Add additional unit test
zsistla Jan 23, 2025
80be7a5
chore(agent): Clarifying comment.
zsistla Jan 23, 2025
b50a5d2
feat(axiom): Update message segment to handle rabbitmq
zsistla Jan 25, 2025
075e297
feat(agent): Add php_amqplib basic_publish instrumentation.
zsistla Jan 29, 2025
f106a20
fix(axiom): Handle final metrix/txn naming when publish_name exists.
zsistla Jan 29, 2025
631ae54
feat(agent): Add php_libamqp basic_get instrumentation.
zsistla Jan 29, 2025
f3502b5
fix(tests): Update tests to understand the precedence of publish_name
zsistla Jan 29, 2025
eaac00d
fix(agent): Handle vagaries of different Connection classes
zsistla Jan 30, 2025
095f82d
fix(agent): check long not scalar
zsistla Jan 31, 2025
71e5e02
fix(agent): add an unperist macro
zsistla Jan 31, 2025
2335634
Merge branch 'dev' into feat/rabbitmq_instrumentation
zsistla Jan 31, 2025
ead28c2
fix(agent): Only set to 'default' in case of valid but empty string
zsistla Jan 31, 2025
0d708cb
feat(agent): Insert/retrieve DT headers on rabbitmq
zsistla Feb 4, 2025
0009a56
fix(agent): Update docstring
zsistla Feb 4, 2025
88c904d
style(agent): rename variable
zsistla Feb 4, 2025
4aa2522
style(agent): Comment clarification
zsistla Feb 5, 2025
b5c7def
style(agent): Comment update
zsistla Feb 5, 2025
0e6ec90
fix(agent): Update comment
zsistla Feb 5, 2025
127e62a
fix(agent): Comment about support.
zsistla Feb 5, 2025
a8569a2
Update agent/lib_php_amqplib.c
zsistla Feb 5, 2025
d6f40fa
fix(agent): belongs inside the block that checked for valid retval
zsistla Feb 5, 2025
e27a78e
fix(agent): Expectations needed to be flipped after a previous refactor
zsistla Feb 5, 2025
23a8a34
fix(agent): unneeded var
zsistla Feb 5, 2025
10858da
fix(agent): Update comments regarding DT vs w3c header behavior
zsistla Feb 6, 2025
89d2937
fix(agent): just bail early from headers if DT isn't on
zsistla Feb 6, 2025
90da3b7
fix(agent): use zval is integer function
zsistla Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions agent/Makefile.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ TEST_BINARIES = \
tests/test_internal_instrument \
tests/test_hash \
tests/test_lib_aws_sdk_php \
tests/test_lib_php_amqplib \
tests/test_memcached \
tests/test_mongodb \
tests/test_monolog \
Expand Down
2 changes: 1 addition & 1 deletion agent/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ if test "$PHP_NEWRELIC" = "yes"; then
LIBRARIES="lib_aws_sdk_php.c lib_monolog.c lib_doctrine2.c lib_guzzle3.c \
lib_guzzle4.c lib_guzzle6.c lib_guzzle_common.c \
lib_mongodb.c lib_phpunit.c lib_predis.c lib_zend_http.c \
lib_composer.c"
lib_composer.c lib_php_amqplib.c"
PHP_NEW_EXTENSION(newrelic, $FRAMEWORKS $LIBRARIES $NEWRELIC_AGENT, $ext_shared,, $(NEWRELIC_CFLAGS))

PHP_SUBST(NEWRELIC_CFLAGS)
Expand Down
1 change: 1 addition & 0 deletions agent/fw_hooks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ extern void nr_guzzle4_enable(TSRMLS_D);
extern void nr_guzzle6_enable(TSRMLS_D);
extern void nr_laminas_http_enable(TSRMLS_D);
extern void nr_mongodb_enable(TSRMLS_D);
extern void nr_php_amqplib_enable();
extern void nr_phpunit_enable(TSRMLS_D);
extern void nr_predis_enable(TSRMLS_D);
extern void nr_zend_http_enable(TSRMLS_D);
Expand Down
6 changes: 6 additions & 0 deletions agent/lib_aws_sdk_php.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,12 @@ void nr_lib_aws_sdk_php_handle_version() {
zval retval;
int result = FAILURE;

/*
* The following block initializes nr_aws_sdk_version to the empty string.
* If it is able to extract the version, nr_aws_sdk_version is set to that.
* Nothing is needed in the catch block.
* The final return will either return a proper version or an empty string.
*/
result = zend_eval_string(
"(function() {"
" $nr_aws_sdk_version = '';"
Expand Down
Loading
Loading