Skip to content

Fix race conditions #1094

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
dhurley merged 5 commits into from
Jun 6, 2025
Merged

Fix race conditions #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f423f1
add nil check
aphralG May 27, 2025
e07ebbb
fix race conditions
aphralG May 28, 2025
cab1df1
fix race conditions
aphralG May 28, 2025
846c064
fix race conditions
aphralG May 28, 2025
63ee793
check service is not nil in boot up
aphralG Jun 5, 2025
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
15 changes: 12 additions & 3 deletions internal/collector/otel_collector_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,17 @@ func (oc *Collector) processReceivers(ctx context.Context, receivers []config.Ot
}
}

// nolint: revive, cyclop
func (oc *Collector) bootup(ctx context.Context) error {
slog.InfoContext(ctx, "Starting OTel collector")
errChan := make(chan error)

go func() {
if oc.service == nil {
errChan <- fmt.Errorf("unable to start OTel collector: service is nil")
return
}

appErr := oc.service.Run(ctx)
if appErr != nil {
errChan <- appErr
Expand All @@ -177,8 +183,11 @@ func (oc *Collector) bootup(ctx context.Context) error {
case err := <-errChan:
return err
default:
state := oc.service.GetState()
if oc.service == nil {
return fmt.Errorf("unable to start otel collector: service is nil")
}

state := oc.service.GetState()
switch state {
case otelcol.StateStarting:
// NoOp
Expand Down Expand Up @@ -212,9 +221,9 @@ func (oc *Collector) Close(ctx context.Context) error {
oc.service.Shutdown()
oc.cancel()

settings := oc.config.Client.Backoff
settings := *oc.config.Client.Backoff
settings.MaxElapsedTime = maxTimeToWaitForShutdown
err := backoff.WaitUntil(ctx, settings, func() error {
err := backoff.WaitUntil(ctx, &settings, func() error {
if oc.service.GetState() == otelcol.StateClosed {
return nil
}
Expand Down
3 changes: 2 additions & 1 deletion internal/file/file_manager_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ func (fms *FileManagerService) UpdateOverview(
return response, nil
}

backoffSettings := fms.agentConfig.Client.Backoff
response, err := backoff.RetryWithData(
sendUpdateOverview,
backoffHelpers.Context(backOffCtx, fms.agentConfig.Client.Backoff),
backoffHelpers.Context(backOffCtx, backoffSettings),
)
if err != nil {
return err
Expand Down
2 changes: 2 additions & 0 deletions internal/watcher/instance/instance_watcher_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ func (iw *InstanceWatcherService) checkForUpdates(
iw.sendNginxConfigContextUpdate(newCtx, nginxConfigContext)
iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
proto.UpdateNginxInstanceRuntime(newInstance, nginxConfigContext)
iw.cacheMutex.Lock()
iw.instanceCache[newInstance.GetInstanceMeta().GetInstanceId()] = newInstance
iw.cacheMutex.Unlock()
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/watcher/process/process_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (
"context"
"strings"

"github.com/shirou/gopsutil/v4/process"

"github.com/nginx/agent/v3/pkg/nginxprocess"
"github.com/shirou/gopsutil/v4/process"
)

//go:generate go run github.com/maxbrunsfeld/counterfeiter/v6@v6.8.1 -generate
Expand Down
Loading