chore: enable cpu metrics

Author: RRashmit

internal/collector/otelcol.tmpl

@@ -7,11 +7,11 @@ receivers:
       {{- if .Receivers.HostMetrics.Scrapers }}
       {{- if .Receivers.HostMetrics.Scrapers.CPU }}
       cpu:
-      {{- if .Receivers.HostMetrics.Scrapers.CPU.Utilization }}
         metrics:
-          utilization:
+          system.cpu.utilization:
+            enabled: true
+          system.cpu.logical.count:
             enabled: true
-      {{- end }}
       {{- end }}
       {{- if .Receivers.HostMetrics.Scrapers.Disk }}
       disk:

internal/collector/settings_test.go

@@ -79,9 +79,7 @@ func TestTemplateWrite(t *testing.T) {
 		CollectionInterval: time.Minute,
 		InitialDelay:       time.Second,
 		Scrapers: &config.HostMetricsScrapers{
-			CPU: &config.CPUScraper{
-				Utilization: true,
-			},
+			CPU:        &config.CPUScraper{},
 			Disk:       &config.DiskScraper{},
 			Filesystem: &config.FilesystemScraper{},
 			Memory:     &config.MemoryScraper{},

internal/config/types.go

@@ -242,9 +242,7 @@ type (
 		Memory     *MemoryScraper     `yaml:"-" mapstructure:"memory"`
 		Network    *NetworkScraper    `yaml:"-" mapstructure:"network"`
 	}
-	CPUScraper struct {
-		Utilization bool `yaml:"-" mapstructure:"utilization"`
-	}
+	CPUScraper        struct{}
 	DiskScraper       struct{}
 	FilesystemScraper struct{}
 	MemoryScraper     struct{}

test/config/collector/test-opentelemetry-collector-agent.yaml

@@ -5,7 +5,9 @@ receivers:
     scrapers:
       cpu:
         metrics:
-          utilization:
+          system.cpu.utilization:
+            enabled: true
+          system.cpu.logical.count:
             enabled: true
       disk:
       filesystem:

test/mock/collector/nginx-agent.conf

@@ -38,9 +38,7 @@ collector:
       collection_interval: 1m0s
       initial_delay: 1s
       scrapers:
-        cpu:
-          metrics:
-            utilization:
+        cpu: {}
         memory: {}
         disk: {}
         network: {}

test/types/config.go

@@ -95,9 +95,7 @@ func AgentConfig() *config.Config {
 					CollectionInterval: time.Minute,
 					InitialDelay:       time.Second,
 					Scrapers: &config.HostMetricsScrapers{
-						CPU: &config.CPUScraper{
-							Utilization: true,
-						},
+						CPU:        &config.CPUScraper{},
 						Disk:       &config.DiskScraper{},
 						Filesystem: &config.FilesystemScraper{},
 						Memory:     &config.MemoryScraper{},