Skip to content

Commit

Permalink
[7.10] Add agent name to span/edge metrics. (#4389) (#4391)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jalvz
jalvz authored Nov 9, 2020
1 parent 7746174 commit d5f4e01
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 20 deletions.
3 changes: 3 additions & 0 deletions systemtest/approvals/TestServiceDestinationAggregation.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"events": [
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
Expand Down
4 changes: 3 additions & 1 deletion x-pack/apm-server/aggregation/spanmetrics/aggregator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ func (a *Aggregator) processSpan(span *model.Span) *model.Metricset {
key := aggregationKey{
serviceEnvironment: span.Metadata.Service.Environment,
serviceName: span.Metadata.Service.Name,
agentName: span.Metadata.Service.Agent.Name,
outcome: span.Outcome,
resource: *span.DestinationService.Resource,
}
Expand Down Expand Up @@ -245,6 +246,7 @@ type aggregationKey struct {
// origin
serviceName string
serviceEnvironment string
agentName string
// destination
resource string
outcome string
Expand All @@ -262,13 +264,13 @@ func makeMetricset(timestamp time.Time, key aggregationKey, metrics spanMetrics,
Service: model.Service{
Name: key.serviceName,
Environment: key.serviceEnvironment,
Agent: model.Agent{Name: key.agentName},
},
},
Event: model.MetricsetEventCategorization{
Outcome: key.outcome,
},
Span: model.MetricsetSpan{
// TODO add span type/subtype?
DestinationService: model.DestinationService{Resource: &key.resource},
},
Samples: []model.Sample{
Expand Down
39 changes: 20 additions & 19 deletions x-pack/apm-server/aggregation/spanmetrics/aggregator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func BenchmarkAggregateSpan(b *testing.B) {
})
require.NoError(b, err)

span := makeSpan("test_service", "test_destination", "success", time.Second, 1)
span := makeSpan("test_service", "agent", "test_destination", "success", time.Second, 1)
b.RunParallel(func(pb *testing.PB) {
for pb.Next() {
agg.ProcessTransformables([]transform.Transformable{span})
Expand Down Expand Up @@ -75,6 +75,7 @@ func TestAggregatorRun(t *testing.T) {

type input struct {
serviceName string
agentName string
destination string
outcome string
count float64
Expand All @@ -83,21 +84,21 @@ func TestAggregatorRun(t *testing.T) {
destinationX := "destination-X"
destinationZ := "destination-Z"
inputs := []input{
{serviceName: "service-A", destination: destinationZ, outcome: "success", count: 2},
{serviceName: "service-A", destination: destinationX, outcome: "success", count: 1},
{serviceName: "service-B", destination: destinationZ, outcome: "success", count: 1},
{serviceName: "service-A", destination: destinationZ, outcome: "success", count: 1},
{serviceName: "service-A", destination: destinationZ, outcome: "success", count: 0},
{serviceName: "service-A", outcome: "success", count: 1}, // no destination
{serviceName: "service-A", destination: destinationZ, outcome: "failure", count: 1},
{serviceName: "service-A", agentName: "java", destination: destinationZ, outcome: "success", count: 2},
{serviceName: "service-A", agentName: "java", destination: destinationX, outcome: "success", count: 1},
{serviceName: "service-B", agentName: "python", destination: destinationZ, outcome: "success", count: 1},
{serviceName: "service-A", agentName: "java", destination: destinationZ, outcome: "success", count: 1},
{serviceName: "service-A", agentName: "java", destination: destinationZ, outcome: "success", count: 0},
{serviceName: "service-A", agentName: "java", outcome: "success", count: 1}, // no destination
{serviceName: "service-A", agentName: "java", destination: destinationZ, outcome: "failure", count: 1},
}

var wg sync.WaitGroup
for _, in := range inputs {
wg.Add(1)
go func(in input) {
defer wg.Done()
span := makeSpan(in.serviceName, in.destination, in.outcome, 100*time.Millisecond, in.count)
span := makeSpan(in.serviceName, in.agentName, in.destination, in.outcome, 100*time.Millisecond, in.count)
for i := 0; i < 100; i++ {
assert.Len(t, agg.ProcessTransformables([]transform.Transformable{span}), 1)
}
Expand All @@ -120,7 +121,7 @@ func TestAggregatorRun(t *testing.T) {

assert.ElementsMatch(t, []*model.Metricset{{
Metadata: model.Metadata{
Service: model.Service{Name: "service-A"},
Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
},
Event: model.MetricsetEventCategorization{
Outcome: "success",
Expand All @@ -135,7 +136,7 @@ func TestAggregatorRun(t *testing.T) {
},
}, {
Metadata: model.Metadata{
Service: model.Service{Name: "service-A"},
Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
},
Event: model.MetricsetEventCategorization{
Outcome: "failure",
Expand All @@ -150,7 +151,7 @@ func TestAggregatorRun(t *testing.T) {
},
}, {
Metadata: model.Metadata{
Service: model.Service{Name: "service-A"},
Service: model.Service{Name: "service-A", Agent: model.Agent{Name: "java"}},
},
Event: model.MetricsetEventCategorization{
Outcome: "success",
Expand All @@ -165,7 +166,7 @@ func TestAggregatorRun(t *testing.T) {
},
}, {
Metadata: model.Metadata{
Service: model.Service{Name: "service-B"},
Service: model.Service{Name: "service-B", Agent: model.Agent{Name: "python"}},
},
Event: model.MetricsetEventCategorization{
Outcome: "success",
Expand Down Expand Up @@ -200,15 +201,15 @@ func TestAggregatorOverflow(t *testing.T) {
// as we have configured the spanmetrics with a maximum of two buckets.
var input []transform.Transformable
for i := 0; i < 10; i++ {
input = append(input, makeSpan("service", "destination1", "success", 100*time.Millisecond, 1))
input = append(input, makeSpan("service", "destination2", "success", 100*time.Millisecond, 1))
input = append(input, makeSpan("service", "agent", "destination1", "success", 100*time.Millisecond, 1))
input = append(input, makeSpan("service", "agent", "destination2", "success", 100*time.Millisecond, 1))
}
output := agg.ProcessTransformables(input)
assert.Equal(t, input, output)

// The third group will return a metricset for immediate publication.
for i := 0; i < 2; i++ {
input = append(input, makeSpan("service", "destination3", "success", 100*time.Millisecond, 1))
input = append(input, makeSpan("service", "agent", "destination3", "success", 100*time.Millisecond, 1))
}
output = agg.ProcessTransformables(input)
assert.Len(t, output, len(input)+2)
Expand All @@ -223,7 +224,7 @@ func TestAggregatorOverflow(t *testing.T) {
m.Timestamp = time.Time{}
assert.Equal(t, &model.Metricset{
Metadata: model.Metadata{
Service: model.Service{Name: "service"},
Service: model.Service{Name: "service", Agent: model.Agent{Name: "agent"}},
},
Event: model.MetricsetEventCategorization{
Outcome: "success",
Expand All @@ -241,12 +242,12 @@ func TestAggregatorOverflow(t *testing.T) {
}

func makeSpan(
serviceName string, destinationServiceResource, outcome string,
serviceName, agentName, destinationServiceResource, outcome string,
duration time.Duration,
count float64,
) *model.Span {
span := &model.Span{
Metadata: model.Metadata{Service: model.Service{Name: serviceName}},
Metadata: model.Metadata{Service: model.Service{Name: serviceName, Agent: model.Agent{Name: agentName}}},
Name: serviceName + ":" + destinationServiceResource,
Duration: duration.Seconds() * 1000,
RepresentativeCount: count,
Expand Down

0 comments on commit d5f4e01

Please sign in to comment.