[Tracer] Fix git metadata retrieval (#6444)

DataDog · Dec 16, 2024 · 4288ae4 · 4288ae4
1 parent 7544783
commit 4288ae4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tracer/src/Datadog.Trace/Configuration/TracerSettings.cs b/tracer/src/Datadog.Trace/Configuration/TracerSettings.cs
@@ -211,7 +211,7 @@ _ when x.ToBoolean() is { } boolean => boolean,
                               .AsString();
 
             // DD_GIT_REPOSITORY_URL has precedence over DD_TAGS
-            GitRepositoryUrl = GetExplicitSettingOrTag(GitRepositoryUrl, globalTags, Ci.Tags.CommonTags.GitCommit, ConfigurationKeys.GitRepositoryUrl);
+            GitRepositoryUrl = GetExplicitSettingOrTag(GitRepositoryUrl, globalTags, Ci.Tags.CommonTags.GitRepository, ConfigurationKeys.GitRepositoryUrl);
 
             GitMetadataEnabled = config
                                 .WithKeys(ConfigurationKeys.GitMetadataEnabled)

diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs
@@ -1275,14 +1275,16 @@ public void DDTagsSetsServiceInformation()
         {
             var source = new NameValueConfigurationSource(new()
             {
-                { "DD_TAGS", "env:datadog_env,service:datadog_service,version:datadog_version" },
+                { "DD_TAGS", "env:datadog_env,service:datadog_service,version:datadog_version,git.repository_url:https://Myrepository,git.commit.sha:42" },
             });
 
             var tracerSettings = new TracerSettings(source);
 
             tracerSettings.Environment.Should().Be("datadog_env");
             tracerSettings.ServiceVersion.Should().Be("datadog_version");
             tracerSettings.ServiceName.Should().Be("datadog_service");
+            tracerSettings.GitRepositoryUrl.Should().Be("https://Myrepository");
+            tracerSettings.GitCommitSha.Should().Be("42");
         }
 
         [Fact]