Fix race conditions (#1094)

Author: aphralG

internal/collector/otel_collector_plugin.go

@@ -161,10 +161,16 @@ func (oc *Collector) processReceivers(ctx context.Context, receivers []config.Ot
 	}
 }
 
+// nolint: revive, cyclop
 func (oc *Collector) bootup(ctx context.Context) error {
 	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
@@ -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
@@ -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
 			}

internal/file/file_manager_service.go

@@ -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

internal/watcher/instance/instance_watcher_service.go

@@ -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()
 			}
 		}
 	}