tracer.rb in ddtrace-0.11.0.beta1

- old
+ new

@@ -16,35 +16,17 @@
     module Sidekiq
       # Middleware is a Sidekiq server-side middleware which traces executed jobs
       class Tracer
         include Base
         register_as :sidekiq
-
-        option :enabled, default: true
-        option :sidekiq_service, default: 'sidekiq'
+        option :service_name, default: 'sidekiq'
         option :tracer, default: Datadog.tracer
-        option :debug, default: false
-        option :trace_agent_hostname, default: Writer::HOSTNAME
-        option :trace_agent_port, default: Writer::PORT
 
         def initialize(options = {})
-          # check if Rails configuration is available and use it to override
-          # Sidekiq defaults
-          base_config = Datadog.configuration[:sidekiq].merge(Datadog.configuration[:rails])
-          user_config = base_config.merge(options)
-          @tracer = user_config[:tracer]
-          @sidekiq_service = user_config[:sidekiq_service]
-
-          # set Tracer status
-          @tracer.enabled = user_config[:enabled]
-          Datadog::Tracer.debug_logging = user_config[:debug]
-
-          # configure the Tracer instance
-          @tracer.configure(
-            hostname: user_config[:trace_agent_hostname],
-            port: user_config[:trace_agent_port]
-          )
+          config = Datadog.configuration[:sidekiq].merge(options)
+          @tracer = config[:tracer]
+          @sidekiq_service = config[:service_name]
         end
 
         def call(worker, job, queue)
           # If class is wrapping something else, the interesting resource info
           # is the underlying, wrapped class, and not the wrapper.
@@ -84,10 +66,10 @@
             {}
           end
         end
 
         def sidekiq_service(resource)
-          worker_config(resource).fetch(:service, @sidekiq_service)
+          worker_config(resource).fetch(:service_name, @sidekiq_service)
         end
 
         def set_service_info(service)
           return if @tracer.services[service]
           @tracer.set_service_info(