-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cmd/opampsupervisor] Make supervisor runnable as Windows service (#3…
…5275) **Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> Add support for running supervisor as a Windows Service. Updates entry point to run a service handler if being ran as a Windows Service by implementing the [handler interface](https://pkg.go.dev/golang.org/x/sys/windows/svc#Handler). Also updates the Windows Commander to allocate a console if running as a service. We send a CTRL_BREAK_EVENT console event to the agent to signal a shutdown however windows services do not run with consoles. If running as service we need to allocate a console to send the signal and then free the console. **Link to tracking Issue:** <Issue number if applicable> Closes #34774 **Testing:** <Describe what testing was performed and which tests were added.> - Tested using a windows VM and using `sc.exe` for creating the service **Documentation:** <Describe the documentation added.>
- Loading branch information
1 parent
6945c86
commit 2cb6696
Showing
11 changed files
with
483 additions
and
9 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
.chloggen/make-supervisor-a-compatible-windows-service.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: enhancement | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: opampsupervisor | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Make supervisor runnable as a Windows Service. | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [34774] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | ||
|
||
# If your change doesn't affect end users or the exported elements of any package, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
//go:build !windows | ||
|
||
package main | ||
|
||
func run() error { | ||
return runInteractive() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
//go:build windows | ||
|
||
package main | ||
|
||
import ( | ||
"errors" | ||
"fmt" | ||
|
||
"golang.org/x/sys/windows" | ||
"golang.org/x/sys/windows/svc" | ||
|
||
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor/supervisor" | ||
) | ||
|
||
var ( | ||
kernel32API = windows.NewLazySystemDLL("kernel32.dll") | ||
|
||
allocConsoleProc = kernel32API.NewProc("AllocConsole") | ||
freeConsoleProc = kernel32API.NewProc("FreeConsole") | ||
) | ||
|
||
func run() error { | ||
// always allocate a console in case we're running as service | ||
if err := allocConsole(); err != nil { | ||
if !errors.Is(err, windows.ERROR_ACCESS_DENIED) { | ||
// Per https://learn.microsoft.com/en-us/windows/console/allocconsole#remarks | ||
// AllocConsole fails with this error when there's already a console attached, such as not being ran as service | ||
// ignore this error and only return other errors | ||
return fmt.Errorf("alloc console: %w", err) | ||
} | ||
|
||
} | ||
defer func() { | ||
_ = freeConsole() | ||
}() | ||
|
||
// No need to supply service name when startup is invoked through | ||
// the Service Control Manager directly. | ||
if err := svc.Run("", supervisor.NewSvcHandler()); err != nil { | ||
if errors.Is(err, windows.ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { | ||
// Per https://learn.microsoft.com/en-us/windows/win32/api/winsvc/nf-winsvc-startservicectrldispatchera#return-value | ||
// this means that the process is not running as a service, so run interactively. | ||
|
||
return runInteractive() | ||
} | ||
return fmt.Errorf("failed to start supervisor: %w", err) | ||
} | ||
return nil | ||
} | ||
|
||
// windows services don't get created with a console | ||
// need to allocate a console in order to send CTRL_BREAK_EVENT to agent sub process | ||
func allocConsole() error { | ||
ret, _, err := allocConsoleProc.Call() | ||
if ret == 0 { | ||
return err | ||
} | ||
return nil | ||
} | ||
|
||
// free console once we're done with it | ||
func freeConsole() error { | ||
ret, _, err := freeConsoleProc.Call() | ||
if ret == 0 { | ||
return err | ||
} | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.