aggregation/spanmetrics: set metricset.name

elastic · Feb 22, 2021 · 998a09b · 998a09b
1 parent e99fed6
commit 998a09b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/model/modeldecoder/rumv3/metricset_test.go b/model/modeldecoder/rumv3/metricset_test.go
@@ -86,6 +86,7 @@ func TestDecodeMapToMetricsetModel(t *testing.T) {
 				strings.HasPrefix(key, "Transaction") ||
 				// only set by aggregator
 				strings.HasPrefix(key, "Event") ||
+				key == "Name" ||
 				key == "TimeseriesInstanceID" ||
 				strings.HasPrefix(key, "Span.DestinationService") ||
 				// test Samples separately

diff --git a/model/modeldecoder/v2/metricset_test.go b/model/modeldecoder/v2/metricset_test.go
@@ -85,6 +85,7 @@ func TestDecodeMapToMetricsetModel(t *testing.T) {
 			if strings.HasPrefix(key, "Metadata") ||
 				// only set by aggregator
 				strings.HasPrefix(key, "Event") ||
+				key == "Name" ||
 				key == "TimeseriesInstanceID" ||
 				key == "Transaction.Result" ||
 				key == "Transaction.Root" ||

diff --git a/systemtest/approvals/TestServiceDestinationAggregation.approved.json b/systemtest/approvals/TestServiceDestinationAggregation.approved.json
@@ -15,6 +15,7 @@
             "metricset": {
                 "period": 1000
             },
+            "metricset.name": "service_destination",
             "observer": {
                 "ephemeral_id": "dynamic",
                 "hostname": "dynamic",

diff --git a/x-pack/apm-server/aggregation/spanmetrics/aggregator.go b/x-pack/apm-server/aggregation/spanmetrics/aggregator.go
@@ -19,6 +19,10 @@ import (
 	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
+const (
+	metricsetName = "service_destination"
+)
+
 // AggregatorConfig holds configuration for creating an Aggregator.
 type AggregatorConfig struct {
 	// Report is a publish.Reporter for reporting metrics documents.
@@ -260,6 +264,7 @@ type spanMetrics struct {
 func makeMetricset(timestamp time.Time, key aggregationKey, metrics spanMetrics, interval int64) model.Metricset {
 	out := model.Metricset{
 		Timestamp: timestamp,
+		Name:      metricsetName,
 		Metadata: model.Metadata{
 			Service: model.Service{
 				Name:        key.serviceName,

diff --git a/x-pack/apm-server/aggregation/spanmetrics/aggregator_test.go b/x-pack/apm-server/aggregation/spanmetrics/aggregator_test.go
@@ -126,6 +126,7 @@ func TestAggregatorRun(t *testing.T) {
 	}
 
 	assert.ElementsMatch(t, []*model.Metricset{{
+		Name: "service_destination",
 		Metadata: model.Metadata{
 			Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
 		},
@@ -141,6 +142,7 @@ func TestAggregatorRun(t *testing.T) {
 			{Name: "metricset.period", Value: 10},
 		},
 	}, {
+		Name: "service_destination",
 		Metadata: model.Metadata{
 			Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
 		},
@@ -156,6 +158,7 @@ func TestAggregatorRun(t *testing.T) {
 			{Name: "metricset.period", Value: 10},
 		},
 	}, {
+		Name: "service_destination",
 		Metadata: model.Metadata{
 			Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
 		},
@@ -171,6 +174,7 @@ func TestAggregatorRun(t *testing.T) {
 			{Name: "metricset.period", Value: 10},
 		},
 	}, {
+		Name: "service_destination",
 		Metadata: model.Metadata{
 			Service: model.Service{Name: "service-B", Agent: model.Agent{Name: "python"}},
 		},
@@ -231,6 +235,7 @@ func TestAggregatorOverflow(t *testing.T) {
 
 		m.Timestamp = time.Time{}
 		assert.Equal(t, &model.Metricset{
+			Name: "service_destination",
 			Metadata: model.Metadata{
 				Service: model.Service{Name: "service", Agent: model.Agent{Name: "agent"}},
 			},