-
Notifications
You must be signed in to change notification settings - Fork 2.8k
[receiver/hostmetrics] Cheaper parent PID and number of threads retrieval on Windows #38589
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.
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
Changes from 2 commits
b00fe53
ad957d5
febe799
a4cd0bc
d4afa91
6cf9009
89700f4
5e37d3a
cb86156
842dee2
9ad27b6
4ae28a7
24577fd
d43aa79
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
//go:build windows | ||
|
||
package processscraper // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper" | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"unsafe" | ||
|
||
"github.com/shirou/gopsutil/v4/process" | ||
"golang.org/x/sys/windows" | ||
) | ||
|
||
func getProcessHandlesInternalNew(ctx context.Context) (processHandles, error) { | ||
snap, err := windows.CreateToolhelp32Snapshot(windows.TH32CS_SNAPPROCESS, 0) | ||
if err != nil { | ||
return nil, fmt.Errorf("could not create snapshot: %w", err) | ||
} | ||
defer func() { | ||
_ = windows.CloseHandle(snap) | ||
}() | ||
|
||
var pe32 windows.ProcessEntry32 | ||
pe32.Size = uint32(unsafe.Sizeof(pe32)) | ||
if err = windows.Process32First(snap, &pe32); err != nil { | ||
return nil, fmt.Errorf("could not get first process: %w", err) | ||
} | ||
|
||
wrappedProcesses := make([]wrappedProcessHandle, 0, 64) | ||
for { | ||
select { | ||
case <-ctx.Done(): | ||
return nil, ctx.Err() | ||
default: | ||
p, _ := process.NewProcess(int32(pe32.ProcessID)) | ||
if p != nil { | ||
wrappedProcess := wrappedProcessHandle{ | ||
Process: p, | ||
ppid: int32(pe32.ParentProcessID), | ||
threads: int32(pe32.Threads), | ||
} | ||
wrappedProcesses = append(wrappedProcesses, wrappedProcess) | ||
} | ||
} | ||
|
||
if err = windows.Process32Next(snap, &pe32); err != nil { | ||
break | ||
} | ||
} | ||
|
||
return &gopsProcessHandles{handles: wrappedProcesses}, nil | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
//go:build windows | ||
|
||
package processscraper | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"go.opentelemetry.io/collector/scraper" | ||
) | ||
|
||
func BenchmarkGetProcessMetadata(b *testing.B) { | ||
ctx := context.Background() | ||
config := &Config{ | ||
MuteProcessExeError: true, | ||
MuteProcessNameError: true, | ||
ExcludeParentPid: true, | ||
MuteProcessAllErrors: true, // Only way to pass the benchmark | ||
} | ||
|
||
scraper, err := newProcessScraper(scraper.Settings{}, config) | ||
if err != nil { | ||
b.Fatalf("Failed to create process scraper: %v", err) | ||
} | ||
|
||
benchmarks := []struct { | ||
name string | ||
getFunc func(context.Context) (processHandles, error) | ||
excludeParentPid bool | ||
}{ | ||
{ | ||
name: "Old-IncludeParentPid", | ||
getFunc: getProcessHandlesInternal, | ||
}, | ||
{ | ||
name: "New-IncludeParentPid", | ||
getFunc: getProcessHandlesInternalNew, | ||
}, | ||
{ | ||
name: "Old-ExcludeParentPid", | ||
getFunc: getProcessHandlesInternal, | ||
excludeParentPid: true, | ||
}, | ||
{ | ||
name: "New-ExcludeParentPid", | ||
getFunc: getProcessHandlesInternalNew, | ||
excludeParentPid: true, | ||
}, | ||
} | ||
|
||
for _, bm := range benchmarks { | ||
b.Run(bm.name, func(b *testing.B) { | ||
scraper.getProcessHandles = bm.getFunc | ||
scraper.config.ExcludeParentPid = bm.excludeParentPid | ||
|
||
for i := 0; i < b.N; i++ { | ||
_, err := scraper.getProcessMetadata(ctx) | ||
if err != nil { | ||
b.Fatalf("Failed to get process metadata: %v", err) | ||
} | ||
} | ||
}) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -250,7 +250,7 @@ func (s *processScraper) getProcessMetadata(ctx context.Context) ([]*processMeta | |
} | ||
|
||
command, err := getProcessCommand(ctx, handle) | ||
if err != nil { | ||
if err != nil && !s.config.MuteProcessAllErrors { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we add muting here but the related change on line 277 still unmuted? Maybe remove this from this PR to fix consistently as a separate bug_fix if needed? Just filing an issue is fine as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point that is a leftover from benchmarking... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
errs.AddPartial(0, fmt.Errorf("error reading command for process %q (pid %v): %w", executable.name, pid, err)) | ||
} | ||
|
||
|
@@ -271,14 +271,17 @@ func (s *processScraper) getProcessMetadata(ctx context.Context) ([]*processMeta | |
continue | ||
} | ||
|
||
parentPid, err := parentPid(ctx, handle, pid) | ||
if err != nil { | ||
errs.AddPartial(0, fmt.Errorf("error reading parent pid for process %q (pid %v): %w", executable.name, pid, err)) | ||
parentProcessID := int32(0) | ||
if !s.config.ExcludeParentPid { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you're right that we don't need a specific config for this. I would like to still make the check conditional, but we can make it conditional on whether the While on Windows with the new process enumeration method getting ppid no longer costs anything, on other platforms it will still be the old style of doing a certain operation per-process. It's cheap on other platforms, but as a matter of principle I do think any work this scraper does should be conditional on whether the user actually enabled that attribute/metric. |
||
parentProcessID, err = parentPid(ctx, handle, pid) | ||
if err != nil { | ||
errs.AddPartial(0, fmt.Errorf("error reading parent pid for process %q (pid %v): %w", executable.name, pid, err)) | ||
} | ||
} | ||
|
||
md := &processMetadata{ | ||
pid: pid, | ||
parentPid: parentPid, | ||
parentPid: parentProcessID, | ||
executable: executable, | ||
command: command, | ||
username: username, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file could be removed when we remove the featureflag to fallback to the old behavior.