[chore][receiver/k8sclusterreceiver] Enable goleak check

internal/k8stest/client.go

@@ -6,10 +6,13 @@ package k8stest // import "github.com/open-telemetry/opentelemetry-collector-con
 import (
 	"errors"
 	"fmt"
+	"net/http"
 
+	"k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/client-go/discovery"
 	memory "k8s.io/client-go/discovery/cached"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/restmapper"
 	"k8s.io/client-go/tools/clientcmd"
 )
@@ -18,10 +21,11 @@ type K8sClient struct {
 	DynamicClient   *dynamic.DynamicClient
 	DiscoveryClient *discovery.DiscoveryClient
 	Mapper          *restmapper.DeferredDiscoveryRESTMapper
+
+	httpClient *http.Client
 }
 
 func NewK8sClient(kubeconfigPath string) (*K8sClient, error) {
-
 	if kubeconfigPath == "" {
 		return nil, errors.New("Please provide file path to load kubeconfig")
 	}
@@ -30,17 +34,36 @@ func NewK8sClient(kubeconfigPath string) (*K8sClient, error) {
 		return nil, fmt.Errorf("unable to load kubeconfig from %s: %w", kubeconfigPath, err)
 	}
 
-	dynamicClient, err := dynamic.NewForConfig(restConfig)
+	restConfig.Proxy = net.NewProxierWithNoProxyCIDR(http.ProxyFromEnvironment)
+	httpClient, err := rest.HTTPClientFor(restConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	dynamicClient, err := dynamic.NewForConfigAndClient(restConfig, httpClient)
 	if err != nil {
 		return nil, fmt.Errorf("error creating dynamic client: %w", err)
 	}
 
-	discoveryClient, err := discovery.NewDiscoveryClientForConfig(restConfig)
+	discoveryClient, err := discovery.NewDiscoveryClientForConfigAndClient(restConfig, httpClient)
 	if err != nil {
 		return nil, fmt.Errorf("error creating discovery client: %w", err)
 	}
 
 	mapper := restmapper.NewDeferredDiscoveryRESTMapper(memory.NewMemCacheClient(discoveryClient))
-	return &K8sClient{
-		DynamicClient: dynamicClient, DiscoveryClient: discoveryClient, Mapper: mapper}, nil
+
+	k8sClient := &K8sClient{
+		DynamicClient:   dynamicClient,
+		DiscoveryClient: discoveryClient,
+		Mapper:          mapper,
+		httpClient:      httpClient,
+	}
+
+	return k8sClient, nil
+}
+
+func (k *K8sClient) Shutdown() {
+	if k.httpClient != nil {
+		net.CloseIdleConnectionsFor(k.httpClient.Transport)
+	}
 }

internal/k8stest/k8s_objects.go

@@ -48,8 +48,13 @@ func DeleteObject(client *K8sClient, obj *unstructured.Unstructured) error {
 		// cluster-scoped resources
 		resource = client.DynamicClient.Resource(gvr.Resource)
 	}
+
+	gracePeriod := int64(0)
 	deletePolicy := metav1.DeletePropagationForeground
-	return resource.Delete(context.Background(), obj.GetName(), metav1.DeleteOptions{
-		PropagationPolicy: &deletePolicy,
-	})
+	options := metav1.DeleteOptions{
+		GracePeriodSeconds: &gracePeriod,
+		PropagationPolicy:  &deletePolicy,
+	}
+
+	return resource.Delete(context.Background(), obj.GetName(), options)
 }

receiver/k8sclusterreceiver/e2e_test.go

@@ -44,6 +44,7 @@ func TestE2E(t *testing.T) {
 
 	k8sClient, err := k8stest.NewK8sClient(testKubeConfig)
 	require.NoError(t, err)
+	defer func() { k8sClient.Shutdown() }()
 
 	metricsConsumer := new(consumertest.MetricsSink)
 	shutdownSink := startUpSink(t, metricsConsumer)

receiver/k8sclusterreceiver/factory_test.go

@@ -75,13 +75,15 @@ func TestFactoryDistributions(t *testing.T) {
 	err := r.Start(context.Background(), componenttest.NewNopHost())
 	require.NoError(t, err)
 	require.Nil(t, r.resourceWatcher.osQuotaClient)
+	assert.NoError(t, r.Shutdown(context.Background()))
 
 	// openshift
 	rCfg.Distribution = "openshift"
 	r = newTestReceiver(t, rCfg)
 	err = r.Start(context.Background(), componenttest.NewNopHost())
 	require.NoError(t, err)
 	require.NotNil(t, r.resourceWatcher.osQuotaClient)
+	assert.NoError(t, r.Shutdown(context.Background()))
 }
 
 func newTestReceiver(t *testing.T, cfg *Config) *kubernetesReceiver {

receiver/k8sclusterreceiver/package_test.go

@@ -0,0 +1,14 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package k8sclusterreceiver
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}

receiver/k8sobjectsreceiver/testdata/e2e/expected/watch_events.yaml

@@ -75,7 +75,7 @@ resourceLogs:
                                               values:
                                                 - key: manager
                                                   value:
-                                                    stringValue: k8sobjectsreceiver.test
+                                                    stringValue: Go-http-client
                                                 - key: operation
                                                   value:
                                                     stringValue: Update

receiver/k8sobjectsreceiver/testdata/e2e/expected/watch_events_core.yaml

@@ -51,7 +51,7 @@ resourceLogs:
                                               values:
                                                 - key: manager
                                                   value:
-                                                    stringValue: k8sobjectsreceiver.test
+                                                    stringValue: Go-http-client
                                                 - key: operation
                                                   value:
                                                     stringValue: Update

receiver/k8sobjectsreceiver/testdata/e2e/expected/watch_namespaces.yaml

@@ -39,7 +39,7 @@ resourceLogs:
                                               values:
                                                 - key: manager
                                                   value:
-                                                    stringValue: k8sobjectsreceiver.test
+                                                    stringValue: Go-http-client
                                                 - key: operation
                                                   value:
                                                     stringValue: Update