ls-trace 0.1.2 → 0.2.0

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

@@ -4,8 +4,11 @@ module Datadog
       # Grape integration constants
       module Ext
         APP = 'grape'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_GRAPE_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_GRAPE_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_GRAPE_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPE_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_GRAPE_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPE_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_GRAPE_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'grape'.freeze
         SPAN_ENDPOINT_RENDER = 'grape.endpoint_render'.freeze
         SPAN_ENDPOINT_RUN = 'grape.endpoint_run'.freeze

data/lib/ddtrace/contrib/grape/integration.rb

@@ -9,18 +9,21 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('1.0')
+
         register_as :grape, auto_patch: true
 
         def self.version
           Gem.loaded_specs['grape'] && Gem.loaded_specs['grape'].version
         end
 
-        def self.present?
-          super && defined?(::Grape)
+        def self.loaded?
+          !defined?(::Grape).nil? \
+            && !defined?(::ActiveSupport::Notifications).nil?
         end
 
         def self.compatible?
-          super && defined?(::ActiveSupport::Notifications)
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

data/lib/ddtrace/contrib/grape/patcher.rb

@@ -14,24 +14,18 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:grape)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:grape) do
-            begin
-              # Patch endpoints
-              ::Grape::Endpoint.send(:include, Instrumentation)
+          # Patch endpoints
+          ::Grape::Endpoint.send(:include, Instrumentation)
 
-              add_pin!
+          add_pin!
 
-              # Subscribe to ActiveSupport events
-              Datadog::Contrib::Grape::Endpoint.subscribe
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Grape integration: #{e}")
-            end
-          end
+          # Subscribe to ActiveSupport events
+          Datadog::Contrib::Grape::Endpoint.subscribe
         end
 
         def add_pin!
@@ -40,7 +34,7 @@ module Datadog
             get_option(:service_name),
             app: Ext::APP,
             app_type: Datadog::Ext::AppTypes::WEB,
-            tracer: get_option(:tracer)
+            tracer: -> { get_option(:tracer) }
           )
           pin.onto(::Grape)
         end
@@ -69,7 +63,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

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

@@ -8,13 +8,18 @@ module Datadog
       module Configuration
         # Custom settings for the GraphQL integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], nil) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

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

@@ -4,8 +4,11 @@ module Datadog
       # GraphQL integration constants
       module Ext
         APP = 'ruby-graphql'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_GRAPHQL_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_GRAPHQL_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_GRAPHQL_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPHQL_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_GRAPHQL_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPHQL_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_GRAPHQL_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'ruby-graphql'.freeze
       end
     end

data/lib/ddtrace/contrib/graphql/integration.rb

@@ -9,20 +9,21 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('1.7.9')
+
         register_as :graphql, auto_patch: true
 
         def self.version
           Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version
         end
 
-        def self.present?
-          super && defined?(::GraphQL)
+        def self.loaded?
+          !defined?(::GraphQL).nil? \
+            && !defined?(::GraphQL::Tracing::DataDogTracing).nil?
         end
 
         def self.compatible?
-          super \
-            && defined?(::GraphQL::Tracing::DataDogTracing) \
-            && version >= Gem::Version.new('1.7.9')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

data/lib/ddtrace/contrib/graphql/patcher.rb

@@ -9,26 +9,19 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:graphql)
+        def target_version
+          Integration.version
         end
 
         def patch
           return if get_option(:schemas).nil?
 
-          do_once(:graphql) do
-            begin
-              require 'ddtrace/ext/app_types'
-              require 'ddtrace/ext/http'
-              get_option(:schemas).each { |s| patch_schema!(s) }
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply GraphQL integration: #{e}")
-            end
-          end
+          require 'ddtrace/ext/app_types'
+          require 'ddtrace/ext/http'
+          get_option(:schemas).each { |s| patch_schema!(s) }
         end
 
         def patch_schema!(schema)
-          tracer = get_option(:tracer)
           service_name = get_option(:service_name)
           analytics_enabled = Contrib::Analytics.enabled?(get_option(:analytics_enabled))
           analytics_sample_rate = get_option(:analytics_sample_rate)
@@ -36,7 +29,9 @@ module Datadog
           if schema.respond_to?(:use)
             schema.use(
               ::GraphQL::Tracing::DataDogTracing,
-              tracer: tracer,
+              # By default, Tracing::DataDogTracing indirectly delegates the tracer instance
+              # to +Datadog.tracer+. If we provide a tracer argument here it will be eagerly cached,
+              # and Tracing::DataDogTracing will send traces to a stale tracer instance.
               service: service_name,
               analytics_enabled: analytics_enabled,
               analytics_sample_rate: analytics_sample_rate
@@ -45,7 +40,9 @@ module Datadog
             schema.define do
               use(
                 ::GraphQL::Tracing::DataDogTracing,
-                tracer: tracer,
+                # By default, Tracing::DataDogTracing indirectly delegates the tracer instance
+                # to +Datadog.tracer+. If we provide a tracer argument here it will be eagerly cached,
+                # and Tracing::DataDogTracing will send traces to a stale tracer instance.
                 service: service_name,
                 analytics_enabled: analytics_enabled,
                 analytics_sample_rate: analytics_sample_rate

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

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the gRPC integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

data/lib/ddtrace/contrib/grpc/datadog_interceptor.rb

@@ -38,7 +38,7 @@ module Datadog
               service_name,
               app: Ext::APP,
               app_type: Datadog::Ext::AppTypes::WEB,
-              tracer: tracer
+              tracer: -> { datadog_configuration[:tracer] }
             ).tap do |pin|
               yield(pin) if block_given?
               pin.onto(self)

data/lib/ddtrace/contrib/grpc/datadog_interceptor/client.rb

@@ -30,9 +30,7 @@ module Datadog
           private
 
           def annotate!(span, metadata)
-            metadata.each do |header, value|
-              span.set_tag(header, value)
-            end
+            span.set_tags(metadata)
 
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
@@ -40,7 +38,7 @@ module Datadog
             Datadog::GRPCPropagator
               .inject!(span.context, metadata)
           rescue StandardError => e
-            Datadog::Tracer.log.debug("GRPC client trace failed: #{e}")
+            Datadog.logger.debug("GRPC client trace failed: #{e}")
           end
 
           def format_resource(proto_method)

data/lib/ddtrace/contrib/grpc/datadog_interceptor/server.rb

@@ -35,7 +35,7 @@ module Datadog
             tracer.provider.context = Datadog::GRPCPropagator
                                       .extract(metadata)
           rescue StandardError => e
-            Datadog::Tracer.log.debug(
+            Datadog.logger.debug(
               "unable to propagate GRPC metadata to context: #{e}"
             )
           end
@@ -48,8 +48,11 @@ module Datadog
 
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
           rescue StandardError => e
-            Datadog::Tracer.log.debug("GRPC client trace failed: #{e}")
+            Datadog.logger.debug("GRPC client trace failed: #{e}")
           end
 
           def reserved_headers

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

@@ -4,8 +4,11 @@ module Datadog
       # gRPC integration constants
       module Ext
         APP = 'grpc'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_GRPC_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_GRPC_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_GRPC_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_GRPC_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'grpc'.freeze
         SPAN_CLIENT = 'grpc.client'.freeze
         SPAN_SERVICE = 'grpc.service'.freeze

data/lib/ddtrace/contrib/grpc/integration.rb

@@ -9,18 +9,20 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('1.7.0')
+
         register_as :grpc, auto_patch: true
 
         def self.version
           Gem.loaded_specs['grpc'] && Gem.loaded_specs['grpc'].version
         end
 
-        def self.present?
-          super && defined?(::GRPC)
+        def self.loaded?
+          !defined?(::GRPC).nil?
         end
 
         def self.compatible?
-          super && version >= Gem::Version.new('0.10.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

data/lib/ddtrace/contrib/grpc/patcher.rb

@@ -10,24 +10,18 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:grpc)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:grpc) do
-            begin
-              require 'ddtrace/propagation/grpc_propagator'
-              require 'ddtrace/contrib/grpc/datadog_interceptor'
-              require 'ddtrace/contrib/grpc/intercept_with_datadog'
+          require 'ddtrace/propagation/grpc_propagator'
+          require 'ddtrace/contrib/grpc/datadog_interceptor'
+          require 'ddtrace/contrib/grpc/intercept_with_datadog'
 
-              add_pin!
+          add_pin!
 
-              prepend_interceptor
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply gRPC integration: #{e}")
-            end
-          end
+          prepend_interceptor
         end
 
         def add_pin!
@@ -35,7 +29,7 @@ module Datadog
             get_option(:service_name),
             app: Ext::APP,
             app_type: Datadog::Ext::AppTypes::WEB,
-            tracer: get_option(:tracer)
+            tracer: -> { get_option(:tracer) }
           ).onto(::GRPC)
         end
 
@@ -58,17 +52,13 @@ module Datadog
             Upgrade to the configuration API using the migration guide here:
             https://github.com/DataDog/dd-trace-rb/releases/tag/v0.11.0).freeze
 
-          def tracer=(tracer)
-            Datadog.configuration[:grpc][:tracer] = tracer
-          end
-
           def service_name=(service_name)
             Datadog.configuration[:grpc][:service_name] = service_name
           end
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

data/lib/ddtrace/contrib/http/circuit_breaker.rb

@@ -4,8 +4,8 @@ module Datadog
       # HTTP integration circuit breaker behavior
       # For avoiding recursive traces.
       module CircuitBreaker
-        def should_skip_tracing?(req, address, port, tracer)
-          return true if datadog_http_request?(req, address, port, tracer)
+        def should_skip_tracing?(request, tracer)
+          return true if datadog_http_request?(request)
 
           # we don't want a "shotgun" effect with two nested traces for one
           # logical get, and request is likely to call itself recursively
@@ -16,38 +16,14 @@ module Datadog
         end
 
         # We don't want to trace our own call to the API (they use net/http)
-        # TODO: We don't want this kind of coupling with the transport.
+        # TODO: We don't want this kind of soft-check on HTTP requests.
         #       Remove this when transport implements its own "skip tracing" mechanism.
-        def datadog_http_request?(req, address, port, tracer)
-          transport = tracer.writer.transport
-
-          transport_hostname = nil
-          transport_port = nil
-
-          # Get settings from transport, if available.
-          case transport
-          when Datadog::Transport::HTTP::Client
-            adapter = transport.current_api.adapter
-            if adapter.is_a?(Datadog::Transport::HTTP::Adapters::Net)
-              transport_hostname = adapter.hostname.to_s
-              transport_port = adapter.port.to_i
-            end
-          end
-
-          # When we know the host & port (from the URI) we use it, else (most-likely
-          # called with a block) rely on the URL at the end.
-          if req.respond_to?(:uri) && req.uri
-            if req.uri.host.to_s == transport_hostname &&
-               req.uri.port.to_i == transport_port
-              return true
-            end
-          elsif address && port &&
-                address.to_s == transport_hostname &&
-                port.to_i == transport_port
-            return true
+        def datadog_http_request?(request)
+          if request[Datadog::Ext::Transport::HTTP::HEADER_META_TRACER_VERSION]
+            true
+          else
+            false
           end
-
-          false
         end
 
         def should_skip_distributed_tracing?(pin)

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

@@ -7,18 +7,24 @@ module Datadog
       module Configuration
         # Custom settings for the HTTP integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 
           option :distributed_tracing, default: true
           option :service_name, default: Ext::SERVICE_NAME
+          option :split_by_domain, default: false
         end
       end
     end