ddtrace 0.20.0 → 0.21.0

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -41,6 +41,7 @@ module Datadog
                   # If data is a string, it is a literal template and we don't
                   # want to record it.
                   span.set_tag(Ext::TAG_TEMPLATE_NAME, data) if data.is_a? Symbol
+
                   output = super
                 end
               else

data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb

@@ -1,3 +1,4 @@
+require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/sinatra/ext'
 require 'ddtrace/contrib/sinatra/env'
 require 'ddtrace/contrib/sinatra/headers'
@@ -37,6 +38,9 @@ module Datadog
               span.set_tag(name, value) if span.get_tag(name).nil?
             end
 
+            # Set analytics sample rate
+            Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+
             [status, headers, response_body]
           end
         end
@@ -47,6 +51,14 @@ module Datadog
           configuration[:tracer]
         end
 
+        def analytics_enabled?
+          Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+        end
+
+        def analytics_sample_rate
+          configuration[:analytics_sample_rate]
+        end
+
         def configuration
           Datadog.configuration[:sinatra]
         end

data/lib/ddtrace/contrib/sucker_punch/configuration/settings.rb

@@ -8,7 +8,7 @@ module Datadog
         # Custom settings for the SuckerPunch 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,

data/lib/ddtrace/contrib/sucker_punch/ext.rb

@@ -4,7 +4,7 @@ module Datadog
       # SuckerPunch integration constants
       module Ext
         APP = 'sucker_punch'.freeze
-        ENV_ANALYTICS_ENALBED = 'DD_SUCKER_PUNCH_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_SUCKER_PUNCH_ANALYTICS_ENABLED'.freeze
         ENV_ANALYTICS_SAMPLE_RATE = 'DD_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'sucker_punch'.freeze
         SPAN_PERFORM = 'sucker_punch.perform'.freeze

data/lib/ddtrace/environment.rb

@@ -0,0 +1,15 @@
+module Datadog
+  # Namespace for handling application environment
+  module Environment
+    # Defines helper methods for environment
+    module Helpers
+      def env_to_bool(var, default = nil)
+        ENV.key?(var) ? ENV[var].to_s.downcase == 'true' : default
+      end
+
+      def env_to_float(var, default = nil)
+        ENV.key?(var) ? ENV[var].to_f : default
+      end
+    end
+  end
+end

data/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

data/lib/ddtrace/opentracer/global_tracer.rb

@@ -6,7 +6,7 @@ module Datadog
         super.tap do
           if tracer.class <= Datadog::OpenTracer::Tracer
             # Update the Datadog global tracer, too.
-            Datadog.instance_variable_set(:@tracer, tracer.datadog_tracer)
+            Datadog.configuration.tracer = tracer.datadog_tracer
           end
         end
       end

data/lib/ddtrace/propagation/distributed_headers.rb

@@ -16,7 +16,8 @@ module Datadog
       return true if origin == 'synthetics' && trace_id
 
       # Sampling priority and origin are optional.
-      trace_id && parent_id
+      # DEV: We want to explicitly return true/false here
+      trace_id && parent_id ? true : false
     end
 
     def trace_id
@@ -29,11 +30,19 @@ module Datadog
 
     def sampling_priority
       hdr = header(HTTP_HEADER_SAMPLING_PRIORITY)
+
       # It's important to make a difference between no header,
       # and a header defined to zero.
-      return unless hdr
+      return if hdr.nil?
+
+      # Convert header to an integer
       value = hdr.to_i
-      return if value < 0
+
+      # Ensure the parsed number is the same as the original string value
+      # e.g. We want to make sure to throw away `'nan'.to_i == 0`
+      # DEV: Ruby `.to_i` will return `0` if a number could not be parsed
+      return unless value.to_s == hdr.to_s
+
       value
     end
 
@@ -53,7 +62,8 @@ module Datadog
 
     def id(header)
       value = header(header).to_i
-      return if value.zero? || value >= Span::MAX_ID
+      # Zero or greater than max allowed value of 2**64
+      return if value.zero? || value > Span::EXTERNAL_MAX_ID
       value < 0 ? value + 0x1_0000_0000_0000_0000 : value
     end
   end

data/lib/ddtrace/span.rb

@@ -20,6 +20,10 @@ module Datadog
     # and IDs need to be easy to port across various languages and platforms.
     MAX_ID = 2**63
 
+    # While we only generate 63-bit integers due to limitations in other languages, we support
+    # parsing 64-bit integers for distributed tracing since an upstream system may generate one
+    EXTERNAL_MAX_ID = 2**64
+
     attr_accessor :name, :service, :resource, :span_type,
                   :start_time, :end_time,
                   :span_id, :trace_id, :parent_id,

data/lib/ddtrace/tracer.rb

@@ -53,8 +53,13 @@ module Datadog
     end
 
     # Activate the debug mode providing more information related to tracer usage
+    # Default to Warn level unless using custom logger
     def self.debug_logging=(value)
-      log.level = value ? Logger::DEBUG : Logger::WARN
+      if value
+        log.level = Logger::DEBUG
+      elsif log.is_a?(Datadog::Logger)
+        log.level = Logger::WARN
+      end
     end
 
     # Return if the debug mode is activated or not

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 20
+    MINOR = 21
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -302,11 +302,15 @@ files:
 - lib/ddtrace/augmentation/method_wrapping.rb
 - lib/ddtrace/augmentation/shim.rb
 - lib/ddtrace/buffer.rb
-- lib/ddtrace/configurable.rb
 - lib/ddtrace/configuration.rb
+- lib/ddtrace/configuration/dependency_resolver.rb
+- lib/ddtrace/configuration/option.rb
+- lib/ddtrace/configuration/option_definition.rb
+- lib/ddtrace/configuration/option_definition_set.rb
+- lib/ddtrace/configuration/option_set.rb
+- lib/ddtrace/configuration/options.rb
 - lib/ddtrace/configuration/pin_setup.rb
-- lib/ddtrace/configuration/proxy.rb
-- lib/ddtrace/configuration/resolver.rb
+- lib/ddtrace/configuration/settings.rb
 - lib/ddtrace/context.rb
 - lib/ddtrace/context_flush.rb
 - lib/ddtrace/contrib/active_model_serializers/configuration/settings.rb
@@ -338,7 +342,6 @@ files:
 - lib/ddtrace/contrib/aws/parsed_context.rb
 - lib/ddtrace/contrib/aws/patcher.rb
 - lib/ddtrace/contrib/aws/services.rb
-- lib/ddtrace/contrib/base.rb
 - lib/ddtrace/contrib/concurrent_ruby/configuration/settings.rb
 - lib/ddtrace/contrib/concurrent_ruby/context_composite_executor_service.rb
 - lib/ddtrace/contrib/concurrent_ruby/ext.rb
@@ -346,11 +349,6 @@ files:
 - lib/ddtrace/contrib/concurrent_ruby/integration.rb
 - lib/ddtrace/contrib/concurrent_ruby/patcher.rb
 - lib/ddtrace/contrib/configurable.rb
-- lib/ddtrace/contrib/configuration/option.rb
-- lib/ddtrace/contrib/configuration/option_definition.rb
-- lib/ddtrace/contrib/configuration/option_definition_set.rb
-- lib/ddtrace/contrib/configuration/option_set.rb
-- lib/ddtrace/contrib/configuration/options.rb
 - lib/ddtrace/contrib/configuration/resolver.rb
 - lib/ddtrace/contrib/configuration/settings.rb
 - lib/ddtrace/contrib/dalli/configuration/settings.rb
@@ -374,6 +372,7 @@ files:
 - lib/ddtrace/contrib/excon/integration.rb
 - lib/ddtrace/contrib/excon/middleware.rb
 - lib/ddtrace/contrib/excon/patcher.rb
+- lib/ddtrace/contrib/extensions.rb
 - lib/ddtrace/contrib/faraday/configuration/settings.rb
 - lib/ddtrace/contrib/faraday/ext.rb
 - lib/ddtrace/contrib/faraday/integration.rb
@@ -411,9 +410,9 @@ files:
 - lib/ddtrace/contrib/mongodb/parsers.rb
 - lib/ddtrace/contrib/mongodb/patcher.rb
 - lib/ddtrace/contrib/mongodb/subscribers.rb
-- lib/ddtrace/contrib/mysql2/client.rb
 - lib/ddtrace/contrib/mysql2/configuration/settings.rb
 - lib/ddtrace/contrib/mysql2/ext.rb
+- lib/ddtrace/contrib/mysql2/instrumentation.rb
 - lib/ddtrace/contrib/mysql2/integration.rb
 - lib/ddtrace/contrib/mysql2/patcher.rb
 - lib/ddtrace/contrib/patchable.rb
@@ -457,6 +456,7 @@ files:
 - lib/ddtrace/contrib/redis/quantize.rb
 - lib/ddtrace/contrib/redis/tags.rb
 - lib/ddtrace/contrib/registerable.rb
+- lib/ddtrace/contrib/registry.rb
 - lib/ddtrace/contrib/resque/configuration/settings.rb
 - lib/ddtrace/contrib/resque/ext.rb
 - lib/ddtrace/contrib/resque/integration.rb
@@ -502,6 +502,7 @@ files:
 - lib/ddtrace/contrib/sucker_punch/patcher.rb
 - lib/ddtrace/correlation.rb
 - lib/ddtrace/encoding.rb
+- lib/ddtrace/environment.rb
 - lib/ddtrace/error.rb
 - lib/ddtrace/ext/analytics.rb
 - lib/ddtrace/ext/app_types.rb
@@ -540,8 +541,6 @@ files:
 - lib/ddtrace/provider.rb
 - lib/ddtrace/quantization/hash.rb
 - lib/ddtrace/quantization/http.rb
-- lib/ddtrace/registry.rb
-- lib/ddtrace/registry/registerable.rb
 - lib/ddtrace/sampler.rb
 - lib/ddtrace/span.rb
 - lib/ddtrace/sync_writer.rb
@@ -575,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/ddtrace/configurable.rb

@@ -1,83 +0,0 @@
-module Datadog
-  InvalidOptionError = Class.new(StandardError)
-  # Configurable provides configuration methods for a given class/module
-  module Configurable
-    IDENTITY = ->(x) { x }
-
-    def self.included(base)
-      base.singleton_class.send(:include, ClassMethods)
-    end
-
-    # ClassMethods
-    module ClassMethods
-      def set_option(name, value)
-        __assert_valid!(name)
-
-        __options[name][:value] = __options[name][:setter].call(value)
-        __options[name][:set_flag] = true
-      end
-
-      def get_option(name)
-        __assert_valid!(name)
-
-        return __default_value(name) unless __options[name][:set_flag]
-
-        __options[name][:value]
-      end
-
-      def to_h
-        __options.each_with_object({}) do |(key, _), hash|
-          hash[key] = get_option(key)
-        end
-      end
-
-      def reset_options!
-        __options.each do |name, meta|
-          set_option(name, meta[:default])
-        end
-      end
-
-      def sorted_options
-        Configuration::Resolver.new(__dependency_graph).call
-      end
-
-      private
-
-      def option(name, meta = {}, &block)
-        name = name.to_sym
-        meta[:setter] ||= (block || IDENTITY)
-        meta[:depends_on] ||= []
-        meta[:lazy] ||= false
-        __options[name] = meta
-      end
-
-      def __options
-        @__options ||= {}
-      end
-
-      def __assert_valid!(name)
-        return if __options.key?(name)
-        raise(InvalidOptionError, "#{__pretty_name} doesn't have the option: #{name}")
-      end
-
-      def __pretty_name
-        entry = Datadog.registry.find { |el| el.klass == self }
-
-        return entry.name if entry
-
-        to_s
-      end
-
-      def __dependency_graph
-        __options.each_with_object({}) do |(name, meta), graph|
-          graph[name] = meta[:depends_on]
-        end
-      end
-
-      def __default_value(name)
-        return __options[name][:default].call if __options[name][:lazy]
-        __options[name][:default]
-      end
-    end
-  end
-end

data/lib/ddtrace/configuration/proxy.rb

@@ -1,25 +0,0 @@
-require 'forwardable'
-
-module Datadog
-  class Configuration
-    # Proxy provides a hash-like interface for fetching/setting configurations
-    class Proxy
-      extend Forwardable
-
-      def initialize(integration)
-        @integration = integration
-      end
-
-      def [](param)
-        @integration.get_option(param)
-      end
-
-      def []=(param, value)
-        @integration.set_option(param, value)
-      end
-
-      def_delegators :@integration, :to_h, :reset_options!
-      def_delegators :to_h, :to_hash, :merge
-    end
-  end
-end

data/lib/ddtrace/contrib/base.rb

@@ -1,16 +0,0 @@
-require 'ddtrace/configurable'
-require 'ddtrace/patcher'
-require 'ddtrace/registry/registerable'
-
-module Datadog
-  module Contrib
-    # Base provides features that are shared across all integrations
-    module Base
-      def self.included(base)
-        base.send(:include, Registry::Registerable)
-        base.send(:include, Datadog::Configurable)
-        base.send(:include, Datadog::Patcher)
-      end
-    end
-  end
-end

data/lib/ddtrace/contrib/configuration/option.rb

@@ -1,33 +0,0 @@
-module Datadog
-  module Contrib
-    module Configuration
-      # Represents an instance of an integration configuration option
-      class Option
-        attr_reader \
-          :definition
-
-        def initialize(definition, context)
-          @definition = definition
-          @context = context
-          @value = nil
-          @is_set = false
-        end
-
-        def set(value)
-          @value = @context.instance_exec(value, &definition.setter).tap do
-            @is_set = true
-          end
-        end
-
-        def get
-          return definition.default_value unless @is_set
-          @value
-        end
-
-        def reset
-          set(definition.default_value)
-        end
-      end
-    end
-  end
-end

data/lib/ddtrace/contrib/configuration/option_definition.rb

@@ -1,29 +0,0 @@
-module Datadog
-  module Contrib
-    module Configuration
-      # Represents a definition for an integration configuration option
-      class OptionDefinition
-        IDENTITY = ->(x) { x }
-
-        attr_reader \
-          :default,
-          :depends_on,
-          :lazy,
-          :name,
-          :setter
-
-        def initialize(name, meta = {}, &block)
-          @default = meta[:default]
-          @depends_on = meta[:depends_on] || []
-          @lazy = meta[:lazy] || false
-          @name = name.to_sym
-          @setter = meta[:setter] || block || IDENTITY
-        end
-
-        def default_value
-          lazy ? @default.call : @default
-        end
-      end
-    end
-  end
-end