Fix bug in setting the correct collector state after a config change …

…event. (#5896) * Fix bug in setting the correct collector state after a config change event. Fixes #5830. * Update collector_test.go Co-authored-by: Bogdan Drutu <[email protected]> Co-authored-by: Bogdan Drutu <[email protected]>
open-telemetry · Aug 15, 2022 · a56622d · a56622d
1 parent e89786d
commit a56622d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ### 🧰 Bug fixes 🧰
 
+- Fix bug in setting the correct collector state after a configuration change event. (#5830)
+
 ## v0.58.0 Beta
 
 ### 🛑 Breaking changes 🛑

diff --git a/service/collector.go b/service/collector.go
@@ -131,7 +131,6 @@ func (col *Collector) runAndWaitForShutdownEvent(ctx context.Context) error {
 		signal.Notify(col.signalsChannel, os.Interrupt, syscall.SIGTERM)
 	}
 
-	col.setCollectorState(Running)
 LOOP:
 	for {
 		select {
@@ -198,7 +197,7 @@ func (col *Collector) setupConfigurationComponents(ctx context.Context) error {
 	if err = col.service.Start(ctx); err != nil {
 		return err
 	}
-
+	col.setCollectorState(Running)
 	return nil
 }
 

diff --git a/service/collector_test.go b/service/collector_test.go
@@ -105,6 +105,53 @@ func TestCollectorCancelContext(t *testing.T) {
 	assert.Equal(t, Closed, col.GetState())
 }
 
+type mockCfgProvider struct {
+	watcher chan error
+}
+
+func (p mockCfgProvider) Get(_ context.Context, _ component.Factories) (*Config, error) {
+	return generateConfig(), nil
+}
+
+func (p mockCfgProvider) Watch() <-chan error {
+	return p.watcher
+}
+
+func (p mockCfgProvider) Shutdown(_ context.Context) error {
+	return nil
+}
+
+func TestCollectorStateAfterConfigChange(t *testing.T) {
+	factories, err := componenttest.NopFactories()
+	require.NoError(t, err)
+
+	watcher := make(chan error, 1)
+	col, err := New(CollectorSettings{
+		BuildInfo:      component.NewDefaultBuildInfo(),
+		Factories:      factories,
+		ConfigProvider: &mockCfgProvider{watcher: watcher},
+		telemetry:      newColTelemetry(featuregate.NewRegistry()),
+	})
+	require.NoError(t, err)
+
+	wg := startCollector(context.Background(), t, col)
+
+	assert.Eventually(t, func() bool {
+		return Running == col.GetState()
+	}, 2*time.Second, 200*time.Millisecond)
+
+	watcher <- nil
+
+	assert.Eventually(t, func() bool {
+		return Running == col.GetState()
+	}, 2*time.Second, 200*time.Millisecond)
+
+	col.Shutdown()
+
+	wg.Wait()
+	assert.Equal(t, Closed, col.GetState())
+}
+
 func TestCollectorReportError(t *testing.T) {
 	factories, err := componenttest.NopFactories()
 	require.NoError(t, err)
@@ -348,6 +395,7 @@ func testCollectorStartHelper(t *testing.T, telemetry *telemetryInitializer, tc
 	assertMetrics(t, metricsAddr, tc.expectedLabels)
 
 	assertZPages(t)
+
 	col.Shutdown()
 
 	wg.Wait()