Skip to content

Surface websphere cell and server name on process tags #8880

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
May 28, 2025
Merged

Surface websphere cell and server name on process tags #8880

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa68074
Surface websphere cell and server name on process tags
amarziali May 26, 2025
db037c4
review
amarziali May 28, 2025
ac85475
Merge branch 'master' into andrea.marziali/complete-process-tags
amarziali May 28, 2025
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
Prev Previous commit
Next Next commit
review
  • Loading branch information
@amarziali
amarziali committed May 28, 2025
commit db037c4c580e40cdda8c4186347bc45ac6fb3554
10 changes: 5 additions & 5 deletions internal-api/src/main/java/datadog/trace/api/ProcessTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private static void fillJeeTags(SortedMap<String, String> tags) {
fillWebsphereTags(tags);
}

private static void insertSysPropIfPresent(
private static void insertTagFromSysPropIfPresent(
Map<String, String> tags, String propKey, String tagKey) {
String value = maybeGetSystemProperty(propKey);
if (value != null) {
Expand All @@ -71,7 +71,7 @@ private static String maybeGetSystemProperty(String propKey) {
return null;
}

private static boolean insertEnvIfPresent(
private static boolean insertTagFromEnvIfPresent(
Map<String, String> tags, String envKey, String tagKey) {
try {
String value = envGetter.apply(envKey);
Expand Down Expand Up @@ -128,16 +128,16 @@ private static void fillBaseTags(Map<String, String> tags) {
private static boolean fillJbossTags(Map<String, String> tags) {
if (insertLastPathSegmentIfPresent(
tags, maybeGetSystemProperty("jboss.home.dir"), "jboss.home")) {
insertSysPropIfPresent(tags, "jboss.server.name", SERVER_NAME);
insertTagFromSysPropIfPresent(tags, "jboss.server.name", SERVER_NAME);
tags.put("jboss.mode", hasSystemProperty("[Standalone]") ? "standalone" : "domain");
return true;
}
return false;
}

private static boolean fillWebsphereTags(Map<String, String> tags) {
if (insertEnvIfPresent(tags, "WAS_CELL", CLUSTER_NAME)) {
insertEnvIfPresent(tags, "SERVER_NAME", SERVER_NAME);
if (insertTagFromEnvIfPresent(tags, "WAS_CELL", CLUSTER_NAME)) {
insertTagFromEnvIfPresent(tags, "SERVER_NAME", SERVER_NAME);
return true;
}
return false;
Expand Down