Skip to content

Commit dfd61ab

Browse files
authored
Merge pull request #1 from misaya98/compatible-different-command-line-style
compatible different command line style for find jar path
2 parents 3b0e7b8 + 059b1a7 commit dfd61ab

File tree

1 file changed

+7
-3
lines changed
  • instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources

1 file changed

+7
-3
lines changed

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/MainJarPathFinder.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,13 @@ Path detectJarPath() {
4444
@Nullable
4545
private Path getJarPathFromProcessHandle() {
4646
String[] javaArgs = getProcessHandleArguments.get();
47-
for (int i = 0; i < javaArgs.length; ++i) {
48-
if ("-jar".equals(javaArgs[i]) && (i < javaArgs.length - 1)) {
49-
return Paths.get(javaArgs[i + 1]);
47+
boolean jarOptionFound = false;
48+
for (String javaArg : javaArgs) {
49+
if ("-jar".equals(javaArg)) {
50+
jarOptionFound = true;
51+
}
52+
if (jarOptionFound && !javaArg.startsWith("-")) {
53+
return Paths.get(javaArg);
5054
}
5155
}
5256
return null;

0 commit comments

Comments
 (0)