Merge branch 'v3' into remove-duplicate-certs

Author: aphralG

internal/collector/otel_collector_plugin.go

@@ -120,6 +120,10 @@ func (oc *Collector) Init(ctx context.Context, mp bus.MessagePipeInterface) erro
 		oc.processReceivers(ctx, oc.config.Collector.Receivers.OtlpReceivers)
 	}
 
+	if !oc.stopped {
+		return errors.New("OTel collector already running")
+	}
+
 	bootErr := oc.bootup(runCtx)
 	if bootErr != nil {
 		slog.ErrorContext(runCtx, "Unable to start OTel Collector", "error", bootErr)
@@ -219,6 +223,7 @@ func (oc *Collector) Close(ctx context.Context) error {
 			slog.ErrorContext(ctx, "Failed to shutdown OTel Collector", "error", err, "state", oc.service.GetState())
 		} else {
 			slog.InfoContext(ctx, "OTel Collector shutdown", "state", oc.service.GetState())
+			oc.stopped = true
 		}
 	}
 
@@ -374,6 +379,11 @@ func (oc *Collector) restartCollector(ctx context.Context) {
 	var runCtx context.Context
 	runCtx, oc.cancel = context.WithCancel(ctx)
 
+	if !oc.stopped {
+		slog.ErrorContext(ctx, "Unable to restart OTel collector, failed to stop collector")
+		return
+	}
+
 	bootErr := oc.bootup(runCtx)
 	if bootErr != nil {
 		slog.ErrorContext(runCtx, "Unable to start OTel Collector", "error", bootErr)

internal/file/file_manager_service.go

@@ -121,8 +121,6 @@ func (fms *FileManagerService) UpdateOverview(
 	defer backoffCancel()
 
 	sendUpdateOverview := func() (*mpi.UpdateOverviewResponse, error) {
-		slog.DebugContext(newCtx, "Sending update overview request", "request", request,
-			"parent_correlation_id", correlationID)
 		if fms.fileServiceClient == nil {
 			return nil, errors.New("file service client is not initialized")
 		}
@@ -131,6 +129,14 @@ func (fms *FileManagerService) UpdateOverview(
 			return nil, errors.New("CreateConnection rpc has not being called yet")
 		}
 
+		slog.InfoContext(newCtx, "Updating file overview",
+			"instance_id", request.GetOverview().GetConfigVersion().GetInstanceId(),
+			"parent_correlation_id", correlationID,
+		)
+		slog.DebugContext(newCtx, "Sending update overview request",
+			"request", request, "parent_correlation_id", correlationID,
+		)
+
 		response, updateError := fms.fileServiceClient.UpdateOverview(newCtx, request)
 
 		validatedError := grpc.ValidateGrpcError(updateError)
@@ -178,8 +184,6 @@ func (fms *FileManagerService) setupIdentifiers(ctx context.Context, iteration i
 	}
 
 	newCtx := context.WithValue(ctx, logger.CorrelationIDContextKey, requestCorrelationID)
-	slog.InfoContext(newCtx, "Updating file overview", "instance_id", logger.GetCorrelationIDAttr(ctx),
-		"parent_correlation_id", correlationID)
 
 	return newCtx, correlationID
 }