Added: analytics_enabled as option to Datadog::Configuration::Settings.

DataDog · Mar 14, 2019 · 4907261 · 4907261
1 parent c741381
commit 4907261
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/ddtrace/configuration/settings.rb b/lib/ddtrace/configuration/settings.rb
@@ -1,3 +1,4 @@
+require 'ddtrace/ext/analytics'
 require 'ddtrace/environment'
 require 'ddtrace/configuration/options'
 
@@ -8,6 +9,10 @@ class Settings
       extend Datadog::Environment::Helpers
       include Options
 
+      option  :analytics_enabled,
+              default: -> { env_to_bool(Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) },
+              lazy: true
+
       option :tracer, default: Tracer.new
 
       def initialize(options = {})

diff --git a/lib/ddtrace/ext/analytics.rb b/lib/ddtrace/ext/analytics.rb
@@ -2,6 +2,7 @@ module Datadog
   module Ext
     # Defines constants for trace analytics
     module Analytics
+      ENV_TRACE_ANALYTICS_ENABLED = 'DD_TRACE_ANALYTICS_ENABLED'.freeze
       # Tag for sample rate; used by agent to determine whether analytics event is emitted.
       TAG_SAMPLE_RATE = '_dd1.sr.eausr'.freeze
     end

diff --git a/spec/ddtrace/contrib/analytics_examples.rb b/spec/ddtrace/contrib/analytics_examples.rb
@@ -10,7 +10,7 @@
 
     context 'and the global flag is enabled' do
       around do |example|
-        ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
+        ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
           example.run
         end
       end
@@ -31,7 +31,7 @@
 
     context 'and the global flag is disabled' do
       around do |example|
-        ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
+        ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
           example.run
         end
       end
@@ -74,7 +74,7 @@
 
         context 'is explicitly enabled' do
           around do |example|
-            ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
+            ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
               example.run
             end
           end
@@ -84,7 +84,7 @@
 
         context 'is explicitly disabled' do
           around do |example|
-            ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
+            ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
               example.run
             end
           end
@@ -125,7 +125,7 @@
 
         context 'is explicitly enabled' do
           around do |example|
-            ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
+            ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'true') do
               example.run
             end
           end
@@ -135,7 +135,7 @@
 
         context 'is explicitly disabled' do
           around do |example|
-            ClimateControl.modify(Datadog::Configuration::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
+            ClimateControl.modify(Datadog::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED => 'false') do
               example.run
             end
           end