Skip to content

feat: EB-27204 Add opentelemetry #38

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

Closed
aallier wants to merge 1 commit into from
Closed

feat: EB-27204 Add opentelemetry #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 0 additions & 70 deletions EventSubscriber/LogRequestSubscriber.php
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions EventSubscriber/LogTerminateSubscriber.php
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions Monolog/Formatter/TokenCollectionFormatter.php
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Monolog/Handler/OpentelemetryHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

declare(strict_types=1);

namespace ETSGlobal\LogBundle\Monolog\Handler;

use OpenTelemetry\API\Globals;
use OpenTelemetry\Contrib\Logs\Monolog\Handler;

class OpentelemetryHandler extends Handler
{
public function __construct()
{
parent::__construct(Globals::loggerProvider(), 'info');
}
}
26 changes: 1 addition & 25 deletions Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@
<tag name="monolog.processor" />
</service>

<service id="Monolog\Processor\IntrospectionProcessor" class="Monolog\Processor\IntrospectionProcessor" public="false">
<tag name="monolog.processor" />
</service>

<service id="ETSGlobal\LogBundle\Monolog\Formatter\TokenCollectionFormatter" class="ETSGlobal\LogBundle\Monolog\Formatter\TokenCollectionFormatter" public="false">
<argument type="service" id="ETSGlobal\LogBundle\Tracing\TokenCollection" />
<argument type="string">%ets_global_log.log_format%</argument>
</service>

<service id="ETSGlobal\LogBundle\Monolog\Handler\ContentDataModifier\AddClassLineContext" class="ETSGlobal\LogBundle\Monolog\Handler\ContentDataModifier\AddClassLineContext" public="false" />

<service id="ETSGlobal\LogBundle\Monolog\Handler\ContentDataModifier\AddJiraLink" class="ETSGlobal\LogBundle\Monolog\Handler\ContentDataModifier\AddJiraLink" public="false">
<argument type="string">%ets_global_log.handlers.slack.jira_url%</argument>
</service>
Expand All @@ -72,6 +61,7 @@
</service>

<service id="ETSGlobal\LogBundle\Monolog\Handler\IgnoreDeprecationHandler" class="ETSGlobal\LogBundle\Monolog\Handler\IgnoreDeprecationHandler" />
<service id="ETSGlobal\LogBundle\Monolog\Handler\OpentelemetryHandler" class="ETSGlobal\LogBundle\Monolog\Handler\OpentelemetryHandler" />

<service id="ETSGlobal\LogBundle\Monolog\Handler\SlackHandler" class="ETSGlobal\LogBundle\Monolog\Handler\SlackHandler" public="false">
<argument type="string">%ets_global_log.handlers.slack.token%</argument>
Expand All @@ -93,19 +83,5 @@
<argument type="service" id="ETSGlobal\LogBundle\Monolog\Handler\ContentDataModifier\AddKibanaTokenFilterLinks"/>
</call>
</service>

<service id="ETSGlobal\LogBundle\EventSubscriber\LogRequestSubscriber" class="ETSGlobal\LogBundle\EventSubscriber\LogRequestSubscriber">
<call method="setLogger">
<argument type="service" id="logger" />
</call>
<tag name="kernel.event_subscriber"/>
</service>

<service id="ETSGlobal\LogBundle\EventSubscriber\LogTerminateSubscriber" class="ETSGlobal\LogBundle\EventSubscriber\LogTerminateSubscriber">
<call method="setLogger">
<argument type="service" id="logger" />
</call>
<tag name="kernel.event_subscriber"/>
</service>
</services>
</container>
14 changes: 12 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@
"php": "^8.4",
"ext-json": "*",
"ext-mbstring": "*",
"graylog2/gelf-php": "^2.0",
"ext-grpc": "*",
"ext-protobuf": "*",
"ext-opentelemetry": "*",
"symfony/config": "^7.0",
"symfony/console": "^7.0",
"symfony/dependency-injection": "^7.0",
"symfony/http-client": "^7.0",
"symfony/http-kernel": "^7.0",
"symfony/monolog-bundle": "^3.10"
"symfony/monolog-bundle": "^3.10",
"open-telemetry/exporter-otlp": "^1.3",
"open-telemetry/opentelemetry-auto-symfony": "^1.0",
"open-telemetry/opentelemetry-logger-monolog": "^1.1",
"open-telemetry/sdk": "^1.7",
"open-telemetry/transport-grpc": "^1.1",
"open-telemetry/opentelemetry-auto-mongodb": "^0.1.1",
"open-telemetry/opentelemetry-auto-ext-amqp": "^0.0.6",
"open-telemetry/opentelemetry-auto-pdo": "^0.2.0"
},
"require-dev": {
"etsglobal/php-static-analysis": "^3.3",
Expand Down
Loading