Skip to content

allow specification of musl #71

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

Closed
richardstartin wants to merge 1 commit into from
Closed

allow specification of musl #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions ddprof-lib/src/main/java/com/datadoghq/profiler/JavaProfiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private JavaProfiler() {
* before linking.
*/
public static JavaProfiler getInstance() throws IOException {
return getInstance(null, null);
return getInstance(null, null, null);
}

/**
Expand All @@ -96,14 +96,19 @@ public static JavaProfiler getInstance(String scratchDir) throws IOException {
return getInstance(null, scratchDir);
}

public static synchronized JavaProfiler getInstance(String libLocation, String scratchDir) throws IOException {
return getInstance(libLocation, scratchDir, null);
}

/**
* Get a {@linkplain JavaProfiler} instance backed by the given native library and using
* the given directory as the scratch where the bundled library will be exploded
* before linking.
* @param libLocation the path to the native library to be used instead of the bundled one
* @param scratchDir directory where the bundled library will be exploded before linking; ignored when 'libLocation' is {@literal null}
* @param isMusl true to load the musl binary, false for glibc, null for unknown (we'll try to figure it out by parsing the java executable)
*/
public static synchronized JavaProfiler getInstance(String libLocation, String scratchDir) throws IOException {
public static synchronized JavaProfiler getInstance(String libLocation, String scratchDir, Boolean isMusl) throws IOException {
if (instance != null) {
return instance;
}
Expand All @@ -112,7 +117,7 @@ public static synchronized JavaProfiler getInstance(String libLocation, String s
Path libraryPath = null;
if (libLocation == null) {
OperatingSystem os = OperatingSystem.current();
String qualifier = (os == OperatingSystem.linux && isMusl()) ? "musl" : null;
String qualifier = (os == OperatingSystem.linux && (isMusl == null ? isMusl() : isMusl)) ? "musl" : null;

libraryPath = libraryFromClasspath(os, Arch.current(), qualifier, Paths.get(scratchDir != null ? scratchDir : System.getProperty("java.io.tmpdir")));
libLocation = libraryPath.toString();
Expand Down