Merge pull request #104 from DataDog/anmarchenko/use_repository_name_…

…as_default_service_name

[CIVIS-3172] use repository name as default test service name

lib/datadog/ci/contrib/cucumber/configuration/settings.rb

@@ -4,6 +4,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/configuration"
 
 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
+                Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
+              end
             end
 
             # @deprecated Will be removed in 1.0

lib/datadog/ci/contrib/minitest/configuration/settings.rb

@@ -2,6 +2,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/configuration"
 
 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
+                Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
+              end
             end
 
             # @deprecated Will be removed in 1.0

lib/datadog/ci/contrib/rspec/configuration/settings.rb

@@ -2,6 +2,7 @@
 
 require_relative "../ext"
 require_relative "../../settings"
+require_relative "../../../utils/configuration"
 
 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
+                Utils::Configuration.fetch_service_name(Ext::DEFAULT_SERVICE_NAME)
+              end
             end
 
             # @deprecated Will be removed in 1.0

lib/datadog/ci/utils/configuration.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "git"
+
+module Datadog
+  module CI
+    module Utils
+      module Configuration
+        def self.fetch_service_name(default)
+          Datadog.configuration.service_without_fallback || Git.repository_name || default
+        end
+      end
+    end
+  end
+end

lib/datadog/ci/utils/git.rb

@@ -43,6 +43,31 @@ def self.relative_to_root(path)
           path.relative_path_from(git_root).to_s
         end
 
+        def self.repository_name
+          return @@repository_name if defined?(@@repository_name)
+
+          git_remote_url = exec_git_command("git ls-remote --get-url origin")
+
+          # return git repository name from remote url without .git extension
+          last_path_segment = git_remote_url.split("/").last if git_remote_url
+          @@repository_name = last_path_segment.gsub(".git", "") if last_path_segment
+          @@repository_name ||= current_folder_name
+        rescue => e
+          Datadog.logger.debug(
+            "Unable to get git remote: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+          )
+          @@repository_name = current_folder_name
+        end
+
+        def self.current_folder_name
+          root_folder = root
+          if root_folder.nil?
+            File.basename(Dir.pwd)
+          else
+            File.basename(root_folder)
+          end
+        end
+
         def self.exec_git_command(cmd)
           out, status = Open3.capture2e(cmd)
 

sig/datadog/ci/utils/configuration.rbs

@@ -0,0 +1,9 @@
+module Datadog
+  module CI
+    module Utils
+      module Configuration
+        def self.fetch_service_name: (String default) -> String
+      end
+    end
+  end
+end

sig/datadog/ci/utils/git.rbs

@@ -12,6 +12,10 @@ module Datadog
 
         def self.root: -> String?
 
+        def self.repository_name: -> String
+
+        def self.current_folder_name: -> String
+
         def self.relative_to_root: (String? path) -> String?
       end
     end