Skip to content
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

[DSM] Don't send null tags with data streams checkpoint #4349

Merged
merged 1 commit into from
Nov 29, 2022
Merged

[DSM] Don't send null tags with data streams checkpoint #4349

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
3 changes: 3 additions & 0 deletions dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ public void setCheckpoint(

for (Map.Entry<String, String> entry : sortedTags.entrySet()) {
String tag = TagsProcessor.createTag(entry.getKey(), entry.getValue());
if (tag == null) {
continue;
}
if (hashableTagKeys.contains(entry.getKey())) {
pathwayHashBuilder.addTag(tag);
}
Expand Down
5 changes: 5 additions & 0 deletions dd-trace-core/src/main/java/datadog/trace/core/datastreams/TagsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ private static Map<String, Function<String, String>> createTagToPrefixMap() {
return result;
}

// Creates the tag string using the provided tagKey and tagValue.
// Returns null if either tagKey or tagValue is null.
public static String createTag(String tagKey, String tagValue) {
if (tagKey == null || tagValue == null) {
return null;
}
DDCache<String, String> cache = TAG_TO_CACHE.get(tagKey);
Function<String, String> prefix = TAG_TO_PREFIX.get(tagKey);
if (cache != null && prefix != null) {
Expand Down