From 1de5d6ed2db66b4da55fcafe1aacc87a1ebe7157 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Mon, 22 Jan 2024 15:40:44 -0600 Subject: [PATCH] feat: Enable tests for New Relic and Blackfire on php 8.3 --- helpers/TESTING_base_images_dockercompose.md | 10 +++++----- helpers/images-docker-compose.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helpers/TESTING_base_images_dockercompose.md b/helpers/TESTING_base_images_dockercompose.md index 2da121955..f0619ce35 100644 --- a/helpers/TESTING_base_images_dockercompose.md +++ b/helpers/TESTING_base_images_dockercompose.md @@ -213,11 +213,11 @@ docker-compose exec -T php-8-3-dev bash -c "php -i" | grep "sendmail_path" | gre docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "xdebug.client_port" | grep "9003" docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "PHP_IDE_CONFIG" | grep "serverName=lagoon" docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "xdebug.log" | grep "/tmp/xdebug.log" -# TODO docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.appname" | grep "noproject-nobranch" -# TODO docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.application_logging.enabled" | grep "disabled" -# TODO docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.logfile" | grep "/dev/stderr" -# TODO docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "Blackfire" | grep "enabled" -# TODO docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "blackfire.agent_socket" | grep "tcp://127.0.0.1:8307" +docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.appname" | grep "noproject-nobranch" +docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.application_logging.enabled" | grep "disabled" +docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "newrelic.logfile" | grep "/dev/stderr" +docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "Blackfire" | grep "enabled" +docker-compose exec -T commons sh -c "curl -kL http://php-8-3-dev:9000" | grep "blackfire.agent_socket" | grep "tcp://127.0.0.1:8307" # PHP 8.3 production should have overridden configuration. docker-compose exec -T commons sh -c "curl -kL http://php-8-3-prod:9000" | grep "max_input_vars" | grep "4000" diff --git a/helpers/images-docker-compose.yml b/helpers/images-docker-compose.yml index 3e9ab4aa3..6a016c7d4 100644 --- a/helpers/images-docker-compose.yml +++ b/helpers/images-docker-compose.yml @@ -139,8 +139,8 @@ services: - LAGOON_ENVIRONMENT_TYPE=development - XDEBUG_ENABLE=true - XDEBUG_LOG=true - # TODO - NEWRELIC_ENABLED=true - # TODO - BLACKFIRE_ENABLED=true + - NEWRELIC_ENABLED=true + - BLACKFIRE_ENABLED=true - NEWRELIC_APPLICATION_LOGGING_ENABLED=false << : *default-user # uses the defined user from top command: ["sh", "-c", "