Skip to content

Commit 05143f5

Browse files
tonyredondotonyredondo
authored
Update tests and CI App environment variable parser fixes. (DataDog#1995)
1 parent c30c385 commit 05143f5

File tree

3 files changed

+126
-22
lines changed

3 files changed

+126
-22
lines changed

‎tracer/src/Datadog.Trace/Ci/CIEnvironmentValues.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,6 @@ internal static void ReloadEnvironmentData()
240240
SourceRoot = ExpandPath(SourceRoot);
241241
WorkspacePath = ExpandPath(WorkspacePath);
242242

243-
// **********
244-
// Clean Refs
245-
// **********
246-
247-
CleanBranchAndTag();
248-
249243
// **********
250244
// Custom environment variables.
251245
// **********
@@ -260,6 +254,12 @@ internal static void ReloadEnvironmentData()
260254
CommitterName = GetEnvironmentVariableIfIsNotEmpty("DD_GIT_COMMIT_COMMITTER_NAME", CommitterName);
261255
CommitterEmail = GetEnvironmentVariableIfIsNotEmpty("DD_GIT_COMMIT_COMMITTER_EMAIL", CommitterEmail);
262256
CommitterDate = GetDateTimeOffsetEnvironmentVariableIfIsNotEmpty("DD_GIT_COMMIT_COMMITTER_DATE", CommitterDate);
257+
258+
// **********
259+
// Clean Refs
260+
// **********
261+
262+
CleanBranchAndTag();
263263
}
264264

265265
private static string GetEnvironmentVariableIfIsNotEmpty(string key, string defaultValue)

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/Data/gitlab.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
[
33
{
44
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
5-
"CI_COMMIT_BRANCH": "origin/master",
65
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
6+
"CI_COMMIT_REF_NAME": "origin/master",
77
"CI_COMMIT_SHA": "gitlab-git-commit",
88
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
99
"CI_JOB_NAME": "gitlab-job-name",
@@ -37,8 +37,8 @@
3737
[
3838
{
3939
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
40-
"CI_COMMIT_BRANCH": "origin/master",
4140
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
41+
"CI_COMMIT_REF_NAME": "origin/master",
4242
"CI_COMMIT_SHA": "gitlab-git-commit",
4343
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
4444
"CI_JOB_NAME": "gitlab-job-name",
@@ -74,8 +74,8 @@
7474
[
7575
{
7676
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
77-
"CI_COMMIT_BRANCH": "origin/master",
7877
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
78+
"CI_COMMIT_REF_NAME": "origin/master",
7979
"CI_COMMIT_SHA": "gitlab-git-commit",
8080
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
8181
"CI_JOB_NAME": "gitlab-job-name",
@@ -111,8 +111,8 @@
111111
[
112112
{
113113
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
114-
"CI_COMMIT_BRANCH": "origin/master",
115114
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
115+
"CI_COMMIT_REF_NAME": "origin/master",
116116
"CI_COMMIT_SHA": "gitlab-git-commit",
117117
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
118118
"CI_JOB_NAME": "gitlab-job-name",
@@ -148,8 +148,8 @@
148148
[
149149
{
150150
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
151-
"CI_COMMIT_BRANCH": "origin/master",
152151
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
152+
"CI_COMMIT_REF_NAME": "origin/master",
153153
"CI_COMMIT_SHA": "gitlab-git-commit",
154154
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
155155
"CI_JOB_NAME": "gitlab-job-name",
@@ -187,8 +187,8 @@
187187
[
188188
{
189189
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
190-
"CI_COMMIT_BRANCH": "origin/master",
191190
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
191+
"CI_COMMIT_REF_NAME": "origin/master",
192192
"CI_COMMIT_SHA": "gitlab-git-commit",
193193
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
194194
"CI_JOB_NAME": "gitlab-job-name",
@@ -226,8 +226,8 @@
226226
[
227227
{
228228
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
229-
"CI_COMMIT_BRANCH": "origin/master",
230229
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
230+
"CI_COMMIT_REF_NAME": "origin/master",
231231
"CI_COMMIT_SHA": "gitlab-git-commit",
232232
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
233233
"CI_JOB_NAME": "gitlab-job-name",
@@ -265,8 +265,8 @@
265265
[
266266
{
267267
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
268-
"CI_COMMIT_BRANCH": "origin/master",
269268
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
269+
"CI_COMMIT_REF_NAME": "origin/master",
270270
"CI_COMMIT_SHA": "gitlab-git-commit",
271271
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
272272
"CI_JOB_NAME": "gitlab-job-name",
@@ -302,8 +302,8 @@
302302
[
303303
{
304304
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
305-
"CI_COMMIT_BRANCH": "origin/master",
306305
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
306+
"CI_COMMIT_REF_NAME": "origin/master",
307307
"CI_COMMIT_SHA": "gitlab-git-commit",
308308
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
309309
"CI_JOB_NAME": "gitlab-job-name",
@@ -337,8 +337,8 @@
337337
[
338338
{
339339
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
340-
"CI_COMMIT_BRANCH": "refs/heads/master",
341340
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
341+
"CI_COMMIT_REF_NAME": "refs/heads/master",
342342
"CI_COMMIT_SHA": "gitlab-git-commit",
343343
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
344344
"CI_JOB_NAME": "gitlab-job-name",
@@ -374,8 +374,8 @@
374374
[
375375
{
376376
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
377-
"CI_COMMIT_BRANCH": "refs/heads/feature/one",
378377
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
378+
"CI_COMMIT_REF_NAME": "refs/heads/feature/one",
379379
"CI_COMMIT_SHA": "gitlab-git-commit",
380380
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
381381
"CI_JOB_NAME": "gitlab-job-name",
@@ -522,8 +522,8 @@
522522
[
523523
{
524524
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
525-
"CI_COMMIT_BRANCH": "origin/master",
526525
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
526+
"CI_COMMIT_REF_NAME": "origin/master",
527527
"CI_COMMIT_SHA": "gitlab-git-commit",
528528
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
529529
"CI_JOB_NAME": "gitlab-job-name",
@@ -559,8 +559,8 @@
559559
[
560560
{
561561
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
562-
"CI_COMMIT_BRANCH": "origin/master",
563562
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
563+
"CI_COMMIT_REF_NAME": "origin/master",
564564
"CI_COMMIT_SHA": "gitlab-git-commit",
565565
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
566566
"CI_JOB_NAME": "gitlab-job-name",
@@ -596,8 +596,8 @@
596596
[
597597
{
598598
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
599-
"CI_COMMIT_BRANCH": "origin/master",
600599
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
600+
"CI_COMMIT_REF_NAME": "origin/master",
601601
"CI_COMMIT_SHA": "gitlab-git-commit",
602602
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
603603
"CI_JOB_NAME": "gitlab-job-name",
@@ -633,8 +633,8 @@
633633
[
634634
{
635635
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
636-
"CI_COMMIT_BRANCH": "origin/master",
637636
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
637+
"CI_COMMIT_REF_NAME": "origin/master",
638638
"CI_COMMIT_SHA": "gitlab-git-commit",
639639
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
640640
"CI_JOB_NAME": "gitlab-job-name",
@@ -670,8 +670,8 @@
670670
[
671671
{
672672
"CI_COMMIT_AUTHOR": "John Doe <john@doe.com>",
673-
"CI_COMMIT_BRANCH": "origin/master",
674673
"CI_COMMIT_MESSAGE": "gitlab-git-commit-message",
674+
"CI_COMMIT_REF_NAME": "origin/master",
675675
"CI_COMMIT_SHA": "gitlab-git-commit",
676676
"CI_COMMIT_TIMESTAMP": "2021-07-21T11:43:07-04:00",
677677
"CI_JOB_NAME": "gitlab-job-name",

‎tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/CI/Data/usersupplied.json

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,110 @@
2525
"git.repository_url": "usersupplied-repo"
2626
}
2727
],
28+
[
29+
{
30+
"DD_GIT_BRANCH": "origin/usersupplied-branch",
31+
"DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
32+
"DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
33+
"DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
34+
"DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
35+
"DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
36+
"DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
37+
"DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
38+
"DD_GIT_COMMIT_SHA": "usersupplied-commit",
39+
"DD_GIT_REPOSITORY_URL": "usersupplied-repo"
40+
},
41+
{
42+
"git.branch": "usersupplied-branch",
43+
"git.commit.author.date": "usersupplied-authordate",
44+
"git.commit.author.email": "usersupplied-authoremail",
45+
"git.commit.author.name": "usersupplied-authorname",
46+
"git.commit.committer.date": "usersupplied-comitterdate",
47+
"git.commit.committer.email": "usersupplied-comitteremail",
48+
"git.commit.committer.name": "usersupplied-comittername",
49+
"git.commit.message": "usersupplied-message",
50+
"git.commit.sha": "usersupplied-commit",
51+
"git.repository_url": "usersupplied-repo"
52+
}
53+
],
54+
[
55+
{
56+
"DD_GIT_BRANCH": "refs/heads/usersupplied-branch",
57+
"DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
58+
"DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
59+
"DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
60+
"DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
61+
"DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
62+
"DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
63+
"DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
64+
"DD_GIT_COMMIT_SHA": "usersupplied-commit",
65+
"DD_GIT_REPOSITORY_URL": "usersupplied-repo"
66+
},
67+
{
68+
"git.branch": "usersupplied-branch",
69+
"git.commit.author.date": "usersupplied-authordate",
70+
"git.commit.author.email": "usersupplied-authoremail",
71+
"git.commit.author.name": "usersupplied-authorname",
72+
"git.commit.committer.date": "usersupplied-comitterdate",
73+
"git.commit.committer.email": "usersupplied-comitteremail",
74+
"git.commit.committer.name": "usersupplied-comittername",
75+
"git.commit.message": "usersupplied-message",
76+
"git.commit.sha": "usersupplied-commit",
77+
"git.repository_url": "usersupplied-repo"
78+
}
79+
],
80+
[
81+
{
82+
"DD_GIT_BRANCH": "origin/tags/0.1.0",
83+
"DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
84+
"DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
85+
"DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
86+
"DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
87+
"DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
88+
"DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
89+
"DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
90+
"DD_GIT_COMMIT_SHA": "usersupplied-commit",
91+
"DD_GIT_REPOSITORY_URL": "usersupplied-repo"
92+
},
93+
{
94+
"git.commit.author.date": "usersupplied-authordate",
95+
"git.commit.author.email": "usersupplied-authoremail",
96+
"git.commit.author.name": "usersupplied-authorname",
97+
"git.commit.committer.date": "usersupplied-comitterdate",
98+
"git.commit.committer.email": "usersupplied-comitteremail",
99+
"git.commit.committer.name": "usersupplied-comittername",
100+
"git.commit.message": "usersupplied-message",
101+
"git.commit.sha": "usersupplied-commit",
102+
"git.repository_url": "usersupplied-repo",
103+
"git.tag": "0.1.0"
104+
}
105+
],
106+
[
107+
{
108+
"DD_GIT_BRANCH": "refs/heads/tags/0.1.0",
109+
"DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",
110+
"DD_GIT_COMMIT_AUTHOR_EMAIL": "usersupplied-authoremail",
111+
"DD_GIT_COMMIT_AUTHOR_NAME": "usersupplied-authorname",
112+
"DD_GIT_COMMIT_COMMITTER_DATE": "usersupplied-comitterdate",
113+
"DD_GIT_COMMIT_COMMITTER_EMAIL": "usersupplied-comitteremail",
114+
"DD_GIT_COMMIT_COMMITTER_NAME": "usersupplied-comittername",
115+
"DD_GIT_COMMIT_MESSAGE": "usersupplied-message",
116+
"DD_GIT_COMMIT_SHA": "usersupplied-commit",
117+
"DD_GIT_REPOSITORY_URL": "usersupplied-repo"
118+
},
119+
{
120+
"git.commit.author.date": "usersupplied-authordate",
121+
"git.commit.author.email": "usersupplied-authoremail",
122+
"git.commit.author.name": "usersupplied-authorname",
123+
"git.commit.committer.date": "usersupplied-comitterdate",
124+
"git.commit.committer.email": "usersupplied-comitteremail",
125+
"git.commit.committer.name": "usersupplied-comittername",
126+
"git.commit.message": "usersupplied-message",
127+
"git.commit.sha": "usersupplied-commit",
128+
"git.repository_url": "usersupplied-repo",
129+
"git.tag": "0.1.0"
130+
}
131+
],
28132
[
29133
{
30134
"DD_GIT_COMMIT_AUTHOR_DATE": "usersupplied-authordate",

0 commit comments

Comments
 (0)