Reset message type as well

m3db · Apr 11, 2018 · d0f18b1 · d0f18b1
1 parent 5f9209b
commit d0f18b1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/encoding/protobuf/reset.go b/encoding/protobuf/reset.go
@@ -32,6 +32,7 @@ func resetMetricWithMetadatasProto(pb *metricpb.MetricWithMetadatas) {
 	if pb == nil {
 		return
 	}
+	pb.Type = metricpb.MetricWithMetadatas_UNKNOWN
 	resetCounterWithMetadatasProto(pb.CounterWithMetadatas)
 	resetBatchTimerWithMetadatasProto(pb.BatchTimerWithMetadatas)
 	resetGaugeWithMetadatasProto(pb.GaugeWithMetadatas)

diff --git a/encoding/protobuf/reset_test.go b/encoding/protobuf/reset_test.go
@@ -74,12 +74,14 @@ func TestResetMetricWithMetadatasProtoNilProto(t *testing.T) {
 
 func TestResetMetricWithMetadatasProtoOnlyCounter(t *testing.T) {
 	input := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_COUNTER_WITH_METADATAS,
 		CounterWithMetadatas: &metricpb.CounterWithMetadatas{
 			Counter:   testCounterBeforeResetProto,
 			Metadatas: testMetadatasBeforeResetProto,
 		},
 	}
 	expected := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_UNKNOWN,
 		CounterWithMetadatas: &metricpb.CounterWithMetadatas{
 			Counter:   testCounterAfterResetProto,
 			Metadatas: testMetadatasAfterResetProto,
@@ -93,12 +95,14 @@ func TestResetMetricWithMetadatasProtoOnlyCounter(t *testing.T) {
 
 func TestResetMetricWithMetadatasProtoOnlyBatchTimer(t *testing.T) {
 	input := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_BATCH_TIMER_WITH_METADATAS,
 		BatchTimerWithMetadatas: &metricpb.BatchTimerWithMetadatas{
 			BatchTimer: testBatchTimerBeforeResetProto,
 			Metadatas:  testMetadatasBeforeResetProto,
 		},
 	}
 	expected := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_UNKNOWN,
 		BatchTimerWithMetadatas: &metricpb.BatchTimerWithMetadatas{
 			BatchTimer: testBatchTimerAfterResetProto,
 			Metadatas:  testMetadatasAfterResetProto,
@@ -112,12 +116,14 @@ func TestResetMetricWithMetadatasProtoOnlyBatchTimer(t *testing.T) {
 
 func TestResetMetricWithMetadatasProtoOnlyGauge(t *testing.T) {
 	input := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_GAUGE_WITH_METADATAS,
 		GaugeWithMetadatas: &metricpb.GaugeWithMetadatas{
 			Gauge:     testGaugeBeforeResetProto,
 			Metadatas: testMetadatasBeforeResetProto,
 		},
 	}
 	expected := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_UNKNOWN,
 		GaugeWithMetadatas: &metricpb.GaugeWithMetadatas{
 			Gauge:     testGaugeAfterResetProto,
 			Metadatas: testMetadatasAfterResetProto,
@@ -131,6 +137,7 @@ func TestResetMetricWithMetadatasProtoOnlyGauge(t *testing.T) {
 
 func TestResetMetricWithMetadatasProtoAll(t *testing.T) {
 	input := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_GAUGE_WITH_METADATAS,
 		CounterWithMetadatas: &metricpb.CounterWithMetadatas{
 			Counter:   testCounterBeforeResetProto,
 			Metadatas: testMetadatasBeforeResetProto,
@@ -145,6 +152,7 @@ func TestResetMetricWithMetadatasProtoAll(t *testing.T) {
 		},
 	}
 	expected := &metricpb.MetricWithMetadatas{
+		Type: metricpb.MetricWithMetadatas_UNKNOWN,
 		CounterWithMetadatas: &metricpb.CounterWithMetadatas{
 			Counter:   testCounterAfterResetProto,
 			Metadatas: testMetadatasAfterResetProto,