Merge pull request #31 from DataDog/anmarchenko/fix_circular_references

Fix circular dependencies warnings
DataDog · Sep 14, 2023 · bfbd2d0 · bfbd2d0
2 parents 87fabd9 + 106cc7b
commit bfbd2d0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/lib/datadog/ci.rb b/lib/datadog/ci.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "ddtrace"
 require_relative "ci/version"
 
 require "datadog/core"

diff --git a/lib/datadog/ci/contrib/cucumber/integration.rb b/lib/datadog/ci/contrib/cucumber/integration.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "datadog/tracing/contrib"
+require "datadog/tracing/contrib/integration"
+
 require_relative "configuration/settings"
 require_relative "patcher"
 

diff --git a/lib/datadog/ci/contrib/minitest/integration.rb b/lib/datadog/ci/contrib/minitest/integration.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "datadog/tracing/contrib"
+require "datadog/tracing/contrib/integration"
+
 require_relative "configuration/settings"
 require_relative "patcher"
 

diff --git a/lib/datadog/ci/contrib/rspec/integration.rb b/lib/datadog/ci/contrib/rspec/integration.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "datadog/tracing/contrib"
 require "datadog/tracing/contrib/integration"
 
 require_relative "configuration/settings"

diff --git a/lib/datadog/ci/ext/environment/extractor.rb b/lib/datadog/ci/ext/environment/extractor.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../environment"
 require_relative "../git"
 require_relative "../../utils/git"
 require_relative "providers"