diff --git a/.chloggen/goleak_opencensuscomps.yaml b/.chloggen/goleak_opencensuscomps.yaml new file mode 100755 index 0000000000000..19fc56a29b77b --- /dev/null +++ b/.chloggen/goleak_opencensuscomps.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: opencensusreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix memory leak on shutdown + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31152] + +# (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: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# 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/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index d006ea1c48217..a763f087e8882 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.94.1 go.opentelemetry.io/otel/metric v1.23.0 go.opentelemetry.io/otel/trace v1.23.0 + go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.61.0 ) diff --git a/exporter/opencensusexporter/package_test.go b/exporter/opencensusexporter/package_test.go new file mode 100644 index 0000000000000..c5b21ea873b46 --- /dev/null +++ b/exporter/opencensusexporter/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opencensusexporter + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index 896dfd7f8c5fc..d89ce069c8f82 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -37,6 +37,7 @@ type ocReceiver struct { gatewayMux *gatewayruntime.ServeMux corsOrigins []string grpcServerSettings configgrpc.ServerConfig + cancel context.CancelFunc traceReceiver *octrace.Receiver metricsReceiver *ocmetrics.Receiver @@ -192,6 +193,10 @@ func (ocr *ocReceiver) Shutdown(context.Context) error { // tests and code should be reactive in less than even 1second. // ocr.serverGRPC.Stop() + if ocr.cancel != nil { + ocr.cancel() + } + return err } @@ -213,7 +218,8 @@ func (ocr *ocReceiver) httpServer() *http.Server { func (ocr *ocReceiver) startServer() error { // Register the grpc-gateway on the HTTP server mux - c := context.Background() + var c context.Context + c, ocr.cancel = context.WithCancel(context.Background()) opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())} endpoint := ocr.ln.Addr().String() diff --git a/receiver/opencensusreceiver/package_test.go b/receiver/opencensusreceiver/package_test.go new file mode 100644 index 0000000000000..e7a254d606587 --- /dev/null +++ b/receiver/opencensusreceiver/package_test.go @@ -0,0 +1,14 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package opencensusreceiver + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +}