Skip to content

Commit f26a285

Browse files
daniel-mohedanodaniel-mohedano
committed
creates test management dto for request instead of tracer environment
1 parent 1e4cb8f commit f26a285

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datadog.trace.civisibility.config;
22

33
import com.squareup.moshi.FromJson;
4+
import com.squareup.moshi.Json;
45
import com.squareup.moshi.JsonAdapter;
56
import com.squareup.moshi.Moshi;
67
import com.squareup.moshi.ToJson;
@@ -65,6 +66,7 @@ public class ConfigurationApiImpl implements ConfigurationApi {
6566
private final JsonAdapter<EnvelopeDto<CiVisibilitySettings>> settingsResponseAdapter;
6667
private final JsonAdapter<MultiEnvelopeDto<TestIdentifierJson>> testIdentifiersResponseAdapter;
6768
private final JsonAdapter<EnvelopeDto<KnownTestsDto>> testFullNamesResponseAdapter;
69+
private final JsonAdapter<EnvelopeDto<TestManagementDto>> testManagementRequestAdapter;
6870
private final JsonAdapter<EnvelopeDto<TestManagementTestsDto>> testManagementTestsResponseAdapter;
6971
private final JsonAdapter<EnvelopeDto<ChangedFiles>> changedFilesResponseAdapter;
7072

@@ -108,6 +110,11 @@ public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector m
108110
ConfigurationApiImpl.class, EnvelopeDto.class, KnownTestsDto.class);
109111
testFullNamesResponseAdapter = moshi.adapter(testFullNamesResponseType);
110112

113+
ParameterizedType testManagementRequestType =
114+
Types.newParameterizedTypeWithOwner(
115+
ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementDto.class);
116+
testManagementRequestAdapter = moshi.adapter(testManagementRequestType);
117+
111118
ParameterizedType testManagementTestsResponseType =
112119
Types.newParameterizedTypeWithOwner(
113120
ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementTestsDto.class);
@@ -329,9 +336,16 @@ public Map<TestSetting, Map<String, Collection<TestFQN>>> getTestManagementTests
329336
.build();
330337

331338
String uuid = uuidGenerator.get();
332-
EnvelopeDto<TracerEnvironment> request =
333-
new EnvelopeDto<>(new DataDto<>(uuid, "ci_app_libraries_tests_request", tracerEnvironment));
334-
String json = requestAdapter.toJson(request);
339+
EnvelopeDto<TestManagementDto> request =
340+
new EnvelopeDto<>(
341+
new DataDto<>(
342+
uuid,
343+
"ci_app_libraries_tests_request",
344+
new TestManagementDto(
345+
tracerEnvironment.getRepositoryUrl(),
346+
tracerEnvironment.getCommitMessage(),
347+
tracerEnvironment.getConfigurations().getTestBundle())));
348+
String json = testManagementRequestAdapter.toJson(request);
335349
RequestBody requestBody = RequestBody.create(JSON, json);
336350
TestManagementTestsDto testManagementTestsDto =
337351
backendApi.post(
@@ -520,6 +534,22 @@ private KnownTestsDto(Map<String, Map<String, List<String>>> tests) {
520534
}
521535
}
522536

537+
private static final class TestManagementDto {
538+
@Json(name = "repository_url")
539+
private final String repositoryUrl;
540+
541+
@Json(name = "commit_message")
542+
private final String commitMessage;
543+
544+
private final String module;
545+
546+
private TestManagementDto(String repositoryUrl, String commitMessage, String module) {
547+
this.repositoryUrl = repositoryUrl;
548+
this.commitMessage = commitMessage;
549+
this.module = module;
550+
}
551+
}
552+
523553
private static final class TestManagementTestsDto {
524554
private static final class Properties {
525555
private final Map<String, Boolean> properties;

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class TracerEnvironment {
2222
@Json(name = "test_level")
2323
private final String testLevel = "test";
2424

25-
private final String module;
2625
private final Configurations configurations;
2726

2827
private TracerEnvironment(
@@ -32,15 +31,13 @@ private TracerEnvironment(
3231
String branch,
3332
String sha,
3433
String commitMessage,
35-
String module,
3634
Configurations configurations) {
3735
this.service = service;
3836
this.env = env;
3937
this.repositoryUrl = repositoryUrl;
4038
this.branch = branch;
4139
this.sha = sha;
4240
this.commitMessage = commitMessage;
43-
this.module = module;
4441
this.configurations = configurations;
4542
}
4643

@@ -72,10 +69,6 @@ public String getTestLevel() {
7269
return testLevel;
7370
}
7471

75-
public String getModule() {
76-
return module;
77-
}
78-
7972
public Configurations getConfigurations() {
8073
return configurations;
8174
}
@@ -104,9 +97,6 @@ public String toString() {
10497
+ ", testLevel='"
10598
+ testLevel
10699
+ '\''
107-
+ ", module='"
108-
+ module
109-
+ '\''
110100
+ ", configurations="
111101
+ configurations
112102
+ '}';
@@ -216,7 +206,6 @@ public TracerEnvironment build() {
216206
branch,
217207
sha,
218208
commitMessage,
219-
testBundle,
220209
new Configurations(
221210
osPlatform,
222211
osArchitecture,

‎dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,8 @@
33
"type" : "ci_app_libraries_tests_request",
44
"id" : "${uid}",
55
"attributes": {
6-
"service" : "${tracerEnvironment.service}",
7-
"env" : "${tracerEnvironment.env}",
86
"repository_url" : "${tracerEnvironment.repositoryUrl}",
9-
"branch" : "${tracerEnvironment.branch}",
10-
"sha" : "${tracerEnvironment.sha}",
11-
"commit_message" : "${tracerEnvironment.commitMessage}",
12-
"test_level" : "${tracerEnvironment.testLevel}",
13-
"configurations" : {
14-
"os.platform" : "${tracerEnvironment.configurations.osPlatform}",
15-
"os.architecture" : "${tracerEnvironment.configurations.osArchitecture}",
16-
"os.arch" : "${tracerEnvironment.configurations.osArchitecture}",
17-
"os.version" : "${tracerEnvironment.configurations.osVersion}",
18-
"runtime.name" : "${tracerEnvironment.configurations.runtimeName}",
19-
"runtime.version" : "${tracerEnvironment.configurations.runtimeVersion}",
20-
"runtime.vendor" : "${tracerEnvironment.configurations.runtimeVendor}",
21-
"runtime.architecture": "${tracerEnvironment.configurations.runtimeArchitecture}",
22-
"custom" : {
23-
<#list tracerEnvironment.configurations.custom as customTag, customValue>
24-
"${customTag}": "${customValue}"<#if customTag?has_next>, </#if>
25-
</#list>
26-
}
7+
"commit_message" : "${tracerEnvironment.commitMessage}"
278
}
289
}
2910
}

0 commit comments

Comments
 (0)