Jun 6, 2022 · Jun 2, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 3, 2022
diff --git a/cli/agent.go b/cli/agent.go
 _ "net/http/pprof" //nolint: gosec
 "net/url"
 "os"
 "os/signal"
 "path/filepath"
 "syscall"
 "time"

 "cloud.google.com/go/compute/metadata"
 logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()), sloghuman.Sink(logWriter)).Leveled(slog.LevelDebug)
 client := codersdk.New(coderURL)

 usr1 := make(chan os.Signal, 1)
 if pprofEnabled {
 close(usr1)
 srvClose := serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")
 defer srvClose()
 } else {
 // If pprof wasn't enabled at startup, allow a
 // `kill -USR1 $agent_pid` to start it.
 signal.Notify(usr1, syscall.SIGUSR1)
 go func() {
 defer close(usr1)
 defer signal.Stop(usr1)

 select {
 case <-usr1:
 signal.Stop(usr1)
 srvClose := serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")
 defer srvClose()
 case <-cmd.Context().Done():
 return
 }
 <-cmd.Context().Done() // Prevent defer close until done.
 }()
 srvClose := agentPPROFStartOnUSR1(cmd.Context(), logger, pprofAddress)
 defer srvClose()
 }

 // exchangeToken returns a session token.
 },
 })
 <-cmd.Context().Done()
 <-usr1 // Wait for server to close (if started).
 return closer.Close()
 },
 }
diff --git a/cli/agent_unix.go b/cli/agent_unix.go
 package cli

 import (
 "context"
 "os"
 "os/signal"
 "syscall"

 "cdr.dev/slog"
 )

 func agentPPROFStartOnUSR1(ctx context.Context, logger slog.Logger, pprofAddress string) (srvClose func()) {
 usr1 := make(chan os.Signal, 1)
 signal.Notify(usr1, syscall.SIGUSR1)
 go func() {
 defer close(usr1)
 defer signal.Stop(usr1)

 select {
 case <-usr1:
 signal.Stop(usr1)
 srvClose := serveHandler(ctx, logger, nil, pprofAddress, "pprof")
 defer srvClose()
 case <-ctx.Done():
 return
 }
 <-ctx.Done() // Prevent defer close until done.
 }()

 return func() {
 <-usr1 // Wait until usr1 is closed, ensures srvClose was run.
 }
 }
diff --git a/cli/agent_windows.go b/cli/agent_windows.go
 package cli

 import (
 "context"
 "os"
 "os/signal"
 "syscall"

 "cdr.dev/slog"
 )

 // agentPPROFStartOnUSR1 is no-op on Windows (no SIGUSR1 signal).
 func agentPPROFStartOnUSR1(ctx context.Context, logger slog.Logger, pprofAddress string) (srvClose func()) {
 return func() {}
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,9 +6,7 @@ import (
		_ "net/http/pprof" //nolint: gosec
		"net/url"
		"os"
		"os/signal"
		"path/filepath"
		"syscall"
		"time"

		"cloud.google.com/go/compute/metadata"
Expand DownExpand Up		@@ -54,29 +52,14 @@ func workspaceAgent() *cobra.Command {
		logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()), sloghuman.Sink(logWriter)).Leveled(slog.LevelDebug)
		client := codersdk.New(coderURL)

		usr1 := make(chan os.Signal, 1)
		if pprofEnabled {
		close(usr1)
		srvClose := serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")
		defer srvClose()
		} else {
		// If pprof wasn't enabled at startup, allow a
		// `kill -USR1 $agent_pid` to start it.
		signal.Notify(usr1, syscall.SIGUSR1)
		go func() {
		defer close(usr1)
		defer signal.Stop(usr1)

		select {
		case <-usr1:
		signal.Stop(usr1)
		srvClose := serveHandler(cmd.Context(), logger, nil, pprofAddress, "pprof")
		defer srvClose()
		case <-cmd.Context().Done():
		return
		}
		<-cmd.Context().Done() // Prevent defer close until done.
		}()
		srvClose := agentPPROFStartOnUSR1(cmd.Context(), logger, pprofAddress)
		defer srvClose()
		}

		// exchangeToken returns a session token.
Expand DownExpand Up		@@ -164,7 +147,6 @@ func workspaceAgent() *cobra.Command {
		},
		})
		<-cmd.Context().Done()
		<-usr1 // Wait for server to close (if started).
		return closer.Close()
		},
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,33 @@
		package cli

		import (
		"context"
		"os"
		"os/signal"
		"syscall"

		"cdr.dev/slog"
		)

		func agentPPROFStartOnUSR1(ctx context.Context, logger slog.Logger, pprofAddress string) (srvClose func()) {
		usr1 := make(chan os.Signal, 1)
		signal.Notify(usr1, syscall.SIGUSR1)
		go func() {
		defer close(usr1)
		defer signal.Stop(usr1)

		select {
		case <-usr1:
		signal.Stop(usr1)
		srvClose := serveHandler(ctx, logger, nil, pprofAddress, "pprof")
		defer srvClose()
		case <-ctx.Done():
		return
		}
		<-ctx.Done() // Prevent defer close until done.
		}()

		return func() {
		<-usr1 // Wait until usr1 is closed, ensures srvClose was run.
		}
		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,15 @@
		package cli

		import (
		"context"
		"os"
		"os/signal"
		"syscall"

		"cdr.dev/slog"
		)

		// agentPPROFStartOnUSR1 is no-op on Windows (no SIGUSR1 signal).
		func agentPPROFStartOnUSR1(ctx context.Context, logger slog.Logger, pprofAddress string) (srvClose func()) {
		return func() {}
		}