merged main

aws · Aug 8, 2024 · 8edf16c · 8edf16c
1 parent c283b84
commit 8edf16c
Showing 1 changed file with 0 additions and 71 deletions.
diff --git a/plugins/processors/gpuattributes/processor_test.go b/plugins/processors/gpuattributes/processor_test.go
@@ -232,10 +232,7 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 					"ClusterName": "cluster",
 					"Drop":        "val",
 					"percentile":  "p50",
-<<<<<<< HEAD
 					"runtime_tag": "DEFAULT",
-=======
->>>>>>> origin/main
 					"kubernetes":  "{\"host\":\"test\",\"drop\":\"2\",\"labels\":\"label\"}",
 				},
 				{
@@ -263,11 +260,7 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				{
 					"ClusterName":   "cluster",
 					"Drop":          "val",
-<<<<<<< HEAD
 					"runtime_tag":   "DEFAULT",
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"PodName":       "testPod",
@@ -276,10 +269,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":   "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"Type":          "ContainerAWSNeuronCore",
@@ -289,10 +278,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "PodAWSNeuronCore",
@@ -301,21 +286,13 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronCore",
 					"kubernetes":   "{\"host\":\"test\",\"labels\":\"label\"}",
 				},
 				{
 					"ClusterName":   "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"Type":          "ContainerAWSNeuronCore",
@@ -325,10 +302,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "PodAWSNeuronCore",
@@ -337,10 +310,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronCore",
@@ -364,32 +333,20 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				{
 					"ClusterName":  "cluster",
 					"Drop":         "val",
-<<<<<<< HEAD
 					"runtime_tag":  "DEFAULT",
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"kubernetes":   "{\"host\":\"test\",\"drop\":\"2\",\"labels\":\"label\"}",
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronCore",
 					"kubernetes":   "{\"host\":\"test\",\"labels\":\"label\"}",
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronCore",
@@ -416,11 +373,7 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				{
 					"ClusterName":   "cluster",
 					"Drop":          "val",
-<<<<<<< HEAD
 					"runtime_tag":   "DEFAULT",
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"event_type":    "mem_ecc_corrected",
@@ -430,10 +383,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":   "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"Type":          "ContainerAWSNeuronDevice",
@@ -443,10 +392,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "PodAWSNeuronDevice",
@@ -455,21 +400,13 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronDevice",
 					"kubernetes":   "{\"host\":\"test\"}",
 				},
 				{
 					"ClusterName":   "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":   "10",
->>>>>>> origin/main
 					"NeuronCore":    "core0",
 					"NeuronDevice":  "device0",
 					"Type":          "ContainerAWSNeuronDevice",
@@ -479,10 +416,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "PodAWSNeuronDevice",
@@ -491,10 +424,6 @@ func TestProcessMetricsForNeuronMetrics(t *testing.T) {
 				},
 				{
 					"ClusterName":  "cluster",
-<<<<<<< HEAD
-=======
-					"runtime_tag":  "10",
->>>>>>> origin/main
 					"NeuronCore":   "core0",
 					"NeuronDevice": "device0",
 					"Type":         "NodeAWSNeuronDevice",