Merge pull request #196 from intel/ocrregresion

harp-intel · web-flow · commit 4188374361f3 · 2025-02-05T14:45:57.000-08:00
fix regression in metrics command causing error on some AWS m5 and m6 instance types
diff --git a/cmd/metrics/event_defs.go b/cmd/metrics/event_defs.go
@@ -144,7 +144,7 @@ func isCollectableEvent(event EventDefinition, metadata Metadata) bool {
 	}
 	// off-core response events
 	if event.Device == "cpu" && (strings.HasPrefix(event.Name, "OCR") || strings.HasPrefix(event.Name, "OFFCORE_REQUESTS_OUTSTANDING")) {
-		if !metadata.SupportsOCR {
+		if !(metadata.SupportsOCR && metadata.SupportsUncore) {
 			slog.Debug("Off-core response events not supported on target", slog.String("event", event.Name))
 			return false
 		} else if flagScope == scopeProcess || flagScope == scopeCgroup {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func isCollectableEvent(event EventDefinition, metadata Metadata) bool {`
`144`	`144`	`}`
`145`	`145`	`// off-core response events`
`146`	`146`	`if event.Device == "cpu" && (strings.HasPrefix(event.Name, "OCR") \|\| strings.HasPrefix(event.Name, "OFFCORE_REQUESTS_OUTSTANDING")) {`
`147`		`- if !metadata.SupportsOCR {`
	`147`	`+ if !(metadata.SupportsOCR && metadata.SupportsUncore) {`
`148`	`148`	`slog.Debug("Off-core response events not supported on target", slog.String("event", event.Name))`
`149`	`149`	`return false`
`150`	`150`	`} else if flagScope == scopeProcess \|\| flagScope == scopeCgroup {`