Skip to content
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

Jump to bottom

pprofextension: use uber/atomic instead of sync/atomic #9813

Merged
merged 2 commits into from
May 10, 2022
Merged

pprofextension: use uber/atomic instead of sync/atomic #9813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6308b1c
pprofextension: use uber/atomic instead of sync/atomic
bogdandrutu May 9, 2022
4bea29f
Update extension/pprofextension/pprofextension.go
May 10, 2022
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
2 changes: 1 addition & 1 deletion extension/pprofextension/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.50.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7
go.uber.org/atomic v1.9.0
go.uber.org/zap v1.21.0
)

Expand All @@ -26,7 +27,6 @@ require (
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/metric v0.30.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
Expand Down
18 changes: 6 additions & 12 deletions extension/pprofextension/pprofextension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,13 @@ import (
"os"
"runtime"
"runtime/pprof"
"sync/atomic"
"unsafe"

"go.opentelemetry.io/collector/component"
"go.uber.org/atomic"
"go.uber.org/zap"
)

// Tracks that only a single instance is active per process.
// See comment on Start method for the reasons for that.
var activeInstance *pprofExtension

// #nosec G103
var activeInstancePtr = (*unsafe.Pointer)(unsafe.Pointer(&activeInstance))
var running = atomic.NewBool(false)

type pprofExtension struct {
config Config
Expand All @@ -52,15 +46,15 @@ func (p *pprofExtension) Start(_ context.Context, host component.Host) error {
// this issue we will allow the start of a single instance once per process
// Summary: only a single instance can be running in the same process.
// #nosec G103
bogdandrutu marked this conversation as resolved.
Show resolved Hide resolved
if !atomic.CompareAndSwapPointer(activeInstancePtr, nil, unsafe.Pointer(p)) {
if !running.CAS(false, true) {
return errors.New("only a single pprof extension instance can be running per process")
}

// Take care that if any error happen when starting the active instance is cleaned.
var startErr error
defer func() {
if startErr != nil {
atomic.StorePointer(activeInstancePtr, nil)
running.Store(false)
}
}()

Expand All @@ -79,7 +73,7 @@ func (p *pprofExtension) Start(_ context.Context, host component.Host) error {
p.stopCh = make(chan struct{})
go func() {
defer func() {
atomic.StorePointer(activeInstancePtr, nil)
running.Store(false)
close(p.stopCh)
}()

Expand All @@ -103,7 +97,7 @@ func (p *pprofExtension) Start(_ context.Context, host component.Host) error {
}

func (p *pprofExtension) Shutdown(context.Context) error {
defer atomic.StorePointer(activeInstancePtr, nil)
defer running.Store(false)
if p.file != nil {
pprof.StopCPUProfile()
_ = p.file.Close() // ignore the error
Expand Down