From 23d6ac9dbfb00f14fcbce6f85b3aef4d6a73a0e9 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Mon, 20 May 2024 15:29:27 -0700 Subject: [PATCH 1/2] [chore][exporter/pulsar] Enable goleak --- exporter/pulsarexporter/generated_package_test.go | 6 +++--- exporter/pulsarexporter/go.mod | 1 + exporter/pulsarexporter/metadata.yaml | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/exporter/pulsarexporter/generated_package_test.go b/exporter/pulsarexporter/generated_package_test.go index c9261234fe23f..d311ee7962bf6 100644 --- a/exporter/pulsarexporter/generated_package_test.go +++ b/exporter/pulsarexporter/generated_package_test.go @@ -3,11 +3,11 @@ package pulsarexporter import ( - "os" "testing" + + "go.uber.org/goleak" ) func TestMain(m *testing.M) { - // skipping goleak test as per metadata.yml configuration - os.Exit(m.Run()) + goleak.VerifyTestMain(m) } diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 4730c5dac9193..8625b4c64f16f 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/semconv v0.100.1-0.20240517133416-ede9e304314d go.opentelemetry.io/otel/metric v1.26.0 go.opentelemetry.io/otel/trace v1.26.0 + go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) diff --git a/exporter/pulsarexporter/metadata.yaml b/exporter/pulsarexporter/metadata.yaml index f1dc533869c36..7110fb5e5dbd6 100644 --- a/exporter/pulsarexporter/metadata.yaml +++ b/exporter/pulsarexporter/metadata.yaml @@ -12,5 +12,3 @@ status: # Update the exporter to pass the tests tests: skip_lifecycle: true - goleak: - skip: true \ No newline at end of file From 734a58bea2692fa4537af650ffc28650a315f476 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Mon, 20 May 2024 15:46:40 -0700 Subject: [PATCH 2/2] Ignore dbus leak --- exporter/pulsarexporter/generated_package_test.go | 2 +- exporter/pulsarexporter/metadata.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/exporter/pulsarexporter/generated_package_test.go b/exporter/pulsarexporter/generated_package_test.go index d311ee7962bf6..d6fed5e663b56 100644 --- a/exporter/pulsarexporter/generated_package_test.go +++ b/exporter/pulsarexporter/generated_package_test.go @@ -9,5 +9,5 @@ import ( ) func TestMain(m *testing.M) { - goleak.VerifyTestMain(m) + goleak.VerifyTestMain(m, goleak.IgnoreAnyFunction("github.com/godbus/dbus.(*Conn).inWorker")) } diff --git a/exporter/pulsarexporter/metadata.yaml b/exporter/pulsarexporter/metadata.yaml index 7110fb5e5dbd6..97491eced1e2c 100644 --- a/exporter/pulsarexporter/metadata.yaml +++ b/exporter/pulsarexporter/metadata.yaml @@ -12,3 +12,8 @@ status: # Update the exporter to pass the tests tests: skip_lifecycle: true + goleak: + ignore: + any: + # Regarding the godbus/dbus ignore: see https://github.com/99designs/keyring/issues/103 + - "github.com/godbus/dbus.(*Conn).inWorker" \ No newline at end of file