Skip to content

Improves ServiceNameCollector #8109

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

Merged
amarziali merged 3 commits into from
Dec 20, 2024
Merged

Improves ServiceNameCollector #8109

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
428323f
Improves ServiceNameCollector
amarziali Dec 18, 2024
ab684c1
Update internal-api/src/main/java/datadog/trace/api/remoteconfig/Serv…
amarziali Dec 18, 2024
da89e60
apply suggestions
amarziali Dec 18, 2024
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
21 changes: 16 additions & 5 deletions internal-api/src/main/java/datadog/trace/api/remoteconfig/ServiceNameCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import datadog.trace.api.Config;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Nullable;
import org.slf4j.Logger;
Expand Down Expand Up @@ -48,14 +49,24 @@ public void addService(final String serviceName) {
}
return;
}
if (!Config.get().getServiceName().equalsIgnoreCase(serviceName)) {
services.put(serviceName.toLowerCase(Locale.ROOT), serviceName);
}
services.putIfAbsent(serviceName, serviceName);
}

/**
* Get the list of unique services deduplicated by case. There is no locking on the addService map
* so, the method is not thread safe.
*
* @return
*/
@Nullable
public List<String> getServices() {
return services.isEmpty() ? null : new ArrayList<>(services.values());
if (services.isEmpty()) {
return null;
}
final Set<String> uniqueNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
uniqueNames.addAll(services.keySet());
uniqueNames.remove(Config.get().getServiceName());
return uniqueNames.isEmpty() ? null : new ArrayList<>(uniqueNames);
}

public void clear() {
Expand Down
Loading