use repository name as default service name for contribs

DataDog · Jan 15, 2024 · 357ca28 · 357ca28
1 parent 4685361
commit 357ca28
Show file tree

Hide file tree

Showing 4 changed files with 520 additions and 492 deletions.
diff --git a/lib/datadog/ci/contrib/cucumber/configuration/settings.rb b/lib/datadog/ci/contrib/cucumber/configuration/settings.rb
@@ -4,6 +4,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/git"
 
 module Datadog
   module CI
@@ -21,7 +22,9 @@ class Settings < Datadog::CI::Contrib::Settings
 
             option :service_name do |o|
               o.type :string
-              o.default { Datadog.configuration.service_without_fallback || Ext::DEFAULT_SERVICE_NAME }
+              o.default do
+                Datadog.configuration.service_without_fallback || Utils::Git.repository_name || Ext::DEFAULT_SERVICE_NAME
+              end
             end
 
             # @deprecated Will be removed in 1.0

diff --git a/lib/datadog/ci/contrib/minitest/configuration/settings.rb b/lib/datadog/ci/contrib/minitest/configuration/settings.rb
@@ -2,6 +2,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/git"
 
 module Datadog
   module CI
@@ -19,7 +20,9 @@ class Settings < Datadog::CI::Contrib::Settings
 
             option :service_name do |o|
               o.type :string
-              o.default { Datadog.configuration.service_without_fallback || Ext::DEFAULT_SERVICE_NAME }
+              o.default do
+                Datadog.configuration.service_without_fallback || Utils::Git.repository_name || Ext::DEFAULT_SERVICE_NAME
+              end
             end
 
             # @deprecated Will be removed in 1.0

diff --git a/lib/datadog/ci/contrib/rspec/configuration/settings.rb b/lib/datadog/ci/contrib/rspec/configuration/settings.rb
@@ -2,6 +2,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/git"
 
 module Datadog
   module CI
@@ -19,7 +20,9 @@ class Settings < Datadog::CI::Contrib::Settings
 
             option :service_name do |o|
               o.type :string
-              o.default { Datadog.configuration.service_without_fallback || Ext::DEFAULT_SERVICE_NAME }
+              o.default do
+                Datadog.configuration.service_without_fallback || Utils::Git.repository_name || Ext::DEFAULT_SERVICE_NAME
+              end
             end
 
             # @deprecated Will be removed in 1.0