From 38353e245f66fe9ab527f0549079720246eafafb Mon Sep 17 00:00:00 2001 From: Andrii Havryliuk Date: Wed, 4 Dec 2024 14:00:25 +0100 Subject: [PATCH] fix: make opentelemetry logging configuration compatible with configuration in docker recipe --- .../prod/opentelemetry_logger_monolog.yaml | 19 +++++++++++++++++++ .../1.0/manifest.json | 5 +++++ .../config/packages/prod/opentelemetry.yaml | 9 --------- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 open-telemetry/opentelemetry-logger-monolog/1.0/config/packages/prod/opentelemetry_logger_monolog.yaml create mode 100644 open-telemetry/opentelemetry-logger-monolog/1.0/manifest.json diff --git a/open-telemetry/opentelemetry-logger-monolog/1.0/config/packages/prod/opentelemetry_logger_monolog.yaml b/open-telemetry/opentelemetry-logger-monolog/1.0/config/packages/prod/opentelemetry_logger_monolog.yaml new file mode 100644 index 00000000..52117aab --- /dev/null +++ b/open-telemetry/opentelemetry-logger-monolog/1.0/config/packages/prod/opentelemetry_logger_monolog.yaml @@ -0,0 +1,19 @@ +# see https://github.com/shopwareLabs/opentelemetry/blob/main/README.md + +monolog: + handlers: + main: + type: fingers_crossed + action_level: error + handler: nested + excluded_http_codes: [ 404, 405 ] + buffer_size: 50 + nested: + type: service + id: monolog.handler.open_telemetry + level: error + formatter: null + # handler for shopware/elasticsearch, comment it out if package is not installed + elasticsearch: + type: service + id: monolog.handler.open_telemetry diff --git a/open-telemetry/opentelemetry-logger-monolog/1.0/manifest.json b/open-telemetry/opentelemetry-logger-monolog/1.0/manifest.json new file mode 100644 index 00000000..e164c6e6 --- /dev/null +++ b/open-telemetry/opentelemetry-logger-monolog/1.0/manifest.json @@ -0,0 +1,5 @@ +{ + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} diff --git a/shopware/opentelemetry/0.1/config/packages/prod/opentelemetry.yaml b/shopware/opentelemetry/0.1/config/packages/prod/opentelemetry.yaml index b173631c..c340c581 100644 --- a/shopware/opentelemetry/0.1/config/packages/prod/opentelemetry.yaml +++ b/shopware/opentelemetry/0.1/config/packages/prod/opentelemetry.yaml @@ -3,12 +3,3 @@ shopware: profiler: integrations: - OpenTelemetry - -monolog: - handlers: - main: - type: service - id: monolog.handler.open_telemetry - elasticsearch: - type: service - id: monolog.handler.open_telemetry \ No newline at end of file