Skip to content

Make GitInfo a TagContributor (addTags -> addTo) #11891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dougqh wants to merge 1 commit into
base: dougqh/tag-extractor-api
Choose a base branch
from
+6 −4
Draft

Make GitInfo a TagContributor (addTags -> addTo) #11891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dd-trace-core/src/main/java/datadog/trace/common/GitMetadataTraceInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Collection<? extends MutableSpan> onTraceComplete(
String ciWorkspacePath = (String) firstSpan.getTag(Tags.CI_WORKSPACE_PATH);

GitInfo gitInfo = GitInfoProvider.INSTANCE.getGitInfo(ciWorkspacePath);
gitInfo.addTags(firstSpan);
gitInfo.addTo(firstSpan);

return trace;
}
Expand Down
8 changes: 5 additions & 3 deletions internal-api/src/main/java/datadog/trace/api/git/GitInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import datadog.trace.api.DDTags;
import datadog.trace.api.TagMap;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.TagContributor;
import java.util.Objects;

public final class GitInfo {
public final class GitInfo implements TagContributor {
public static final GitInfo NOOP = new GitInfo(null, null, null, CommitInfo.NOOP);

private final String repositoryURL;
Expand All @@ -22,7 +23,7 @@ public GitInfo(String repositoryURL, String branch, String tag, CommitInfo commi
this.tag = tag;
this.commit = commit;

// GitInfo is reused across many traces, so create entries once and reuse them (see addTags)
// GitInfo is reused across many traces, so create entries once and reuse them (see addTo)
// null & empty values result in null entries which nop when added to a span
this.repositoryEntry = TagMap.Entry.create(DDTags.INTERNAL_GIT_REPOSITORY_URL, repositoryURL);
this.commitEntry =
Expand All @@ -47,7 +48,8 @@ public CommitInfo getCommit() {
return commit;
}

public void addTags(AgentSpan span) {
@Override
public void addTo(AgentSpan span) {
span.setTag(this.repositoryEntry);
span.setTag(this.commitEntry);
}
Expand Down
Loading