Skip to content

Fix bsr watcher leak #873

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
jem-davies merged 7 commits into from
Jun 4, 2026
Merged

Fix bsr watcher leak #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
367bee9
add goleak to protobuf processor test
jem-davies Jun 1, 2026
5396bc7
remove go-routine leaks
jem-davies Jun 1, 2026
78c9581
Update internal/impl/protobuf/processor_protobuf.go
jem-davies Jun 1, 2026
af20c3d
fix lint
jem-davies Jun 1, 2026
2821b50
use a shutdown signaller instead of stored ctx
jem-davies Jun 2, 2026
383d936
clear map values on Close() calls
jem-davies Jun 2, 2026
357333d
merge origin/main
jem-davies Jun 3, 2026
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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ require (
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0
go.opentelemetry.io/otel/sdk v1.44.0
go.opentelemetry.io/otel/trace v1.44.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.52.0
golang.org/x/net v0.55.0
Expand Down
33 changes: 28 additions & 5 deletions internal/impl/protobuf/multimodule_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"buf.build/gen/go/bufbuild/reflect/connectrpc/go/buf/reflect/v1beta1/reflectv1beta1connect"
connectrpc "connectrpc.com/connect"
"github.com/Jeffail/shutdown"
"github.com/bufbuild/prototransform"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
Expand All @@ -19,6 +20,8 @@ import (

type MultiModuleWatcher struct {
bsrClients map[string]*prototransform.SchemaWatcher
httpClient *http.Client
shutSig *shutdown.Signaller
}

var _ prototransform.Resolver = &MultiModuleWatcher{}
Expand All @@ -27,10 +30,19 @@ func newMultiModuleWatcher(bsrModules []*service.ParsedConfig) (*MultiModuleWatc
if len(bsrModules) == 0 {
return nil, errors.New("no modules provided")
}
multiModuleWatcher := &MultiModuleWatcher{}

httpClient := &http.Client{
Transport: &http.Transport{},
Comment thread
gregfurman marked this conversation as resolved.
}
multiModuleWatcher := &MultiModuleWatcher{
bsrClients: make(map[string]*prototransform.SchemaWatcher),
httpClient: httpClient,
shutSig: shutdown.NewSignaller(),
}

ctx, _ := multiModuleWatcher.shutSig.SoftStopCtx(context.Background())

// Initialise one client for each module
multiModuleWatcher.bsrClients = make(map[string]*prototransform.SchemaWatcher)
for _, bsrModule := range bsrModules {
var bsrURL string
bsrURL, err := bsrModule.FieldString(fieldBSRUrl)
Expand All @@ -53,7 +65,7 @@ func newMultiModuleWatcher(bsrModules []*service.ParsedConfig) (*MultiModuleWatc
return nil, err
}

watcher, err := newSchemaWatcher(context.Background(), bsrURL, bsrAPIKey, module, version)
watcher, err := newSchemaWatcher(ctx, httpClient, bsrURL, bsrAPIKey, module, version)
if err != nil {
return nil, err
}
Expand All @@ -63,7 +75,7 @@ func newMultiModuleWatcher(bsrModules []*service.ParsedConfig) (*MultiModuleWatc
return multiModuleWatcher, nil
}

func newSchemaWatcher(ctx context.Context, bsrURL string, bsrAPIKey string, module string, version string) (*prototransform.SchemaWatcher, error) {
func newSchemaWatcher(ctx context.Context, httpClient *http.Client, bsrURL string, bsrAPIKey string, module string, version string) (*prototransform.SchemaWatcher, error) {
// If no BSR url provided, extract from module
if bsrURL == "" {
segments := strings.Split(module, "/")
Expand All @@ -80,7 +92,7 @@ func newSchemaWatcher(ctx context.Context, bsrURL string, bsrAPIKey string, modu
if bsrAPIKey != "" {
opts = append(opts, connectrpc.WithInterceptors(prototransform.NewAuthInterceptor(bsrAPIKey)))
}
client := reflectv1beta1connect.NewFileDescriptorSetServiceClient(http.DefaultClient, bsrURL, opts...)
client := reflectv1beta1connect.NewFileDescriptorSetServiceClient(httpClient, bsrURL, opts...)

cfg := &prototransform.SchemaWatcherConfig{
SchemaPoller: prototransform.NewSchemaPoller(
Expand Down Expand Up @@ -173,3 +185,14 @@ func (w *MultiModuleWatcher) FindEnumByName(enum protoreflect.FullName) (protore
}
return nil, fmt.Errorf("could not find %s in any loaded modules", enum)
}

func (m *MultiModuleWatcher) Close() {
m.shutSig.TriggerHardStop()
for _, v := range m.bsrClients {

@gregfurman gregfurman Jun 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q: Is it a memory leak that we never actually clear these clients stored in the map? Also, what if one stops before we call close -- should it be deleted early? 🤔

@jem-davies jem-davies Jun 2, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a m.bsrClients = nil - It should be ok to call Stop() multiple times.

v.Stop()
}
m.bsrClients = nil
if t, ok := m.httpClient.Transport.(*http.Transport); ok {
t.CloseIdleConnections()
}
}
6 changes: 5 additions & 1 deletion internal/impl/protobuf/processor_protobuf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,10 @@ func (p *protobufProc) Process(ctx context.Context, msg *service.Message) (servi
return service.MessageBatch{msg}, nil
}

func (p *protobufProc) Close(context.Context) error {
func (p *protobufProc) Close(ctx context.Context) error {
if p.multiModuleWatcher != nil {
p.multiModuleWatcher.Close()

@gregfurman gregfurman Jun 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be setting p.multiModuleWatcher = nil here?

p.multiModuleWatcher = nil
}
return nil
}
40 changes: 33 additions & 7 deletions internal/impl/protobuf/processor_protobuf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"connectrpc.com/connect"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/goleak"
"google.golang.org/protobuf/reflect/protodesc"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
Expand All @@ -22,6 +23,10 @@ import (
"github.com/warpstreamlabs/bento/public/service"
)

func TestMain(m *testing.M) {
goleak.VerifyTestMain(m)
}

const protosPath = "../../../config/test/protobuf/schema"

func TestProtobufFromJSON(t *testing.T) {
Expand Down Expand Up @@ -103,6 +108,7 @@ discard_unknown: %t
assert.Contains(t, string(mBytes), exp)
}
require.NoError(t, msgs[0].GetError())

})

t.Run(test.name+" bsr", func(t *testing.T) {
Expand All @@ -125,6 +131,9 @@ discard_unknown: %t
require.NoError(t, res)
require.Len(t, msgs, 1)

err = proc.Close(context.Background())
require.NoError(t, err)

mBytes, err := msgs[0].AsBytes()
require.NoError(t, err)

Expand Down Expand Up @@ -238,6 +247,9 @@ emit_unpopulated: %t
require.NoError(t, res)
require.Len(t, msgs, 1)

err = proc.Close(context.Background())
require.NoError(t, err)

mBytes, err := msgs[0].AsBytes()
require.NoError(t, err)

Expand Down Expand Up @@ -266,6 +278,9 @@ emit_unpopulated: %t
require.NoError(t, res)
require.Len(t, msgs, 1)

err = proc.Close(context.Background())
require.NoError(t, err)

mBytes, err := msgs[0].AsBytes()
require.NoError(t, err)

Expand Down Expand Up @@ -324,6 +339,9 @@ import_paths: [ %v ]
_, err = proc.Process(context.Background(), service.NewMessage([]byte(test.input)))
require.Error(t, err)
require.Contains(t, err.Error(), test.output)

err = proc.Close(context.Background())
require.NoError(t, err)
})

t.Run(test.name+" bsr", func(tt *testing.T) {
Expand All @@ -344,6 +362,9 @@ bsr:
_, err = proc.Process(context.Background(), service.NewMessage([]byte(test.input)))
require.Error(t, err)
require.Contains(t, err.Error(), test.output)

err = proc.Close(context.Background())
require.NoError(t, err)
})
}
}
Expand Down Expand Up @@ -456,16 +477,21 @@ func runMockBSRServer(t *testing.T) string {
mux := http.NewServeMux()
fileDescriptorSetServer := &fileDescriptorSetServer{fileDescriptorSet: fileDescriptorSet}
mux.Handle(reflectv1beta1connect.NewFileDescriptorSetServiceHandler(fileDescriptorSetServer))
go func() {
srv := &http.Server{Handler: mux}
srv.Protocols = new(http.Protocols)
srv.Protocols.SetHTTP1(true)
srv.Protocols.SetUnencryptedHTTP2(true)

if err := http.Serve(listener, srv.Handler); err != nil && !errors.Is(err, http.ErrServerClosed) {
require.NoError(t, err)
srv := &http.Server{Handler: mux}
srv.Protocols = new(http.Protocols)
srv.Protocols.SetHTTP1(true)
srv.Protocols.SetUnencryptedHTTP2(true)

go func() {
if err := srv.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
t.Errorf("mock BSR server error: %v", err)
}
}()

t.Cleanup(func() {
srv.Close()
})

return listener.Addr().String()
}