Skip to content

Commit 39ac163

Browse files
committed
use system property to get path
1 parent 98f39ad commit 39ac163

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

instrumentation-docs/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ tasks {
2222
val runAnalysis by registering(JavaExec::class) {
2323
dependsOn(classes)
2424

25+
systemProperty("basePath", project.rootDir)
2526
mainClass.set("io.opentelemetry.instrumentation.docs.DocGeneratorApplication")
2627
classpath(sourceSets["main"].runtimeClasspath)
2728
}

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/DocGeneratorApplication.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.instrumentation.docs.utils.YamlHelper;
1313
import java.io.BufferedWriter;
1414
import java.io.IOException;
15-
import java.net.URL;
1615
import java.nio.charset.Charset;
1716
import java.nio.file.Files;
1817
import java.nio.file.Paths;
@@ -28,7 +27,10 @@ public class DocGeneratorApplication {
2827

2928
public static void main(String[] args) throws IOException {
3029
// Identify path to repo so we can use absolute paths
31-
String baseRepoPath = getRepoPath();
30+
String baseRepoPath = System.getProperty("basePath");
31+
if (baseRepoPath == null) {
32+
baseRepoPath = "./";
33+
}
3234

3335
FileManager fileManager = new FileManager(baseRepoPath);
3436
List<InstrumentationModule> modules = new InstrumentationAnalyzer(fileManager).analyze();
@@ -47,16 +49,6 @@ public static void main(String[] args) throws IOException {
4749
printStats(modules);
4850
}
4951

50-
private static String getRepoPath() throws IOException {
51-
URL resource = DocGeneratorApplication.class.getClassLoader().getResource("");
52-
if (resource == null) {
53-
throw new IOException("Error getting classloader location");
54-
}
55-
return Paths.get(resource.getPath())
56-
.toString()
57-
.replace("/instrumentation-docs/build/classes/java/main", "");
58-
}
59-
6052
private static void printStats(List<InstrumentationModule> modules) {
6153
List<InstrumentationModule> metadata =
6254
modules.stream().filter(m -> m.getMetadata() != null).toList();

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/InstrumentationAnalyzer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ public static List<InstrumentationModule> convertToInstrumentationModules(
6363
}
6464

6565
private static String sanitizePathName(String rootPath, String path) {
66-
return path.replace(rootPath + "/", "").replace("/javaagent", "").replace("/library", "");
66+
String result = path.replace(rootPath, "").replace("/javaagent", "").replace("/library", "");
67+
if (result.startsWith("/")) {
68+
result = result.substring(1);
69+
}
70+
return result;
6771
}
6872

6973
/**

0 commit comments

Comments
 (0)