Skip to content

Commit

Permalink
Update approved files
Browse files Browse the repository at this point in the history
  • Loading branch information
@axw
axw committed Aug 31, 2020
1 parent 9037a6c commit 589e133
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 153 deletions.
4 changes: 2 additions & 2 deletions systemtest/aggregation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestTransactionAggregation(t *testing.T) {
estest.WithCondition(result.Hits.NonEmptyCondition()),
)
require.NoError(t, err)
systemtest.ApproveEvents(t, t.Name(), result.Hits.Hits)
systemtest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp")
}

func TestTransactionAggregationShutdown(t *testing.T) {
Expand Down Expand Up @@ -112,5 +112,5 @@ func TestTransactionAggregationShutdown(t *testing.T) {
estest.WithCondition(result.Hits.NonEmptyCondition()),
)
require.NoError(t, err)
systemtest.ApproveEvents(t, t.Name(), result.Hits.Hits)
systemtest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp")
}
206 changes: 105 additions & 101 deletions systemtest/approvals/TestTransactionAggregation.approved.json
View file
Original file line number Diff line number Diff line change
@@ -1,109 +1,113 @@
[
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
{
"events": [
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
}
},
"timeseries": {
"instance": "systemtest:name:7363045c23d03444"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
"name": "beowulf"
}
},
"name": "name",
"root": true,
"type": "backend"
}
},
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
"name": "beowulf"
"timeseries": {
"instance": "systemtest:name:865d6816622184cd"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
}
},
"name": "name",
"root": true,
"type": "backend"
}
},
"timeseries": {
"instance": "systemtest:name:d1fefeee84e87666"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
"name": "beowulf"
}
},
"name": "name",
"root": true,
"type": "page-load"
},
"user_agent": {
"name": "Chrome"
"timeseries": {
"instance": "systemtest:name:875650e21029d5b"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
}
},
"name": "name",
"root": true,
"type": "page-load"
},
"user_agent": {
"name": "Chrome"
}
}
}
]
]
}
103 changes: 53 additions & 50 deletions systemtest/approvals/TestTransactionAggregationShutdown.approved.json
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,57 @@
[
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
{
"events": [
{
"@timestamp": "dynamic",
"agent": {
"name": "go"
},
"ecs": {
"version": "dynamic"
},
"event": {
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"hostname": "beowulf",
"name": "beowulf"
}
},
"timeseries": {
"instance": "systemtest:name:c6687b794adb3d16"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
},
"observer": {
"ephemeral_id": "dynamic",
"hostname": "dynamic",
"id": "dynamic",
"type": "apm-server",
"version": "dynamic",
"version_major": "dynamic"
},
"processor": {
"event": "metric",
"name": "metric"
},
"service": {
"name": "systemtest",
"node": {
"name": "beowulf"
}
},
"name": "name",
"root": true,
"type": "type"
"timeseries": {
"instance": "systemtest:name:56ef3b5d147616b4"
},
"transaction": {
"duration": {
"histogram": {
"counts": [
1
],
"values": [
1003519
]
}
},
"name": "name",
"root": true,
"type": "type"
}
}
}
]
]
}

0 comments on commit 589e133

Please sign in to comment.