Merge pull request #2826 from mscrivo/scrivo/fix-circular-requires

DataDog · May 5, 2023 · 99997b7 · 99997b7
2 parents a0b2213 + cd3a5e4
commit 99997b7
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 28 deletions.
diff --git a/lib/datadog/tracing/buffer.rb b/lib/datadog/tracing/buffer.rb
@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative '../core/environment/ext'
 require_relative '../core/buffer/thread_safe'
 require_relative '../core/buffer/cruby'

diff --git a/lib/datadog/tracing/contrib/patcher.rb b/lib/datadog/tracing/contrib/patcher.rb
@@ -1,4 +1,3 @@
-require_relative '../../core'
 require_relative '../../core/utils/only_once'
 
 module Datadog

diff --git a/lib/datadog/tracing/contrib/roda/patcher.rb b/lib/datadog/tracing/contrib/roda/patcher.rb
@@ -2,7 +2,7 @@
 
 # typed: ignore
 
-require_relative 'patcher'
+require_relative '../patcher'
 require_relative 'ext'
 require_relative 'instrumentation'
 

diff --git a/lib/datadog/tracing/contrib/status_code_matcher.rb b/lib/datadog/tracing/contrib/status_code_matcher.rb
@@ -1,6 +1,5 @@
 require 'set'
 
-require_relative '../../core'
 require_relative '../metadata/ext'
 
 module Datadog

diff --git a/lib/datadog/tracing/correlation.rb b/lib/datadog/tracing/correlation.rb
@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative 'utils'
 require_relative 'metadata/ext'
 

diff --git a/lib/datadog/tracing/event.rb b/lib/datadog/tracing/event.rb
@@ -1,5 +1,3 @@
-require_relative '../core'
-
 module Datadog
   module Tracing
     # Event behavior and DSL

diff --git a/lib/datadog/tracing/pipeline.rb b/lib/datadog/tracing/pipeline.rb
@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'pipeline/span_filter'
 require_relative 'pipeline/span_processor'
 

diff --git a/lib/datadog/tracing/runtime/metrics.rb b/lib/datadog/tracing/runtime/metrics.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../core'
-
 module Datadog
   module Tracing
     module Runtime

diff --git a/lib/datadog/tracing/sampling/rate_by_service_sampler.rb b/lib/datadog/tracing/sampling/rate_by_service_sampler.rb
@@ -1,4 +1,3 @@
-require_relative '../../core'
 require_relative 'rate_by_key_sampler'
 
 module Datadog

diff --git a/lib/datadog/tracing/sampling/rate_sampler.rb b/lib/datadog/tracing/sampling/rate_sampler.rb
@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'sampler'
 require_relative '../utils'
 

diff --git a/lib/datadog/tracing/sampling/rule.rb b/lib/datadog/tracing/sampling/rule.rb
@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'matcher'
 require_relative 'rate_sampler'
 

diff --git a/lib/datadog/tracing/sampling/rule_sampler.rb b/lib/datadog/tracing/sampling/rule_sampler.rb
@@ -1,5 +1,3 @@
-require_relative '../../core'
-
 require_relative 'ext'
 require_relative 'rate_limiter'
 require_relative 'rule'

diff --git a/lib/datadog/tracing/span_operation.rb b/lib/datadog/tracing/span_operation.rb
@@ -1,6 +1,5 @@
 require 'time'
 
-require_relative '../core'
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
 require_relative '../core/utils/time'

diff --git a/lib/datadog/tracing/sync_writer.rb b/lib/datadog/tracing/sync_writer.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../core'
-
 require_relative 'pipeline'
 require_relative 'runtime/metrics'
 require_relative 'writer'

diff --git a/lib/datadog/tracing/trace_operation.rb b/lib/datadog/tracing/trace_operation.rb
@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
 

diff --git a/lib/datadog/tracing/tracer.rb b/lib/datadog/tracing/tracer.rb
@@ -1,4 +1,3 @@
-require_relative '../core'
 require_relative '../core/environment/ext'
 require_relative '../core/environment/socket'
 

diff --git a/lib/datadog/tracing/workers.rb b/lib/datadog/tracing/workers.rb
@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'buffer'
 require_relative 'pipeline'
 

diff --git a/lib/datadog/tracing/workers/trace_writer.rb b/lib/datadog/tracing/workers/trace_writer.rb
@@ -1,4 +1,3 @@
-require_relative '../../core'
 require_relative '../../core/worker'
 require_relative '../../core/workers/async'
 require_relative '../../core/workers/polling'

diff --git a/lib/datadog/tracing/writer.rb b/lib/datadog/tracing/writer.rb
@@ -1,5 +1,3 @@
-require_relative '../core'
-
 require_relative 'event'
 require_relative 'runtime/metrics'
 require_relative 'workers'