Merge pull request #1656 from loburm/fix-1639

Fix renaming of "runtime" container to "docker-daemon"

Author: piosz

metrics/sources/summary/summary.go

@@ -163,8 +163,8 @@ func (this *summaryMetricsSource) decodeNodeStats(metrics map[string]*MetricSet,
 	metrics[NodeKey(node.NodeName)] = nodeMetrics
 
 	for _, container := range node.SystemContainers {
-		key := NodeContainerKey(node.NodeName, this.getContainerName(&container))
-		containerMetrics := this.decodeContainerStats(labels, &container)
+		key := NodeContainerKey(node.NodeName, this.getSystemContainerName(&container))
+		containerMetrics := this.decodeContainerStats(labels, &container, true)
 		containerMetrics.Labels[LabelMetricSetType.Key] = MetricSetTypeSystemContainer
 		metrics[key] = containerMetrics
 	}
@@ -194,11 +194,11 @@ func (this *summaryMetricsSource) decodePodStats(metrics map[string]*MetricSet,
 
 	for _, container := range pod.Containers {
 		key := PodContainerKey(ref.Namespace, ref.Name, container.Name)
-		metrics[key] = this.decodeContainerStats(podMetrics.Labels, &container)
+		metrics[key] = this.decodeContainerStats(podMetrics.Labels, &container, false)
 	}
 }
 
-func (this *summaryMetricsSource) decodeContainerStats(podLabels map[string]string, container *stats.ContainerStats) *MetricSet {
+func (this *summaryMetricsSource) decodeContainerStats(podLabels map[string]string, container *stats.ContainerStats, isSystemContainer bool) *MetricSet {
 	glog.V(9).Infof("Decoding container stats stats for container %s...", container.Name)
 	containerMetrics := &MetricSet{
 		Labels:         this.cloneLabels(podLabels),
@@ -208,7 +208,11 @@ func (this *summaryMetricsSource) decodeContainerStats(podLabels map[string]stri
 		ScrapeTime:     this.getScrapeTime(container.CPU, container.Memory, nil),
 	}
 	containerMetrics.Labels[LabelMetricSetType.Key] = MetricSetTypePodContainer
-	containerMetrics.Labels[LabelContainerName.Key] = this.getContainerName(container)
+	if isSystemContainer {
+		containerMetrics.Labels[LabelContainerName.Key] = this.getSystemContainerName(container)
+	} else {
+		containerMetrics.Labels[LabelContainerName.Key] = container.Name
+	}
 
 	this.decodeUptime(containerMetrics, container.StartTime.Time)
 	this.decodeCPUStats(containerMetrics, container.CPU)
@@ -346,7 +350,7 @@ func (this *summaryMetricsSource) addLabeledIntMetric(metrics *MetricSet, metric
 }
 
 // Translate system container names to the legacy names for backwards compatibility.
-func (this *summaryMetricsSource) getContainerName(c *stats.ContainerStats) string {
+func (this *summaryMetricsSource) getSystemContainerName(c *stats.ContainerStats) string {
 	if legacyName, ok := systemNameMap[c.Name]; ok {
 		return legacyName
 	}

metrics/sources/summary/summary_test.go

@@ -59,7 +59,8 @@ const (
 	seedPod1           = 3000
 	seedPod1Container  = 4000
 	seedPod2           = 5000
-	seedPod2Container  = 6000
+	seedPod2Container0 = 6000
+	seedPod2Container1 = 7000
 )
 
 const (
@@ -72,8 +73,9 @@ const (
 
 	cName00 = "c0"
 	cName01 = "c1"
-	cName10 = "c0" // ensure cName10 conflicts with cName02, but is in a different pod
-	cName20 = "c1" // ensure cName20 conflicts with cName01, but is in a different pod + namespace
+	cName10 = "c0"      // ensure cName10 conflicts with cName02, but is in a different pod
+	cName20 = "c1"      // ensure cName20 conflicts with cName01, but is in a different pod + namespace
+	cName21 = "runtime" // ensure that runtime containers are not renamed
 )
 
 var (
@@ -157,7 +159,8 @@ func TestDecodeSummaryMetrics(t *testing.T) {
 			StartTime: metav1.NewTime(startTime),
 			Network:   genTestSummaryNetwork(seedPod2),
 			Containers: []stats.ContainerStats{
-				genTestSummaryContainer(cName20, seedPod2Container),
+				genTestSummaryContainer(cName20, seedPod2Container0),
+				genTestSummaryContainer(cName21, seedPod2Container1),
 			},
 		}},
 	}
@@ -237,7 +240,14 @@ func TestDecodeSummaryMetrics(t *testing.T) {
 	}, {
 		key:     core.PodContainerKey(namespace1, pName2, cName20),
 		setType: core.MetricSetTypePodContainer,
-		seed:    seedPod2Container,
+		seed:    seedPod2Container0,
+		cpu:     true,
+		memory:  true,
+		fs:      containerFs,
+	}, {
+		key:     core.PodContainerKey(namespace1, pName2, cName21),
+		setType: core.MetricSetTypePodContainer,
+		seed:    seedPod2Container1,
 		cpu:     true,
 		memory:  true,
 		fs:      containerFs,