[receiver/awscontainerinsightreceiver] Rollback addition of container…

… processes metrics (open-telemetry#31)
sky333999 · Jun 7, 2023 · 8179e2e · 8179e2e
1 parent a785b2e
commit 8179e2e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 142 deletions.
diff --git a/internal/aws/containerinsight/const.go b/internal/aws/containerinsight/const.go
@@ -89,10 +89,6 @@ const (
 	FSInodesfree  = "filesystem_inodes_free"
 	FSUtilization = "filesystem_utilization"
 
-	Processes                = "processes"
-	ProcessesThreads         = "processes_threads"
-	ProcessesFileDescriptors = "processes_file_descriptors"
-
 	StatusConditionReady              = "status_condition_ready"
 	StatusConditionDiskPressure       = "status_condition_disk_pressure"
 	StatusConditionMemoryPressure     = "status_condition_memory_pressure"
@@ -240,11 +236,6 @@ func init() {
 		FSInodesfree:  UnitCount,
 		FSUtilization: UnitPercent,
 
-		// processes metrics
-		Processes:                UnitCount,
-		ProcessesFileDescriptors: UnitCount,
-		ProcessesThreads:         UnitCount,
-
 		// status & spec metrics
 		StatusConditionReady:              UnitCount,
 		StatusConditionDiskPressure:       UnitCount,

diff --git a/internal/aws/containerinsight/utils_test.go b/internal/aws/containerinsight/utils_test.go
@@ -313,9 +313,6 @@ func TestConvertToOTLPMetricsForContainerMetrics(t *testing.T) {
 		"container_memory_utilization":                      0.16909561488772057,
 		"container_memory_utilization_over_container_limit": 13.560546875,
 		"container_memory_working_set":                      int64(28438528),
-		"container_processes":                               int64(5),
-		"container_processes_threads":                       int64(10),
-		"container_processes_file_descriptors":              int64(15),
 	}
 	expectedUnits = map[string]string{
 		"container_cpu_limit":                               "",
@@ -342,9 +339,6 @@ func TestConvertToOTLPMetricsForContainerMetrics(t *testing.T) {
 		"container_memory_utilization":                      UnitPercent,
 		"container_memory_utilization_over_container_limit": UnitPercent,
 		"container_memory_working_set":                      UnitBytes,
-		"container_processes":                               UnitCount,
-		"container_processes_threads":                       UnitCount,
-		"container_processes_file_descriptors":              UnitCount,
 	}
 	tags = map[string]string{
 		"AutoScalingGroupName": "eks-a6bb9db9-267c-401c-db55-df8ef645b06f",

diff --git a/receiver/awscontainerinsightreceiver/README.md b/receiver/awscontainerinsightreceiver/README.md
@@ -758,9 +758,6 @@ kubectl apply -f config.yaml
 | container_status_terminated                       | Count        |
 | container_status_waiting                          | Count        |
 | container_status_waiting_reason_crashed           | Count        |
-| container_processes                               | Count        |
-| container_processes_threads                       | Count        |
-| container_processes_file_descriptors              | Count        |
 
 <br/><br/> 
 

diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/cadvisor_linux.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/cadvisor_linux.go
@@ -366,7 +366,6 @@ func (c *Cadvisor) initManager(createManager createCadvisorManager) error {
 		cadvisormetrics.DiskIOMetrics:       struct{}{},
 		cadvisormetrics.NetworkUsageMetrics: struct{}{},
 		cadvisormetrics.DiskUsageMetrics:    struct{}{},
-		cadvisormetrics.ProcessMetrics:      struct{}{},
 	}
 	var cgroupRoots []string
 	if c.containerOrchestrator == ci.EKS {
@@ -400,7 +399,6 @@ func (c *Cadvisor) initManager(createManager createCadvisorManager) error {
 	metricsExtractors = append(metricsExtractors, extractors.NewDiskIOMetricExtractor(c.logger))
 	metricsExtractors = append(metricsExtractors, extractors.NewNetMetricExtractor(c.logger))
 	metricsExtractors = append(metricsExtractors, extractors.NewFileSystemMetricExtractor(c.logger))
-	metricsExtractors = append(metricsExtractors, extractors.NewProcessesMetricExtractor(c.logger))
 
 	return nil
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/container_info_processor_test.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/container_info_processor_test.go
@@ -68,7 +68,6 @@ func TestProcessContainers(t *testing.T) {
 	metricsExtractors = append(metricsExtractors, extractors.NewDiskIOMetricExtractor(zap.NewNop()))
 	metricsExtractors = append(metricsExtractors, extractors.NewNetMetricExtractor(zap.NewNop()))
 	metricsExtractors = append(metricsExtractors, extractors.NewFileSystemMetricExtractor(zap.NewNop()))
-	metricsExtractors = append(metricsExtractors, extractors.NewProcessesMetricExtractor(zap.NewNop()))
 
 	containerInfos := testutils.LoadContainerInfo(t, "./extractors/testdata/CurInfoContainer.json")
 	podInfos := testutils.LoadContainerInfo(t, "./extractors/testdata/InfoPod.json")

diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/processes_extractor.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/processes_extractor.go
diff --git a/...iver/awscontainerinsightreceiver/internal/cadvisor/extractors/processes_extractor_test.go b/...iver/awscontainerinsightreceiver/internal/cadvisor/extractors/processes_extractor_test.go
diff --git a/...r/awscontainerinsightreceiver/internal/cadvisor/extractors/testdata/CurInfoContainer.json b/...r/awscontainerinsightreceiver/internal/cadvisor/extractors/testdata/CurInfoContainer.json
@@ -40,7 +40,6 @@
             "has_filesystem": true,
             "has_diskio": true,
             "has_custom_metrics": false,
-            "has_processes": true,
             "image": "ubuntu@sha256:017eef0b616011647b269b5c65826e2e2ebddbe5d1f8c1e56b3599fb14fabec8"
         },
         "stats": [
@@ -190,11 +189,6 @@
                     "nr_stopped": 0,
                     "nr_uninterruptible": 0,
                     "nr_io_wait": 0
-                },
-                "processes": {
-                    "process_count": 10,
-                    "threads_current": 20,
-                    "fd_count": 30
                 }
             }
         ]

diff --git a/...r/awscontainerinsightreceiver/internal/cadvisor/extractors/testdata/PreInfoContainer.json b/...r/awscontainerinsightreceiver/internal/cadvisor/extractors/testdata/PreInfoContainer.json
@@ -40,7 +40,6 @@
             "has_filesystem": true,
             "has_diskio": true,
             "has_custom_metrics": false,
-            "has_processes": true,
             "image": "ubuntu@sha256:017eef0b616011647b269b5c65826e2e2ebddbe5d1f8c1e56b3599fb14fabec8"
         },
         "stats": [
@@ -190,11 +189,6 @@
                     "nr_stopped": 0,
                     "nr_uninterruptible": 0,
                     "nr_io_wait": 0
-                },
-                "processes": {
-                    "process_count": 5,
-                    "threads_current": 15,
-                    "fd_count": 25
                 }
             }
         ]