Merge branch 'main' into feat/supervisor-config-env-variables

Rebase

pkg/stanza/operator/input/windows/input.go

@@ -154,22 +154,28 @@ func (i *Input) Start(persister operator.Persister) error {
 
 // Stop will stop reading events from a subscription.
 func (i *Input) Stop() error {
-	i.cancel()
+	// Warning: all calls made below must be safe to be done even if Start() was not called or failed.
+
+	if i.cancel != nil {
+		i.cancel()
+	}
+
 	i.wg.Wait()
 
+	var errs error
 	if err := i.subscription.Close(); err != nil {
-		return fmt.Errorf("failed to close subscription: %w", err)
+		errs = errors.Join(errs, fmt.Errorf("failed to close subscription: %w", err))
 	}
 
 	if err := i.bookmark.Close(); err != nil {
-		return fmt.Errorf("failed to close bookmark: %w", err)
+		errs = errors.Join(errs, fmt.Errorf("failed to close bookmark: %w", err))
 	}
 
 	if err := i.publisherCache.evictAll(); err != nil {
-		return fmt.Errorf("failed to close publishers: %w", err)
+		errs = errors.Join(errs, fmt.Errorf("failed to close publishers: %w", err))
 	}
 
-	return i.stopRemoteSession()
+	return errors.Join(errs, i.stopRemoteSession())
 }
 
 // readOnInterval will read events with respect to the polling interval until it reaches the end of the channel.

pkg/stanza/operator/input/windows/input_test.go

@@ -24,6 +24,12 @@ func newTestInput() *Input {
 	})
 }
 
+// TestInputCreate_Stop ensures the input correctly shuts down even if it was never started.
+func TestInputCreate_Stop(t *testing.T) {
+	input := newTestInput()
+	assert.NoError(t, input.Stop())
+}
+
 // TestInputStart_LocalSubscriptionError ensures the input correctly handles local subscription errors.
 func TestInputStart_LocalSubscriptionError(t *testing.T) {
 	persister := testutil.NewMockPersister("")