Skip to content

Commit 993e196

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
authored
Implement embedded git metadata extraction (#4951)
1 parent f38120d commit 993e196

File tree

62 files changed

+1173
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1173
-451
lines changed

‎dd-java-agent/agent-ci-visibility/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ apply from: "$rootDir/gradle/version.gradle"
88
minimumBranchCoverage = 0.7
99
minimumInstructionCoverage = 0.8
1010

11-
excludedClassesCoverage += [
12-
"datadog.trace.civisibility.CiVisibilitySystem",
13-
"datadog.trace.civisibility.git.GitObject",
14-
"datadog.trace.civisibility.source.*"
15-
]
11+
excludedClassesCoverage += ["datadog.trace.civisibility.CiVisibilitySystem", "datadog.trace.civisibility.git.GitObject",]
1612

1713
dependencies {
1814
api deps.slf4j

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package datadog.trace.civisibility;
22

3-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
4-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
4+
import static datadog.trace.api.git.GitUtils.normalizeTag;
55
import static datadog.trace.civisibility.utils.PathUtils.expandTilde;
66

77
import datadog.trace.api.civisibility.CIInfo;
88
import datadog.trace.api.civisibility.CIProviderInfo;
9-
import datadog.trace.api.civisibility.git.CommitInfo;
10-
import datadog.trace.api.civisibility.git.GitInfo;
11-
import datadog.trace.api.civisibility.git.PersonInfo;
9+
import datadog.trace.api.git.CommitInfo;
10+
import datadog.trace.api.git.GitInfo;
11+
import datadog.trace.api.git.PersonInfo;
1212

1313
class AppVeyorInfo implements CIProviderInfo {
1414

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

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

3-
import static datadog.trace.civisibility.git.GitUtils.filterSensitiveInfo;
4-
import static datadog.trace.civisibility.git.GitUtils.isTagReference;
5-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
6-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
4+
import static datadog.trace.api.git.GitUtils.isTagReference;
5+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
6+
import static datadog.trace.api.git.GitUtils.normalizeTag;
77
import static datadog.trace.civisibility.utils.PathUtils.expandTilde;
88

99
import datadog.trace.api.civisibility.CIInfo;
1010
import datadog.trace.api.civisibility.CIProviderInfo;
11-
import datadog.trace.api.civisibility.git.CommitInfo;
12-
import datadog.trace.api.civisibility.git.GitInfo;
13-
import datadog.trace.api.civisibility.git.PersonInfo;
11+
import datadog.trace.api.git.CommitInfo;
12+
import datadog.trace.api.git.GitInfo;
13+
import datadog.trace.api.git.PersonInfo;
1414

1515
class AzurePipelinesInfo implements CIProviderInfo {
1616

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package datadog.trace.civisibility;
22

3-
import static datadog.trace.civisibility.git.GitUtils.filterSensitiveInfo;
4-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
5-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
4+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
5+
import static datadog.trace.api.git.GitUtils.normalizeTag;
66
import static datadog.trace.civisibility.utils.PathUtils.expandTilde;
77

88
import datadog.trace.api.civisibility.CIInfo;
99
import datadog.trace.api.civisibility.CIProviderInfo;
10-
import datadog.trace.api.civisibility.git.CommitInfo;
11-
import datadog.trace.api.civisibility.git.GitInfo;
10+
import datadog.trace.api.git.CommitInfo;
11+
import datadog.trace.api.git.GitInfo;
1212
import datadog.trace.util.Strings;
1313

1414
class BitBucketInfo implements CIProviderInfo {

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

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

3-
import static datadog.trace.civisibility.git.GitUtils.filterSensitiveInfo;
4-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
5-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
4+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
5+
import static datadog.trace.api.git.GitUtils.normalizeTag;
66
import static datadog.trace.civisibility.utils.PathUtils.expandTilde;
77

88
import datadog.trace.api.civisibility.CIInfo;
99
import datadog.trace.api.civisibility.CIProviderInfo;
10-
import datadog.trace.api.civisibility.git.CommitInfo;
11-
import datadog.trace.api.civisibility.git.GitInfo;
12-
import datadog.trace.api.civisibility.git.PersonInfo;
10+
import datadog.trace.api.git.CommitInfo;
11+
import datadog.trace.api.git.GitInfo;
12+
import datadog.trace.api.git.PersonInfo;
1313

1414
class BitriseInfo implements CIProviderInfo {
1515

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

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

3-
import static datadog.trace.civisibility.git.GitUtils.filterSensitiveInfo;
4-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
5-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
4+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
5+
import static datadog.trace.api.git.GitUtils.normalizeTag;
66

77
import datadog.trace.api.civisibility.CIInfo;
88
import datadog.trace.api.civisibility.CIProviderInfo;
9-
import datadog.trace.api.civisibility.git.CommitInfo;
10-
import datadog.trace.api.civisibility.git.GitInfo;
11-
import datadog.trace.api.civisibility.git.PersonInfo;
9+
import datadog.trace.api.git.CommitInfo;
10+
import datadog.trace.api.git.GitInfo;
11+
import datadog.trace.api.git.PersonInfo;
1212

1313
class BuddyInfo implements CIProviderInfo {
1414

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

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

3-
import static datadog.trace.civisibility.git.GitUtils.filterSensitiveInfo;
4-
import static datadog.trace.civisibility.git.GitUtils.normalizeBranch;
5-
import static datadog.trace.civisibility.git.GitUtils.normalizeTag;
3+
import static datadog.trace.api.git.GitUtils.filterSensitiveInfo;
4+
import static datadog.trace.api.git.GitUtils.normalizeBranch;
5+
import static datadog.trace.api.git.GitUtils.normalizeTag;
66
import static datadog.trace.civisibility.utils.PathUtils.expandTilde;
77

88
import datadog.trace.api.civisibility.CIInfo;
99
import datadog.trace.api.civisibility.CIProviderInfo;
10-
import datadog.trace.api.civisibility.git.CommitInfo;
11-
import datadog.trace.api.civisibility.git.GitInfo;
12-
import datadog.trace.api.civisibility.git.PersonInfo;
10+
import datadog.trace.api.git.CommitInfo;
11+
import datadog.trace.api.git.GitInfo;
12+
import datadog.trace.api.git.PersonInfo;
1313

1414
class BuildkiteInfo implements CIProviderInfo {
1515

0 commit comments

Comments
 (0)