[awsemfexporter] Fix grouping for container insights metrics for mixed metric types

exporter/awsemfexporter/grouped_metric.go

@@ -91,6 +91,12 @@ func addToGroupedMetric(
 				// them together into one EMF log event, so don't set batchIndex when it's a summary metric
 				metadata.groupedMetricMetadata.batchIndex = i
 			}
+
+			if metadata.receiver == containerInsightsReceiver {
+				// For container insights, put all metrics in the same group regardless of type (ie gauge/counter)
+				metadata.groupedMetricMetadata.metricDataType = pmetric.MetricTypeEmpty
+			}
+
 			groupKey := aws.NewKey(metadata.groupedMetricMetadata, labels)
 			if _, ok := groupedMetrics[groupKey]; ok {
 				// if MetricName already exists in metrics map, print warning log

exporter/awsemfexporter/metric_translator.go

@@ -146,7 +146,8 @@ func (mt metricTranslator) translateOTelToGroupedMetric(rm pmetric.ResourceMetri
 		if strings.HasPrefix(serviceName.Str(), "containerInsightsKubeAPIServerScraper") ||
 			strings.HasPrefix(serviceName.Str(), "containerInsightsDCGMExporterScraper") ||
 			strings.HasPrefix(serviceName.Str(), "containerInsightsNeuronMonitorScraper") ||
-			strings.HasPrefix(serviceName.Str(), "containerInsightsKueueMetricsScraper") {
+			strings.HasPrefix(serviceName.Str(), "containerInsightsKueueMetricsScraper") ||
+			strings.HasPrefix(serviceName.Str(), "containerInsightsNVMeExporterScraper") {
 			// the prometheus metrics that come from the container insight receiver need to be clearly tagged as coming from container insights
 			metricReceiver = containerInsightsReceiver
 		}

exporter/awsemfexporter/metric_translator_test.go

@@ -286,6 +286,8 @@ func TestTranslateOtToGroupedMetric(t *testing.T) {
 	neuronMetric.Resource().Attributes().PutStr(conventions.AttributeServiceName, "containerInsightsNeuronMonitorScraper")
 	kueueMetric := createTestResourceMetricsHelper(defaultNumberOfTestMetrics + 1)
 	kueueMetric.Resource().Attributes().PutStr(conventions.AttributeServiceName, "containerInsightsKueueMetricsScraper")
+	nvmeMetric := createTestResourceMetricsHelper(defaultNumberOfTestMetrics + 1)
+	nvmeMetric.Resource().Attributes().PutStr(conventions.AttributeServiceName, "containerInsightsNVMeExporterScraper")
 
 	counterSumMetrics := map[string]*metricInfo{
 		"spanCounter": {
@@ -403,6 +405,19 @@ func TestTranslateOtToGroupedMetric(t *testing.T) {
 			"myServiceNS/containerInsightsKueueMetricsScraper",
 			containerInsightsReceiver,
 		},
+		{
+			"nvme receiver",
+			nvmeMetric,
+			map[string]string{
+				"isItAnError": "false",
+				"spanName":    "testSpan",
+			},
+			map[string]string{
+				"spanName": "testSpan",
+			},
+			"myServiceNS/containerInsightsNVMeExporterScraper",
+			containerInsightsReceiver,
+		},
 	}
 
 	for _, tc := range testCases {
@@ -438,7 +453,7 @@ func TestTranslateOtToGroupedMetric(t *testing.T) {
 					assert.Equal(t, tc.timerLabels, v.labels)
 					assert.Equal(t, timerMetrics, v.metrics)
 				default:
-					assert.Fail(t, fmt.Sprintf("Unhandled metric type %s not expected", v.metadata.metricDataType))
+					assert.Equal(t, tc.expectedReceiver, containerInsightsReceiver)
 				}
 			}
 		})

internal/aws/k8s/k8sclient/endpoint_slices_test.go

@@ -253,7 +253,8 @@ var endpointSlicesArray = []runtime.Object{
 			},
 			Labels: map[string]string{
 				"kubernetes.io/service-name": "kube-controller-manager",
-			}},
+			},
+		},
 	},
 	&discoveryv1.EndpointSlice{
 		ObjectMeta: metav1.ObjectMeta{

internal/kubelet/client.go

@@ -130,7 +130,6 @@ func (p *kubeConfigClientProvider) BuildClient() (Client, error) {
 	}
 
 	joinPath, err := url.JoinPath(authConf.Host, "/api/v1/nodes/", p.endpoint, "/proxy/")
-
 	if err != nil {
 		return nil, err
 	}