Do not lazy load class variables, as its not thread safe

DataDog · Jul 2, 2018 · 4eea97d · 4eea97d
1 parent a87126e
commit 4eea97d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/lib/ddtrace.rb b/lib/ddtrace.rb
@@ -14,6 +14,7 @@
 module Datadog
   @tracer = Tracer.new
   @registry = Registry.new
+  @configuration = Configuration.new(registry: @registry)
 
   # Default tracer that can be used as soon as +ddtrace+ is required:
   #
@@ -28,21 +29,9 @@ module Datadog
   #   tracer = Datadog::Tracer.new
   #   pin = Datadog::Pin.get_from(mypatchcomponent)
   #   pin.tracer = tracer
-
-  def self.tracer
-    @tracer
-  end
-
-  def self.registry
-    @registry
-  end
-
   class << self
-    attr_writer :configuration
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
+    attr_reader :tracer, :registry
+    attr_accessor :configuration
 
     def configure(target = configuration, opts = {})
       if target.is_a?(Configuration)

diff --git a/lib/ddtrace/configuration.rb b/lib/ddtrace/configuration.rb
@@ -8,7 +8,7 @@ class Configuration
     InvalidIntegrationError = Class.new(StandardError)
 
     def initialize(options = {})
-      @registry = options.fetch(:registry, Datadog.registry)
+      @registry = options.fetch(:registry) { Datadog.registry }
       @wrapped_registry = {}
     end