Copy resources when converting summary metrics. (#162)

census-ecosystem · Jun 3, 2019 · 68e3d74 · 68e3d74
1 parent 3ea76e9
commit 68e3d74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/metrics_proto.go b/metrics_proto.go
@@ -169,6 +169,7 @@ func (se *statsExporter) convertSummaryMetrics(summary *metricspb.Metric) []*met
 					LabelKeys:   summary.GetMetricDescriptor().GetLabelKeys(),
 				},
 				Timeseries: sumTss,
+				Resource:   summary.Resource,
 			}
 			metrics = append(metrics, metric)
 		}
@@ -182,6 +183,7 @@ func (se *statsExporter) convertSummaryMetrics(summary *metricspb.Metric) []*met
 					LabelKeys:   summary.GetMetricDescriptor().GetLabelKeys(),
 				},
 				Timeseries: countTss,
+				Resource:   summary.Resource,
 			}
 			metrics = append(metrics, metric)
 		}
@@ -197,6 +199,7 @@ func (se *statsExporter) convertSummaryMetrics(summary *metricspb.Metric) []*met
 					LabelKeys:   lks,
 				},
 				Timeseries: percentileTss,
+				Resource:   summary.Resource,
 			}
 			metrics = append(metrics, metric)
 		}

diff --git a/metrics_proto_test.go b/metrics_proto_test.go
@@ -665,6 +665,14 @@ func TestConvertSummaryMetrics(t *testing.T) {
 		Nanos:   100000997,
 	}
 
+	res := &resourcepb.Resource{
+		Type: resourcekeys.ContainerType,
+		Labels: map[string]string{
+			resourcekeys.ContainerKeyName:  "container1",
+			resourcekeys.K8SKeyClusterName: "cluster1",
+		},
+	}
+
 	tests := []struct {
 		in            *metricspb.Metric
 		want          []*metricspb.Metric
@@ -702,6 +710,7 @@ func TestConvertSummaryMetrics(t *testing.T) {
 						},
 					},
 				},
+				Resource: res,
 			},
 			statsExporter: &statsExporter{
 				o: Options{ProjectID: "foo"},
@@ -717,6 +726,7 @@ func TestConvertSummaryMetrics(t *testing.T) {
 					Timeseries: []*metricspb.TimeSeries{
 						makeDoubleTs(119.0, "", startTimestamp, endTimestamp),
 					},
+					Resource: res,
 				},
 				{
 					MetricDescriptor: &metricspb.MetricDescriptor{
@@ -728,6 +738,7 @@ func TestConvertSummaryMetrics(t *testing.T) {
 					Timeseries: []*metricspb.TimeSeries{
 						makeInt64Ts(10, "", startTimestamp, endTimestamp),
 					},
+					Resource: res,
 				},
 				{
 					MetricDescriptor: &metricspb.MetricDescriptor{
@@ -745,6 +756,7 @@ func TestConvertSummaryMetrics(t *testing.T) {
 						makeDoubleTs(12.6, "90.000000", nil, endTimestamp),
 						makeDoubleTs(19.6, "99.000000", nil, endTimestamp),
 					},
+					Resource: res,
 				},
 			},
 		},