Skip to content

Commit 9db1d0d

Browse files
committed
Fix git metadata retrieval
1 parent cb2f8f1 commit 9db1d0d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

tracer/src/Datadog.Trace/Configuration/TracerSettings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ _ when x.ToBoolean() is { } boolean => boolean,
211211
.AsString();
212212

213213
// DD_GIT_REPOSITORY_URL has precedence over DD_TAGS
214-
GitRepositoryUrl = GetExplicitSettingOrTag(GitRepositoryUrl, globalTags, Ci.Tags.CommonTags.GitCommit, ConfigurationKeys.GitRepositoryUrl);
214+
GitRepositoryUrl = GetExplicitSettingOrTag(GitRepositoryUrl, globalTags, Ci.Tags.CommonTags.GitRepository, ConfigurationKeys.GitRepositoryUrl);
215215

216216
GitMetadataEnabled = config
217217
.WithKeys(ConfigurationKeys.GitMetadataEnabled)

tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1275,14 +1275,16 @@ public void DDTagsSetsServiceInformation()
12751275
{
12761276
var source = new NameValueConfigurationSource(new()
12771277
{
1278-
{ "DD_TAGS", "env:datadog_env,service:datadog_service,version:datadog_version" },
1278+
{ "DD_TAGS", "env:datadog_env,service:datadog_service,version:datadog_version,git.repository_url:https://Myrepository,git.commit.sha:42" },
12791279
});
12801280

12811281
var tracerSettings = new TracerSettings(source);
12821282

12831283
tracerSettings.Environment.Should().Be("datadog_env");
12841284
tracerSettings.ServiceVersion.Should().Be("datadog_version");
12851285
tracerSettings.ServiceName.Should().Be("datadog_service");
1286+
tracerSettings.GitRepositoryUrl.Should().Be("https://Myrepository");
1287+
tracerSettings.GitCommitSha.Should().Be("42");
12861288
}
12871289

12881290
[Fact]

0 commit comments

Comments
 (0)