From 3eba7be9cf68cd6318750b863a8963847944ff75 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 15 Mar 2023 20:26:29 +1100 Subject: [PATCH 1/5] fixing quoteservice metrics exporting metrics exporting was quietly failing due to misconfiguration. Update some packages to pick up the relevant bugfix, and use OTEL_EXPORTER_OTLP_ENDPOINT so that metrics, traces and eventually logs can use it. In passing, enable some logging which makes future errors more obvious. --- docker-compose.yml | 2 +- src/quoteservice/composer.json | 9 +++++++-- src/quoteservice/public/index.php | 8 ++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 42460c4fda..5d335ea656 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -455,7 +455,7 @@ services: ports: - "${QUOTE_SERVICE_PORT}" environment: - - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:4318/v1/traces + - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:4318 - OTEL_PHP_AUTOLOAD_ENABLED=true - QUOTE_SERVICE_PORT - OTEL_RESOURCE_ATTRIBUTES diff --git a/src/quoteservice/composer.json b/src/quoteservice/composer.json index a1edfc3bca..7930cc5d04 100644 --- a/src/quoteservice/composer.json +++ b/src/quoteservice/composer.json @@ -7,8 +7,8 @@ "php": ">= 8.2", "ext-json": "*", "monolog/monolog": "2.8.0", - "open-telemetry/sdk": "1.0.0beta1", - "open-telemetry/exporter-otlp": "1.0.0beta1", + "open-telemetry/sdk": "1.0.0beta3", + "open-telemetry/exporter-otlp": "1.0.0beta3", "open-telemetry/opentelemetry-auto-slim": "1.0.0beta4", "guzzlehttp/guzzle": "7.4.5", "php-di/php-di": "6.4.0", @@ -21,5 +21,10 @@ "psr-4": { "App\\": "src/" } + }, + "config": { + "allow-plugins": { + "php-http/discovery": false + } } } diff --git a/src/quoteservice/public/index.php b/src/quoteservice/public/index.php index f0150d576d..36aa1e1642 100644 --- a/src/quoteservice/public/index.php +++ b/src/quoteservice/public/index.php @@ -17,10 +17,18 @@ use DI\Bridge\Slim\Bridge; use DI\ContainerBuilder; +use Monolog\Handler\StreamHandler; +use Monolog\Logger; +use OpenTelemetry\API\Common\Log\LoggerHolder; +use Psr\Log\LogLevel; use Slim\Factory\AppFactory; require __DIR__ . '/../vendor/autoload.php'; +LoggerHolder::set( + new Logger('otel-php', [new StreamHandler('php://stdout', LogLevel::DEBUG)]) +); + // Instantiate PHP-DI ContainerBuilder $containerBuilder = new ContainerBuilder(); From 1e6c3602bf21fa9d2703d1b062d8a3459e38f6c4 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 16 Mar 2023 00:05:55 +1100 Subject: [PATCH 2/5] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cf25d5f1f..0758114169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -271,3 +271,7 @@ significant modifications will be credited to OpenTelemetry Authors. ([#764](https://github.com/open-telemetry/opentelemetry-demo/pull/764)) * [chore] align memory limits with Helm chart ([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781)) +* [bug] fixing quoteservice metrics exporting (PHP) + ([#793)(https://github.com/open-telemetry/opentelemetry-demo/pull/793)) +D + ([#793]()) From eda57bf1bd25fbe6fef1132381d5a6ffc3aa8aa3 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 16 Mar 2023 11:26:17 +1100 Subject: [PATCH 3/5] Update CHANGELOG.md Co-authored-by: Juliano Costa --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0758114169..9a07f7f446 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -273,5 +273,3 @@ significant modifications will be credited to OpenTelemetry Authors. ([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781)) * [bug] fixing quoteservice metrics exporting (PHP) ([#793)(https://github.com/open-telemetry/opentelemetry-demo/pull/793)) -D - ([#793]()) From f74b18d3c2940b90e81ee3f38a2fce36fe2206dd Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 16 Mar 2023 13:16:57 +1100 Subject: [PATCH 4/5] fixing changelog link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a442d2fc8..27d39bb0a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -274,4 +274,4 @@ significant modifications will be credited to OpenTelemetry Authors. * [chore] align memory limits with Helm chart ([#781](https://github.com/open-telemetry/opentelemetry-demo/pull/781)) * [bug] fixing quoteservice metrics exporting (PHP) - ([#793)(https://github.com/open-telemetry/opentelemetry-demo/pull/793)) + ([#793](https://github.com/open-telemetry/opentelemetry-demo/pull/793)) From baae28d56641296cb108ebba7e24b64428efe85a Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 16 Mar 2023 18:54:52 +1100 Subject: [PATCH 5/5] update to latest api with warning fixed --- src/quoteservice/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/quoteservice/composer.json b/src/quoteservice/composer.json index 7930cc5d04..c598465f8a 100644 --- a/src/quoteservice/composer.json +++ b/src/quoteservice/composer.json @@ -7,6 +7,7 @@ "php": ">= 8.2", "ext-json": "*", "monolog/monolog": "2.8.0", + "open-telemetry/api": "1.0.0beta4", "open-telemetry/sdk": "1.0.0beta3", "open-telemetry/exporter-otlp": "1.0.0beta3", "open-telemetry/opentelemetry-auto-slim": "1.0.0beta4",