Skip to content

Commit 165e7a3

Browse files
committed
minor #395 Revert "Add Datadog monolog integration" (jderusse)
This PR was merged into the 3.x-dev branch. Discussion ---------- Revert "Add Datadog monolog integration" Reverts #364 Commits ------- a3bdc5d Revert "Add Datadog monolog integration"
2 parents 6418ceb + a3bdc5d commit 165e7a3

File tree

3 files changed

+6
-50
lines changed

3 files changed

+6
-50
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
## 3.7.0 (xxxx-xx-xx)
22

3-
* Add support for `datadog` handler
43
* Use `ActivationStrategy` instead of `actionLevel` when available
54
* Register resettable processors (`ResettableInterface`) for autoconfiguration (tag: `kernel.reset`)
65
* Drop support for Symfony 3.4

DependencyInjection/Configuration.php

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -326,18 +326,6 @@
326326
* - [level]: level name or int value, defaults to DEBUG
327327
* - [bubble]: bool, defaults to true
328328
*
329-
* - datadog:
330-
* - token: Api Key supplied by Datadog
331-
* - region: Region where Datadog data are hosted. Could be 'us' or 'eu'. Defaults to 'us'
332-
* - [app_name]: Application name used as the "source" Datadog attribute inside the DatadogFormatter. Defaults to null
333-
* - [system_name]: The system/machine name, used as the "host" Datadog attribute inside the DatadogFormatter. Defaults to null
334-
* - [environment]: The environment, used as the "env" Datadog attribute. Defaults to null
335-
* - [source]: This corresponds to the integration name: the technology from which the log originated. Must be one of the following list: https://app.datadoghq.eu/logs/pipelines/pipeline/library. If not set, the formatter uses 'php'.
336-
* - [logger_name]: Name of the logger, used as the "logger.name" Datadog attribute inside the DatadogFormatter. Defaults to 'monolog'
337-
* - [use_ssl]: whether or not SSL encryption should be used, defaults to true
338-
* - [level]: level name or int value, defaults to DEBUG
339-
* - [bubble]: bool, defaults to true
340-
*
341329
* - server_log:
342330
* - host: server log host. ex: 127.0.0.1:9911
343331
* - [level]: level name or int value, defaults to DEBUG
@@ -393,7 +381,7 @@ public function getConfigTreeBuilder()
393381
->scalarNode('priority')->defaultValue(0)->end()
394382
->scalarNode('level')->defaultValue('DEBUG')->end()
395383
->booleanNode('bubble')->defaultTrue()->end()
396-
->scalarNode('app_name')->defaultNull()->end() // newrelic & datadog
384+
->scalarNode('app_name')->defaultNull()->end()
397385
->booleanNode('include_stacktraces')->defaultFalse()->end()
398386
->booleanNode('process_psr_3_messages')->defaultNull()->end()
399387
->scalarNode('path')->defaultValue('%kernel.logs_dir%/%kernel.environment%.log')->end() // stream and rotating
@@ -484,12 +472,10 @@ public function getConfigTreeBuilder()
484472
->scalarNode('team')->end() // slackbot
485473
->scalarNode('notify')->defaultFalse()->end() // hipchat
486474
->scalarNode('nickname')->defaultValue('Monolog')->end() // hipchat
487-
->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar & slack & slackbot & insightops & datadog
488-
->scalarNode('region')->end() // insightops & datadog
489-
->scalarNode('source')->end() // flowdock & datadog
490-
->scalarNode('system_name')->defaultNull()->end() // datadog
491-
->scalarNode('logger_name')->defaultValue('monolog')->end() // datadog
492-
->booleanNode('use_ssl')->defaultTrue()->end() // logentries & hipchat & insightops & datadog
475+
->scalarNode('token')->end() // pushover & hipchat & loggly & logentries & flowdock & rollbar & slack & slackbot & insightops
476+
->scalarNode('region')->end() // insightops
477+
->scalarNode('source')->end() // flowdock
478+
->booleanNode('use_ssl')->defaultTrue()->end() // logentries & hipchat & insightops
493479
->variableNode('user') // pushover
494480
->validate()
495481
->ifTrue(function ($v) {
@@ -657,7 +643,7 @@ public function getConfigTreeBuilder()
657643
->scalarNode('client_id')->defaultNull()->end() // raven_handler, sentry_handler
658644
->scalarNode('auto_log_stacks')->defaultFalse()->end() // raven_handler
659645
->scalarNode('release')->defaultNull()->end() // raven_handler, sentry_handler
660-
->scalarNode('environment')->defaultNull()->end() // raven_handler, sentry_handler, datadog
646+
->scalarNode('environment')->defaultNull()->end() // raven_handler, sentry_handler
661647
->scalarNode('message_type')->defaultValue(0)->end() // error_log
662648
->arrayNode('tags') // loggly
663649
->beforeNormalization()
@@ -937,10 +923,6 @@ public function getConfigTreeBuilder()
937923
->ifTrue(function ($v) { return 'insightops' === $v['type'] && empty($v['token']); })
938924
->thenInvalid('The token has to be specified to use a InsightOpsHandler')
939925
->end()
940-
->validate()
941-
->ifTrue(function ($v) { return 'datadog' === $v['type'] && empty($v['token']); })
942-
->thenInvalid('The token (Api Key) has to be specified to use a DatadogHandler')
943-
->end()
944926
->validate()
945927
->ifTrue(function ($v) { return 'flowdock' === $v['type'] && empty($v['token']); })
946928
->thenInvalid('The token has to be specified to use a FlowdockHandler')

DependencyInjection/MonologExtension.php

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -884,30 +884,6 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
884884
$handler['bubble'],
885885
]);
886886
break;
887-
case 'datadog':
888-
$definition->setArguments([
889-
$handler['token'],
890-
$handler['region'] ? $handler['region'] : 'us',
891-
$handler['use_ssl'],
892-
$handler['level'],
893-
$handler['bubble'],
894-
]);
895-
896-
if (empty($handler['formatter'])) {
897-
$formatter = new Definition('Monolog\Formatter\DatadogFormatter', [
898-
$handler['app_name'],
899-
$handler['system_name'],
900-
$handler['environment'],
901-
isset($handler['source']) ? $handler['source'] : 'php',
902-
$handler['logger_name'],
903-
]);
904-
$formatterId = 'monolog.datadog.formatter';
905-
$formatter->setPublic(false);
906-
$container->setDefinition($formatterId, $formatter);
907-
908-
$definition->addMethodCall('setFormatter', [new Reference($formatterId)]);
909-
}
910-
break;
911887

912888
// Handlers using the constructor of AbstractHandler without adding their own arguments
913889
case 'browser_console':
@@ -1007,7 +983,6 @@ private function getHandlerClassByType($handlerType)
1007983
'redis' => 'Monolog\Handler\RedisHandler',
1008984
'predis' => 'Monolog\Handler\RedisHandler',
1009985
'insightops' => 'Monolog\Handler\InsightOpsHandler',
1010-
'datadog' => 'Monolog\Handler\DatadogHandler',
1011986
];
1012987

1013988
$v2HandlerTypesAdded = [

0 commit comments

Comments
 (0)