Skip to content

Commit 464144b

Browse files
author
Daniel Rodriguez Hernandez
committed
CIProviderInfoTests based on json file generated by datadog-ci-spec
1 parent 9e04293 commit 464144b

38 files changed

Lines changed: 4617 additions & 1563 deletions

File tree

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/TestDecorator.java‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.lang.reflect.Method;
1010
import java.util.ArrayList;
1111
import java.util.List;
12+
import java.util.Map;
1213
import lombok.Getter;
1314
import lombok.extern.slf4j.Slf4j;
1415

@@ -21,35 +22,15 @@ public abstract class TestDecorator extends BaseDecorator {
2122
public static final String TEST_SKIP = "skip";
2223

2324
@Getter private final boolean isCI;
24-
@Getter private final String ciProviderName;
25-
@Getter private final String ciPipelineId;
26-
@Getter private final String ciPipelineName;
27-
@Getter private final String ciPipelineNumber;
28-
@Getter private final String ciPipelineUrl;
29-
@Getter private final String ciJobUrl;
30-
@Getter private final String ciWorkspacePath;
31-
@Getter private final String gitRepositoryUrl;
32-
@Getter private final String gitCommit;
33-
@Getter private final String gitBranch;
34-
@Getter private final String gitTag;
25+
@Getter private final Map<String, String> ciTags;
3526

3627
public TestDecorator() {
3728
this(CIProviderInfo.selectCI());
3829
}
3930

4031
TestDecorator(final CIProviderInfo ciInfo) {
4132
this.isCI = ciInfo.isCI();
42-
this.ciProviderName = ciInfo.getCiProviderName();
43-
this.ciPipelineId = ciInfo.getCiPipelineId();
44-
this.ciPipelineName = ciInfo.getCiPipelineName();
45-
this.ciPipelineNumber = ciInfo.getCiPipelineNumber();
46-
this.ciPipelineUrl = ciInfo.getCiPipelineUrl();
47-
this.ciJobUrl = ciInfo.getCiJobUrl();
48-
this.ciWorkspacePath = ciInfo.getCiWorkspacePath();
49-
this.gitRepositoryUrl = ciInfo.getGitRepositoryUrl();
50-
this.gitCommit = ciInfo.getGitCommit();
51-
this.gitBranch = ciInfo.getGitBranch();
52-
this.gitTag = ciInfo.getGitTag();
33+
this.ciTags = ciInfo.getCiTags();
5334
}
5435

5536
protected abstract String testFramework();
@@ -74,22 +55,9 @@ public AgentSpan afterStart(final AgentSpan span) {
7455
span.setTag(Tags.TEST_TYPE, testType());
7556
span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP);
7657

77-
span.setTag(Tags.CI_PROVIDER_NAME, ciProviderName);
78-
span.setTag(Tags.CI_PIPELINE_ID, ciPipelineId);
79-
span.setTag(Tags.CI_PIPELINE_NAME, ciPipelineName);
80-
span.setTag(Tags.CI_PIPELINE_NUMBER, ciPipelineNumber);
81-
span.setTag(Tags.CI_PIPELINE_URL, ciPipelineUrl);
82-
if (ciJobUrl != null) {
83-
span.setTag(Tags.CI_JOB_URL, ciJobUrl);
58+
for (final Map.Entry<String, String> ciTag : ciTags.entrySet()) {
59+
span.setTag(ciTag.getKey(), ciTag.getValue());
8460
}
85-
span.setTag(Tags.CI_WORKSPACE_PATH, ciWorkspacePath);
86-
span.setTag(Tags.BUILD_SOURCE_ROOT, ciWorkspacePath);
87-
88-
span.setTag(Tags.GIT_REPOSITORY_URL, gitRepositoryUrl);
89-
span.setTag(Tags.GIT_COMMIT_SHA, gitCommit);
90-
span.setTag(Tags._GIT_COMMIT_SHA, gitCommit);
91-
span.setTag(Tags.GIT_BRANCH, gitBranch);
92-
span.setTag(Tags.GIT_TAG, gitTag);
9361

9462
return super.afterStart(span);
9563
}

‎dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/TestDecoratorTest.groovy‎

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,9 @@ class TestDecoratorTest extends BaseDecoratorTest {
2323
1 * span.setTag(Tags.TEST_FRAMEWORK, decorator.testFramework())
2424
1 * span.setTag(Tags.TEST_TYPE, decorator.testType())
2525
1 * span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP)
26-
1 * span.setTag(Tags.CI_PROVIDER_NAME, "ci-provider-name")
27-
1 * span.setTag(Tags.CI_PIPELINE_ID, "ci-pipeline-id")
28-
1 * span.setTag(Tags.CI_PIPELINE_NAME, "ci-pipeline-name")
29-
1 * span.setTag(Tags.CI_PIPELINE_NUMBER, "ci-pipeline-number")
30-
1 * span.setTag(Tags.CI_PIPELINE_URL, "ci-pipeline-url")
31-
1 * span.setTag(Tags.CI_JOB_URL, "ci-job-url")
32-
1 * span.setTag(Tags.CI_WORKSPACE_PATH, "ci-workspace-path")
33-
1 * span.setTag(Tags.BUILD_SOURCE_ROOT, "ci-workspace-path")
34-
1 * span.setTag(Tags.GIT_REPOSITORY_URL, "git-repository-url")
35-
1 * span.setTag(Tags.GIT_COMMIT_SHA, "git-commit")
36-
1 * span.setTag(Tags._GIT_COMMIT_SHA, "git-commit")
37-
1 * span.setTag(Tags.GIT_BRANCH, "git-branch")
38-
1 * span.setTag(Tags.GIT_TAG, "git-tag")
26+
decorator.ciTags.each {
27+
1 * span.setTag(it.key, it.value)
28+
}
3929
_ * span.setTag(_, _) // Want to allow other calls from child implementations.
4030
_ * span.setServiceName(_)
4131
_ * span.setOperationName(_)
@@ -86,58 +76,10 @@ class TestDecoratorTest extends BaseDecoratorTest {
8676
def newMockCiInfo() {
8777
return new CIProviderInfo() {
8878
@Override
89-
String getCiProviderName() {
90-
return "ci-provider-name"
91-
}
92-
93-
@Override
94-
String getCiPipelineId() {
95-
return "ci-pipeline-id"
96-
}
97-
98-
@Override
99-
String getCiPipelineName() {
100-
return "ci-pipeline-name"
101-
}
102-
103-
@Override
104-
String getCiPipelineNumber() {
105-
return "ci-pipeline-number"
106-
}
107-
108-
@Override
109-
String getCiPipelineUrl() {
110-
return "ci-pipeline-url"
111-
}
112-
113-
@Override
114-
String getCiJobUrl() {
115-
return "ci-job-url"
116-
}
117-
118-
@Override
119-
String getCiWorkspacePath() {
120-
return "ci-workspace-path"
121-
}
122-
123-
@Override
124-
String getGitRepositoryUrl() {
125-
return "git-repository-url"
126-
}
127-
128-
@Override
129-
String getGitCommit() {
130-
return "git-commit"
131-
}
132-
133-
@Override
134-
String getGitBranch() {
135-
return "git-branch"
136-
}
137-
138-
@Override
139-
String getGitTag() {
140-
return "git-tag"
79+
Map<String, String> getCiTags() {
80+
def mockCiTags = new HashMap()
81+
mockCiTags.put("sample-ci-key", "sample-ci-value")
82+
return mockCiTags
14183
}
14284
}
14385
}

‎dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -131,57 +131,7 @@ class JUnit4Test extends TestFrameworkTest {
131131
}
132132

133133
@Override
134-
String ciProviderName() {
135-
return JUnit4Decorator.DECORATE.getCiProviderName()
136-
}
137-
138-
@Override
139-
String ciPipelineId() {
140-
return JUnit4Decorator.DECORATE.getCiPipelineId()
141-
}
142-
143-
@Override
144-
String ciPipelineName() {
145-
return JUnit4Decorator.DECORATE.getCiPipelineName()
146-
}
147-
148-
@Override
149-
String ciPipelineNumber() {
150-
return JUnit4Decorator.DECORATE.getCiPipelineNumber()
151-
}
152-
153-
@Override
154-
String ciPipelineUrl() {
155-
return JUnit4Decorator.DECORATE.getCiPipelineUrl()
156-
}
157-
158-
@Override
159-
String ciJobUrl() {
160-
return JUnit4Decorator.DECORATE.getCiJobUrl()
161-
}
162-
163-
@Override
164-
String ciWorkspacePath() {
165-
return JUnit4Decorator.DECORATE.getCiWorkspacePath()
166-
}
167-
168-
@Override
169-
String gitRepositoryUrl() {
170-
return JUnit4Decorator.DECORATE.getGitRepositoryUrl()
171-
}
172-
173-
@Override
174-
String gitCommit() {
175-
return JUnit4Decorator.DECORATE.getGitCommit()
176-
}
177-
178-
@Override
179-
String gitBranch() {
180-
return JUnit4Decorator.DECORATE.getGitBranch()
181-
}
182-
183-
@Override
184-
String gitTag() {
185-
return JUnit4Decorator.DECORATE.getGitTag()
134+
Map<String, String> ciTags() {
135+
return JUnit4Decorator.DECORATE.getCiTags()
186136
}
187137
}

‎dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -226,57 +226,7 @@ class JUnit5Test extends TestFrameworkTest {
226226
}
227227

228228
@Override
229-
String ciProviderName() {
230-
return JUnit5Decorator.DECORATE.getCiProviderName()
231-
}
232-
233-
@Override
234-
String ciPipelineId() {
235-
return JUnit5Decorator.DECORATE.getCiPipelineId()
236-
}
237-
238-
@Override
239-
String ciPipelineName() {
240-
return JUnit5Decorator.DECORATE.getCiPipelineName()
241-
}
242-
243-
@Override
244-
String ciPipelineNumber() {
245-
return JUnit5Decorator.DECORATE.getCiPipelineNumber()
246-
}
247-
248-
@Override
249-
String ciPipelineUrl() {
250-
return JUnit5Decorator.DECORATE.getCiPipelineUrl()
251-
}
252-
253-
@Override
254-
String ciJobUrl() {
255-
return JUnit5Decorator.DECORATE.getCiJobUrl()
256-
}
257-
258-
@Override
259-
String ciWorkspacePath() {
260-
return JUnit5Decorator.DECORATE.getCiWorkspacePath()
261-
}
262-
263-
@Override
264-
String gitRepositoryUrl() {
265-
return JUnit5Decorator.DECORATE.getGitRepositoryUrl()
266-
}
267-
268-
@Override
269-
String gitCommit() {
270-
return JUnit5Decorator.DECORATE.getGitCommit()
271-
}
272-
273-
@Override
274-
String gitBranch() {
275-
return JUnit5Decorator.DECORATE.getGitBranch()
276-
}
277-
278-
@Override
279-
String gitTag() {
280-
return JUnit5Decorator.DECORATE.getGitTag()
229+
Map<String, String> ciTags() {
230+
return JUnit5Decorator.DECORATE.getCiTags()
281231
}
282232
}

‎dd-java-agent/instrumentation/testng-6.4/src/test/groovy/TestNGTest.groovy‎

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -157,57 +157,7 @@ class TestNGTest extends TestFrameworkTest {
157157
}
158158

159159
@Override
160-
String ciProviderName() {
161-
return TestNGDecorator.DECORATE.getCiProviderName()
162-
}
163-
164-
@Override
165-
String ciPipelineId() {
166-
return TestNGDecorator.DECORATE.getCiPipelineId()
167-
}
168-
169-
@Override
170-
String ciPipelineName() {
171-
return TestNGDecorator.DECORATE.getCiPipelineName()
172-
}
173-
174-
@Override
175-
String ciPipelineNumber() {
176-
return TestNGDecorator.DECORATE.getCiPipelineNumber()
177-
}
178-
179-
@Override
180-
String ciPipelineUrl() {
181-
return TestNGDecorator.DECORATE.getCiPipelineUrl()
182-
}
183-
184-
@Override
185-
String ciJobUrl() {
186-
return TestNGDecorator.DECORATE.getCiJobUrl()
187-
}
188-
189-
@Override
190-
String ciWorkspacePath() {
191-
return TestNGDecorator.DECORATE.getCiWorkspacePath()
192-
}
193-
194-
@Override
195-
String gitRepositoryUrl() {
196-
return TestNGDecorator.DECORATE.getGitRepositoryUrl()
197-
}
198-
199-
@Override
200-
String gitCommit() {
201-
return TestNGDecorator.DECORATE.getGitCommit()
202-
}
203-
204-
@Override
205-
String gitBranch() {
206-
return TestNGDecorator.DECORATE.getGitBranch()
207-
}
208-
209-
@Override
210-
String gitTag() {
211-
return TestNGDecorator.DECORATE.getGitTag()
160+
Map<String, String> ciTags() {
161+
return TestNGDecorator.DECORATE.getCiTags()
212162
}
213163
}

0 commit comments

Comments
 (0)