Skip to content

Commit

Permalink
[receiver/otlpreceiver] Enable goleak check (#9225)
Browse files Browse the repository at this point in the history
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
Add `goleak` to detect leaks in tests. Leaking goroutines were detected
that were caused by a dependency that we can ignore
(`go.opencensus.io/stats/view.(*worker).start`), a `Shutdown` call was
also added that was missing.

**Link to tracking Issue:** <Issue number if applicable>
#9165 

**Testing:** <Describe what testing was performed and which tests were
added.>
Added check is passing as well as existing tests.
  • Loading branch information
crobert-1 authored Feb 3, 2024
1 parent c746d8b commit efd6034
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 4 deletions.
25 changes: 25 additions & 0 deletions .chloggen/goleak_otlpreceiver.yaml
Original file line number Diff line number Diff line change
@@ -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: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: otlpreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix goroutine leak when GRPC server is started but HTTP server is unsuccessful

# One or more tracking issues or pull requests related to the change
issues: [9165]

# (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: []
2 changes: 0 additions & 2 deletions receiver/otlpreceiver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ func TestCreateTracesReceiver(t *testing.T) {
assert.NoError(t, err)
if tt.wantStartErr {
assert.Error(t, tr.Start(context.Background(), componenttest.NewNopHost()))
assert.NoError(t, tr.Shutdown(context.Background()))
} else {
assert.NoError(t, tr.Start(context.Background(), componenttest.NewNopHost()))
assert.NoError(t, tr.Shutdown(context.Background()))
Expand Down Expand Up @@ -370,7 +369,6 @@ func TestCreateLogReceiver(t *testing.T) {
assert.NoError(t, err)
if tt.wantStartErr {
assert.Error(t, mr.Start(context.Background(), componenttest.NewNopHost()))
assert.NoError(t, mr.Shutdown(context.Background()))
} else {
require.NoError(t, mr.Start(context.Background(), componenttest.NewNopHost()))
assert.NoError(t, mr.Shutdown(context.Background()))
Expand Down
7 changes: 5 additions & 2 deletions receiver/otlpreceiver/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,15 @@ func (r *otlpReceiver) startHTTPServer(host component.Host) error {

// Start runs the trace receiver on the gRPC server. Currently
// it also enables the metrics receiver too.
func (r *otlpReceiver) Start(_ context.Context, host component.Host) error {
func (r *otlpReceiver) Start(ctx context.Context, host component.Host) error {
if err := r.startGRPCServer(host); err != nil {
return err
}
if err := r.startHTTPServer(host); err != nil {
return err
// It's possible that a valid GRPC server configuration was specified,
// but an invalid HTTP configuration. If that's the case, the successfully
// started GRPC server must be shutdown to ensure no goroutines are leaked.
return errors.Join(err, r.Shutdown(ctx))
}

return nil
Expand Down
17 changes: 17 additions & 0 deletions receiver/otlpreceiver/package_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package otlpreceiver

import (
"testing"

"go.uber.org/goleak"
)

// The IgnoreTopFunction call prevents catching the leak generated by opencensus
// defaultWorker.Start which at this time is part of the package's init call.
// See https://github.com/open-telemetry/opentelemetry-collector/issues/9165#issuecomment-1874836336 for more context.
func TestMain(m *testing.M) {
goleak.VerifyTestMain(m, goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"))
}

0 comments on commit efd6034

Please sign in to comment.