diff --git a/.chloggen/improve_start_component_error.yaml b/.chloggen/improve_start_component_error.yaml new file mode 100644 index 00000000000..7f85dec2637 --- /dev/null +++ b/.chloggen/improve_start_component_error.yaml @@ -0,0 +1,25 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: service + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: include component id/type in start error + +# One or more tracking issues or pull requests related to the change +issues: [10426] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index 3f5ae33fd91..022aff65b7e 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -428,7 +428,7 @@ func (g *Graph) StartAll(ctx context.Context, host *Host) error { zap.String("type", instanceID.Kind().String()), zap.String("id", instanceID.ComponentID().String()), ) - return compErr + return fmt.Errorf("failed to start %q %s: %w", instanceID.ComponentID().String(), strings.ToLower(instanceID.Kind().String()), compErr) } host.Reporter.ReportOKIfStarting(instanceID) diff --git a/service/internal/graph/lifecycle_test.go b/service/internal/graph/lifecycle_test.go index 07db29df3e4..eddf131d82f 100644 --- a/service/internal/graph/lifecycle_test.go +++ b/service/internal/graph/lifecycle_test.go @@ -162,7 +162,7 @@ func TestGraphStartStopComponentError(t *testing.T) { F: r1, T: e1, }) - require.EqualError(t, pg.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}), "foo") + require.ErrorIs(t, pg.StartAll(context.Background(), &Host{Reporter: status.NewReporter(func(*componentstatus.InstanceID, *componentstatus.Event) {}, func(error) {})}), r1.startErr) assert.EqualError(t, pg.ShutdownAll(context.Background(), statustest.NewNopStatusReporter()), "bar") } @@ -432,7 +432,7 @@ func TestStatusReportedOnStartupShutdown(t *testing.T) { } pg.componentGraph.SetEdge(simple.Edge{F: e0, T: e1}) - assert.Equal(t, tt.startupErr, pg.StartAll(context.Background(), &Host{Reporter: rep})) + require.ErrorIs(t, pg.StartAll(context.Background(), &Host{Reporter: rep}), tt.startupErr) assert.Equal(t, tt.shutdownErr, pg.ShutdownAll(context.Background(), rep)) assertEqualStatuses(t, tt.expectedStatuses, actualStatuses) })