Moved "instrument" to config root level (#188)

ekino · Jun 15, 2018 · 8cd72e0 · 8cd72e0
1 parent f9b3ae7
commit 8cd72e0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Changelog
 
-## v2.0.0
+
+
+## v2.0.0-beta3
+
+### Changed
+
+- Moved "instrument" to the root level
+
+### Fixed
+
+- Bug where logging deprecations did not work. 
+
+## v2.0.0-beta2
+
+### Changed
+
+- Add default "deployment_names"
+- Updated interface variable names to match the NewRelic extension.
+
+
+## v2.0.0-beta1
 
 ### Added
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -93,11 +93,11 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->end()
                         ->end()
                         ->scalarNode('using_symfony_cache')->defaultFalse()->end()
-                        ->booleanNode('instrument')
-                            ->defaultFalse()
-                        ->end()
                     ->end()
                 ->end()
+                ->booleanNode('instrument')
+                    ->defaultFalse()
+                ->end()
                 ->arrayNode('monolog')
                     ->canBeEnabled()
                     ->fixXmlConfig('channel')

diff --git a/DependencyInjection/EkinoNewRelicExtension.php b/DependencyInjection/EkinoNewRelicExtension.php
@@ -91,7 +91,7 @@ public function load(array $configs, ContainerBuilder $container): void
             $container->getDefinition(ResponseListener::class)
                 ->setArguments(
                     [
-                        '$instrument' => $config['http']['instrument'],
+                        '$instrument' => $config['instrument'],
                         '$symfonyCache' => $config['http']['using_symfony_cache'],
                     ]
                 );

diff --git a/README.md b/README.md
@@ -87,12 +87,12 @@ ekino_new_relic:
     twig: true                            # Allows you to disable twig integration (falls back to class_exists(\Twig_Environment::class))
     exceptions: true                      # If true, sends exceptions to New Relic (default: true)
     deprecations: true                    # If true, reports deprecations to New Relic (default: true)
+    instrument: false                     # If true, uses enhanced New Relic RUM instrumentation (see below) (default: false)
     http:
         enabled: true
         using_symfony_cache: false        # Symfony HTTP cache (see below) (default: false)
         transaction_naming: route         # route, controller or service (see below)
         transaction_naming_service: ~     # Transaction naming service (see below)
-        instrument: false                 # If true, uses enhanced New Relic RUM instrumentation (see below) (default: false)
         ignored_routes: []                # No transaction recorded for this routes
         ignored_paths: []                 # No transaction recorded for this paths
     monolog: