Skip to content

Add entrypoint type to process tags #8839

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 2 commits into from
May 27, 2025
Merged

Add entrypoint type to process tags #8839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda347b
Add entrypoint type to process tags
amarziali May 16, 2025
7855cd8
Merge branch 'master' into andrea.marziali/entrypoint_type
amarziali May 27, 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
2 changes: 2 additions & 0 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 @@ -68,10 +68,12 @@ private static void fillBaseTags(Map<String, String> tags) {
CapturedEnvironment.get().getProcessInfo();
if (processInfo.mainClass != null) {
tags.put("entrypoint.name", processInfo.mainClass);
tags.put("entrypoint.type", "class");
}
if (processInfo.jarFile != null) {
final String jarName = processInfo.jarFile.getName();
tags.put("entrypoint.name", jarName.substring(0, jarName.length() - 4)); // strip .jar
tags.put("entrypoint.type", "jar");
insertLastPathSegmentIfPresent(tags, processInfo.jarFile.getParent(), "entrypoint.basedir");
}

Expand Down
12 changes: 6 additions & 6 deletions internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ class ProcessTagsForkedTest extends DDSpecification {
tags =~ expected
where:
jar | cls | expected
Paths.get("my test", "my.jar").toFile() | null | "entrypoint.basedir:my_test,entrypoint.name:my,entrypoint.workdir:[^,]+"
Paths.get("my.jar").toFile() | null | "entrypoint.name:my,entrypoint.workdir:[^,]+"
null | "com.test.Main" | "entrypoint.name:com.test.main,entrypoint.workdir:[^,]+"
Paths.get("my test", "my.jar").toFile() | null | "entrypoint.basedir:my_test,entrypoint.name:my,entrypoint.type:jar,entrypoint.workdir:[^,]+"
Paths.get("my.jar").toFile() | null | "entrypoint.name:my,entrypoint.type:jar,entrypoint.workdir:[^,]+"
null | "com.test.Main" | "entrypoint.name:com.test.main,entrypoint.type:class,entrypoint.workdir:[^,]+"
null | null | "entrypoint.workdir:[^,]+"
}

Expand All @@ -56,9 +56,9 @@ class ProcessTagsForkedTest extends DDSpecification {
System.clearProperty("jboss.server.name")
where:
jbossHome | mode | serverName | expected
"/opt/jboss/myserver" | "[Standalone]" | "standalone" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.workdir:.+,jboss.home:myserver,jboss.mode:standalone,server.name:standalone"
"/opt/jboss/myserver" | "[server1:12345]" | "server1" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.workdir:.+,jboss.home:myserver,jboss.mode:domain,server.name:server1"
null | "[Standalone]" | "standalone" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.workdir:[^,]+" // don't expect jboss tags since home is missing
"/opt/jboss/myserver" | "[Standalone]" | "standalone" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.type:jar,entrypoint.workdir:.+,jboss.home:myserver,jboss.mode:standalone,server.name:standalone"
"/opt/jboss/myserver" | "[server1:12345]" | "server1" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.type:jar,entrypoint.workdir:.+,jboss.home:myserver,jboss.mode:domain,server.name:server1"
null | "[Standalone]" | "standalone" | "entrypoint.basedir:somewhere,entrypoint.name:jboss-modules,entrypoint.type:jar,entrypoint.workdir:[^,]+" // don't expect jboss tags since home is missing
}

def 'should not calculate process tags by default'() {
Expand Down