Add analytics_sample_rate to all integrations

lib/ddtrace/contrib/active_model_serializers/configuration/settings.rb

@@ -7,6 +7,14 @@ module ActiveModelSerializers
       module Configuration
         # Custom settings for the ActiveModelSerializers integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :service_name, default: Ext::SERVICE_NAME
           option :tracer, default: Datadog.tracer do |value|
             (value || Datadog.tracer).tap do |v|

lib/ddtrace/contrib/active_model_serializers/event.rb

@@ -1,4 +1,5 @@
 require 'ddtrace/ext/http'
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/active_support/notifications/event'
 require 'ddtrace/contrib/active_model_serializers/ext'
 
@@ -30,6 +31,11 @@ def configuration
           def process(span, event, _id, payload)
             span.service = configuration[:service_name]
 
+            # Set analytics sample rate
+            if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+              Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+            end
+
             # Set the resource name and serializer name
             res = resource(payload[:serializer])
             span.resource = res

lib/ddtrace/contrib/active_model_serializers/ext.rb

@@ -4,11 +4,11 @@ module ActiveModelSerializers
       # ActiveModelSerializers integration constants
       module Ext
         APP = 'active_model_serializers'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'active_model_serializers'.freeze
-
         SPAN_RENDER = 'active_model_serializers.render'.freeze
         SPAN_SERIALIZE = 'active_model_serializers.serialize'.freeze
-
         TAG_ADAPTER = 'active_model_serializers.adapter'.freeze
         TAG_SERIALIZER = 'active_model_serializers.serializer'.freeze
       end

lib/ddtrace/contrib/active_record/configuration/settings.rb

@@ -8,6 +8,14 @@ module ActiveRecord
       module Configuration
         # Custom settings for the ActiveRecord integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :orm_service_name
           option :service_name, depends_on: [:tracer] do |value|
             (value || Utils.adapter_name).tap do |service_name|

lib/ddtrace/contrib/active_record/events/instantiation.rb

@@ -1,3 +1,4 @@
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/active_record/ext'
 require 'ddtrace/contrib/active_record/event'
 
@@ -38,6 +39,12 @@ def process(span, event, _id, payload)
 
             span.resource = payload.fetch(:class_name)
             span.span_type = Ext::SPAN_TYPE_INSTANTIATION
+
+            # Set analytics sample rate
+            if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+              Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+            end
+
             span.set_tag(Ext::TAG_INSTANTIATION_CLASS_NAME, payload.fetch(:class_name))
             span.set_tag(Ext::TAG_INSTANTIATION_RECORD_COUNT, payload.fetch(:record_count))
           rescue StandardError => e

lib/ddtrace/contrib/active_record/events/sql.rb

@@ -1,4 +1,5 @@
 require 'ddtrace/ext/net'
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/active_record/ext'
 require 'ddtrace/contrib/active_record/event'
 
@@ -38,6 +39,11 @@ def process(span, event, _id, payload)
             span.resource = payload.fetch(:sql)
             span.span_type = Datadog::Ext::SQL::TYPE
 
+            # Set analytics sample rate
+            if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+              Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+            end
+
             # Find out if the SQL query has been cached in this request. This meta is really
             # helpful to users because some spans may have 0ns of duration because the query
             # is simply cached from memory, so the notification is fired with start == finish.

lib/ddtrace/contrib/active_record/ext.rb

@@ -4,13 +4,12 @@ module ActiveRecord
       # ActiveRecord integration constants
       module Ext
         APP = 'active_record'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_ACTIVE_RECORD_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTIVE_RECORD_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'active_record'.freeze
-
         SPAN_INSTANTIATION = 'active_record.instantiation'.freeze
         SPAN_SQL = 'active_record.sql'.freeze
-
         SPAN_TYPE_INSTANTIATION = 'custom'.freeze
-
         TAG_DB_CACHED = 'active_record.db.cached'.freeze
         TAG_DB_NAME = 'active_record.db.name'.freeze
         TAG_DB_VENDOR = 'active_record.db.vendor'.freeze

lib/ddtrace/contrib/analytics.rb

@@ -15,7 +15,8 @@ def enabled?(flag = nil)
       end
 
       def set_sample_rate(span, sample_rate)
-        span.set_metric(Datadog::Ext::Analytics::TAG_SAMPLE_RATE, sample_rate) unless sample_rate.nil?
+        return if span.nil? || sample_rate.nil?
+        span.set_metric(Datadog::Ext::Analytics::TAG_SAMPLE_RATE, sample_rate)
       end
     end
   end

lib/ddtrace/contrib/aws/configuration/settings.rb

@@ -7,6 +7,14 @@ module Aws
       module Configuration
         # Custom settings for the AWS integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :service_name, default: Ext::SERVICE_NAME
         end
       end

lib/ddtrace/contrib/aws/ext.rb

@@ -4,17 +4,16 @@ module Aws
       # AWS integration constants
       module Ext
         APP = 'aws'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_AWS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_AWS_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'aws'.freeze
-
         SPAN_COMMAND = 'aws.command'.freeze
-
         TAG_AGENT = 'aws.agent'.freeze
+        TAG_DEFAULT_AGENT = 'aws-sdk-ruby'.freeze
+        TAG_HOST = 'host'.freeze
         TAG_OPERATION = 'aws.operation'.freeze
-        TAG_REGION = 'aws.region'.freeze
         TAG_PATH = 'path'.freeze
-        TAG_HOST = 'host'.freeze
-
-        TAG_DEFAULT_AGENT = 'aws-sdk-ruby'.freeze
+        TAG_REGION = 'aws.region'.freeze
       end
     end
   end

lib/ddtrace/contrib/aws/instrumentation.rb

@@ -1,3 +1,4 @@
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/aws/ext'
 
 module Datadog
@@ -27,6 +28,12 @@ def annotate!(span, context)
           span.span_type = Datadog::Ext::AppTypes::WEB
           span.name = Ext::SPAN_COMMAND
           span.resource = context.safely(:resource)
+
+          # Set analytics sample rate
+          if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+            Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+          end
+
           span.set_tag(Ext::TAG_AGENT, Ext::TAG_DEFAULT_AGENT)
           span.set_tag(Ext::TAG_OPERATION, context.safely(:operation))
           span.set_tag(Ext::TAG_REGION, context.safely(:region))

lib/ddtrace/contrib/dalli/configuration/settings.rb

@@ -7,6 +7,14 @@ module Dalli
       module Configuration
         # Custom settings for the Dalli integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :service_name, default: Ext::SERVICE_NAME
         end
       end

lib/ddtrace/contrib/dalli/ext.rb

@@ -4,9 +4,10 @@ module Dalli
       # Dalli integration constants
       module Ext
         APP = 'dalli'.freeze
-        SERVICE_NAME = 'memcached'.freeze
-
+        ENV_ANALYTICS_ENABLED = 'DD_DALLI_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_DALLI_ANALYTICS_SAMPLE_RATE'.freeze
         QUANTIZE_MAX_CMD_LENGTH = 100
+        SERVICE_NAME = 'memcached'.freeze
         SPAN_COMMAND = 'memcached.command'.freeze
         TAG_COMMAND = 'memcached.command'.freeze
       end

lib/ddtrace/contrib/dalli/instrumentation.rb

@@ -1,5 +1,6 @@
 require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/net'
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/dalli/quantize'
 
 module Datadog
@@ -35,6 +36,12 @@ def request(op, *args)
               span.resource = op.to_s.upcase
               span.service = datadog_configuration[:service_name]
               span.span_type = Datadog::Ext::AppTypes::CACHE
+
+              # Set analytics sample rate
+              if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+                Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
+              end
+
               span.set_tag(Datadog::Ext::NET::TARGET_HOST, hostname)
               span.set_tag(Datadog::Ext::NET::TARGET_PORT, port)
               cmd = Datadog::Contrib::Dalli::Quantize.format_command(op, args)

lib/ddtrace/contrib/delayed_job/configuration/settings.rb

@@ -8,7 +8,7 @@ module Configuration
         # Custom settings for the DelayedJob integration
         class Settings < Contrib::Configuration::Settings
           option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENALBED, nil) },
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
                   lazy: true
 
           option  :analytics_sample_rate,

lib/ddtrace/contrib/delayed_job/ext.rb

@@ -4,7 +4,7 @@ module DelayedJob
       # DelayedJob integration constants
       module Ext
         APP = 'delayed_job'.freeze
-        ENV_ANALYTICS_ENALBED = 'DD_DELAYED_JOB_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_DELAYED_JOB_ANALYTICS_ENABLED'.freeze
         ENV_ANALYTICS_SAMPLE_RATE = 'DD_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'delayed_job'.freeze
         SPAN_JOB = 'delayed_job'.freeze

lib/ddtrace/contrib/elasticsearch/configuration/settings.rb

@@ -7,6 +7,14 @@ module Elasticsearch
       module Configuration
         # Custom settings for the Elasticsearch integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :quantize, default: {}
           option :service_name, default: Ext::SERVICE_NAME
         end

lib/ddtrace/contrib/elasticsearch/ext.rb

@@ -4,10 +4,10 @@ module Elasticsearch
       # Elasticsearch integration constants
       module Ext
         APP = 'elasticsearch'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'elasticsearch'.freeze
-
         SPAN_QUERY = 'elasticsearch.query'.freeze
-
         TAG_BODY = 'elasticsearch.body'.freeze
         TAG_METHOD = 'elasticsearch.method'.freeze
         TAG_PARAMS = 'elasticsearch.params'.freeze

lib/ddtrace/contrib/elasticsearch/patcher.rb

@@ -1,6 +1,7 @@
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/net'
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/elasticsearch/ext'
 
 module Datadog
@@ -83,11 +84,16 @@ def perform_request(*args)
                   params = JSON.generate(params) if params && !params.is_a?(String)
                   body = JSON.generate(body) if body && !body.is_a?(String)
 
+                  # Set analytics sample rate
+                  if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+                    Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
+                  end
+
                   span.set_tag(Datadog::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
                   span.set_tag(Datadog::Contrib::Elasticsearch::Ext::TAG_URL, url)
                   span.set_tag(Datadog::Contrib::Elasticsearch::Ext::TAG_PARAMS, params) if params
                   if body
-                    quantize_options = Datadog.configuration[:elasticsearch][:quantize]
+                    quantize_options = datadog_configuration[:quantize]
                     quantized_body = Datadog::Contrib::Elasticsearch::Quantize.format_body(body, quantize_options)
                     span.set_tag(Datadog::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
                   end
@@ -106,6 +112,10 @@ def perform_request(*args)
               end
               response
             end
+
+            def datadog_configuration
+              Datadog.configuration[:elasticsearch]
+            end
           end
         end
       end

lib/ddtrace/contrib/excon/configuration/settings.rb

@@ -7,6 +7,14 @@ module Excon
       module Configuration
         # Custom settings for the Excon integration
         class Settings < Contrib::Configuration::Settings
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :distributed_tracing, default: true
           option :error_handler, default: nil
           option :service_name, default: Ext::SERVICE_NAME

lib/ddtrace/contrib/excon/ext.rb

@@ -4,8 +4,9 @@ module Excon
       # Excon integration constants
       module Ext
         APP = 'excon'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_EXCON_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_EXCON_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'excon'.freeze
-
         SPAN_REQUEST = 'excon.request'.freeze
       end
     end

lib/ddtrace/contrib/excon/middleware.rb

@@ -3,6 +3,7 @@
 require 'ddtrace/ext/net'
 require 'ddtrace/ext/distributed'
 require 'ddtrace/propagation/http_propagator'
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/excon/ext'
 
 module Datadog
@@ -82,6 +83,14 @@ def tracer
           @options[:tracer]
         end
 
+        def analytics_enabled?
+          Contrib::Analytics.enabled?(@options[:analytics_enabled])
+        end
+
+        def analytics_sample_rate
+          @options[:analytics_sample_rate]
+        end
+
         def distributed_tracing?
           @options[:distributed_tracing] == true && tracer.enabled
         end
@@ -98,6 +107,12 @@ def annotate!(span, datum)
           span.resource = datum[:method].to_s.upcase
           span.service = service_name(datum)
           span.span_type = Datadog::Ext::HTTP::TYPE
+
+          # Set analytics sample rate
+          if analytics_enabled?
+            Contrib::Analytics.set_sample_rate(span, analytics_sample_rate)
+          end
+
           span.set_tag(Datadog::Ext::HTTP::URL, datum[:path])
           span.set_tag(Datadog::Ext::HTTP::METHOD, datum[:method].to_s.upcase)
           span.set_tag(Datadog::Ext::NET::TARGET_HOST, datum[:host])

lib/ddtrace/contrib/faraday/configuration/settings.rb

@@ -12,6 +12,14 @@ class Settings < Contrib::Configuration::Settings
             Datadog::Ext::HTTP::ERROR_RANGE.cover?(env[:status])
           end
 
+          option  :analytics_enabled,
+                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
+                  lazy: true
+
+          option  :analytics_sample_rate,
+                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
+                  lazy: true
+
           option :distributed_tracing, default: true
           option :error_handler, default: DEFAULT_ERROR_HANDLER
           option :service_name, default: Ext::SERVICE_NAME

lib/ddtrace/contrib/faraday/ext.rb

@@ -4,8 +4,9 @@ module Faraday
       # Faraday integration constants
       module Ext
         APP = 'faraday'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_FARADAY_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_FARADAY_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'faraday'.freeze
-
         SPAN_REQUEST = 'faraday.request'.freeze
       end
     end