Skip to content

fix: use PROFILER_STOP_COMMAND in Shutdown hook #537

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 1 commit into from
Mar 31, 2025
Merged

fix: use PROFILER_STOP_COMMAND in Shutdown hook #537

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions ...ava-profiler/extension/src/main/java/com/amazonaws/services/lambda/extension/PreMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void premain(String agentArgs, Instrumentation inst) {
if(!createFileIfNotExist("/tmp/aws-lambda-java-profiler")) {
Logger.debug("starting the profiler for coldstart");
startProfiler();
registerShutdownHook(AsyncProfiler.getInstance());
registerShutdownHook();
try {
Integer port = Integer.parseInt(INTERNAL_COMMUNICATION_PORT);
Logger.debug("using profile communication port = " + port);
Expand Down Expand Up @@ -101,9 +101,9 @@ public static void startProfiler() {
}
}

public static void registerShutdownHook(AsyncProfiler profiler) {
public static void registerShutdownHook() {
Logger.debug("registering shutdown hook");
Thread shutdownHook = new Thread(new ShutdownHook(profiler));
Thread shutdownHook = new Thread(new ShutdownHook(PROFILER_STOP_COMMAND));
Runtime.getRuntime().addShutdownHook(shutdownHook);
}

Expand Down
8 changes: 4 additions & 4 deletions ...rofiler/extension/src/main/java/com/amazonaws/services/lambda/extension/ShutdownHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

public class ShutdownHook implements Runnable {

private AsyncProfiler profiler;
private String stopCommand;

public ShutdownHook(AsyncProfiler profiler) {
this.profiler = profiler;
public ShutdownHook(String stopCommand) {
this.stopCommand = stopCommand;
}

@Override
Expand All @@ -18,7 +18,7 @@ public void run() {
try {
final String fileName = "/tmp/profiling-data-shutdown.html";
Logger.debug("stopping the profiler");
AsyncProfiler.getInstance().execute(String.format("stop,file=%s,include=*AWSLambda.main,include=start_thread", fileName));
AsyncProfiler.getInstance().execute(String.format(this.stopCommand, fileName));
} catch (Exception e) {
Logger.error("could not stop the profiler");
}
Expand Down