Add cluster-level metrics to container insight receiver

internal/aws/k8s/k8sclient/clientset.go

@@ -211,11 +211,11 @@ func (c *K8sClient) Shutdown() {
 		c.Ep = nil
 	}
 	if c.Pod != nil && !reflect.ValueOf(c.Pod).IsNil() {
-		c.Pod.shutdown()
+		c.Pod.Shutdown()
 		c.Pod = nil
 	}
 	if c.Node != nil && !reflect.ValueOf(c.Node).IsNil() {
-		c.Node.shutdown()
+		c.Node.Shutdown()
 		c.Node = nil
 	}
 	if c.Job != nil && !reflect.ValueOf(c.Job).IsNil() {

internal/aws/k8s/k8sclient/node.go

@@ -41,9 +41,8 @@ type NodeClient interface {
 	ClusterFailedNodeCount() int
 	// Get the number of nodes for current cluster
 	ClusterNodeCount() int
-
-	// shutdown is only used internally by clientset to stop the NodeClient
-	shutdown()
+	// Shutdown stops the NodeClient
+	Shutdown()
 }
 
 type nodeClientOption func(*nodeClient)
@@ -143,7 +142,7 @@ func newNodeClient(clientSet kubernetes.Interface, logger *zap.Logger, options .
 	return c
 }
 
-func (c *nodeClient) shutdown() {
+func (c *nodeClient) Shutdown() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 

internal/aws/k8s/k8sclient/node_test.go

@@ -317,7 +317,7 @@ func TestNodeClient(t *testing.T) {
 
 	assert.Equal(t, clusterNodeCount, expectedClusterNodeCount)
 	assert.Equal(t, clusterFailedNodeCount, expectedClusterFailedNodeCount)
-	client.shutdown()
+	client.Shutdown()
 	assert.True(t, client.stopped)
 }
 

internal/aws/k8s/k8sclient/pod.go

@@ -31,9 +31,8 @@ import (
 type PodClient interface {
 	// Get the mapping between the namespace and the number of belonging pods
 	NamespaceToRunningPodNum() map[string]int
-
-	// shutdown is only used internally by clientset to stop the PodClient
-	shutdown()
+	// Shutdown stops the PodClient
+	Shutdown()
 }
 
 type podClientOption func(*podClient)
@@ -107,7 +106,7 @@ func newPodClient(clientSet kubernetes.Interface, logger *zap.Logger, options ..
 	return c
 }
 
-func (c *podClient) shutdown() {
+func (c *podClient) Shutdown() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	close(c.stopChan)

internal/aws/k8s/k8sclient/pod_test.go

@@ -188,7 +188,7 @@ func TestPodClient_NamespaceToRunningPodNum(t *testing.T) {
 	resultMap := client.NamespaceToRunningPodNum()
 	log.Printf("NamespaceToRunningPodNum (len=%v): %v", len(resultMap), awsutil.Prettify(resultMap))
 	assert.True(t, reflect.DeepEqual(resultMap, expectedMap))
-	client.shutdown()
+	client.Shutdown()
 	assert.True(t, client.stopped)
 }
 

receiver/awscontainerinsightreceiver/factory.go

@@ -22,11 +22,6 @@ import (
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver/receiverhelper"
-	"go.uber.org/zap"
-
-	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/cadvisor"
-	hostInfo "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/host"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/k8sapiserver"
 )
 
 // Factory for awscontainerinsightreceiver
@@ -68,12 +63,5 @@ func createMetricsReceiver(
 
 	rCfg := baseCfg.(*Config)
 	logger := params.Logger
-	hostInfo, err := hostInfo.NewInfo(rCfg.CollectionInterval, logger)
-	// TODO: I will need to change the code here to let cadvisor and k8sapiserver return err as well
-	if err != nil {
-		logger.Warn("failed to initialize hostInfo", zap.Error(err))
-	}
-	cadvisor := cadvisor.New(rCfg.ContainerOrchestrator, hostInfo, logger)
-	k8sapiserver := k8sapiserver.New(hostInfo, logger)
-	return New(logger, rCfg, consumer, cadvisor, k8sapiserver)
+	return New(logger, rCfg, consumer)
 }

receiver/awscontainerinsightreceiver/go.mod

@@ -5,10 +5,20 @@ go 1.16
 require (
 	github.com/aws/aws-sdk-go v1.38.55
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-00010101000000-000000000000
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-00010101000000-000000000000
 	github.com/shirou/gopsutil v3.21.5+incompatible
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.27.1-0.20210608105628-44a4ae746c3c
 	go.uber.org/zap v1.17.0
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
+	k8s.io/client-go v0.21.0
+	k8s.io/klog v1.0.0
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => ./../../internal/aws/containerinsight
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => ./../../internal/aws/k8s