Skip to content

fix: remove non-spec Silent/Catastrophe fields from FDv2 Goodbye #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keelerm84 merged 1 commit into from
Apr 30, 2026
Merged

fix: remove non-spec Silent/Catastrophe fields from FDv2 Goodbye #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions internal/datasourcev2/streaming_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,7 @@ func (sp *StreamProcessor) consumeStream(stream *es.Stream, resultChan chan<- su
break
}

if !goodbye.Silent {
sp.loggers.Errorf("SSE server received error: %s (%v)", goodbye.Reason, goodbye.Catastrophe)
}
sp.loggers.Infof("SSE server sent goodbye: %s", goodbye.Reason)
case subsystems.EventError:
var errorData subsystems.Error
err := json.Unmarshal([]byte(event.Data()), &errorData)
Expand Down
4 changes: 1 addition & 3 deletions internal/datasourcev2/streaming_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,9 +754,7 @@ func TestStreamingDataSourceIgnoresGoodbye(t *testing.T) {
protocol.WithPutObjects([]subsystems.PutObject{change})

protocol.WithGoodbye(subsystems.Goodbye{
Reason: "for testing reason",
Silent: false,
Catastrophe: false,
Reason: "for testing reason",
})

// Push a change through the data source
Expand Down
4 changes: 1 addition & 3 deletions subsystems/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,7 @@ func (e Error) Name() EventName {
// Do not use it.
// You have been warned.
type Goodbye struct {
Reason string `json:"reason"`
Silent bool `json:"silent"`
Catastrophe bool `json:"catastrophe"`
Reason string `json:"reason"`
}

//nolint:revive // Event method.
Expand Down
Loading