Skip to content

compatible different command line style for find jar path #12544

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
merged 8 commits into from
Nov 6, 2024
Merged

compatible different command line style for find jar path #12544

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
059b1a7
compatible different command line style for find jar path
misaya98 Oct 31, 2024
dfd61ab
Merge pull request #1 from misaya98/compatible-different-command-line…
misaya98 Oct 31, 2024
c967058
add unit test for jar command variant
misaya98 Nov 5, 2024
cbc1fac
Update jvm params for test
misaya98 Nov 6, 2024
06013f3
inline getArgs_jar_command_variant in JarServiceNameDetectorTest
misaya98 Nov 6, 2024
9285540
rename test method name
misaya98 Nov 6, 2024
957e2e7
add comment for args handle
misaya98 Nov 6, 2024
6c65922
reformat MainJarPathFinder.java
misaya98 Nov 6, 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
10 changes: 7 additions & 3 deletions ...s/library/src/main/java/io/opentelemetry/instrumentation/resources/MainJarPathFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,13 @@ Path detectJarPath() {
@Nullable
private Path getJarPathFromProcessHandle() {
String[] javaArgs = getProcessHandleArguments.get();
for (int i = 0; i < javaArgs.length; ++i) {
if ("-jar".equals(javaArgs[i]) && (i < javaArgs.length - 1)) {
return Paths.get(javaArgs[i + 1]);
boolean jarOptionFound = false;
for (String javaArg : javaArgs) {
if ("-jar".equals(javaArg)) {
jarOptionFound = true;
}
if (jarOptionFound && !javaArg.startsWith("-")) {
return Paths.get(javaArg);
}
}
return null;
Expand Down
20 changes: 20 additions & 0 deletions .../src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@ void createResource_processHandleJar() {
.containsEntry(ServiceAttributes.SERVICE_NAME, "my-service");
}

@Test
void createResource_processHandleJar_jar_command_variant() {
JarServiceNameDetector serviceNameProvider =
getDetector(
getArgs_jar_command_variant("my-service.jar"),
prop -> null,
JarServiceNameDetectorTest::failPath);

Resource resource = serviceNameProvider.createResource(config);

assertThat(resource.getAttributes())
.hasSize(1)
.containsEntry(ServiceAttributes.SERVICE_NAME, "my-service");
}

@Test
void createResource_processHandleJarWithoutExtension() {
JarServiceNameDetector serviceNameProvider =
Expand All @@ -90,6 +105,11 @@ static String[] getArgs(String jarName) {
return new String[] {"-Dtest=42", "-Xmx666m", "-jar", path, "abc", "def"};
}

static String[] getArgs_jar_command_variant(String jarName) {
String path = Paths.get("path", "to", "app", jarName).toString();
return new String[] {"-Dtest=42", "-jar", "-Xmx512m", path, "abc", "def"};
}

@ParameterizedTest
@ArgumentsSource(SunCommandLineProvider.class)
void createResource_sunCommandLine(String commandLine, Path jarPath) {
Expand Down
Loading