Skip to content

Add support for mobile UI filtering #10697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 28, 2023
Merged

Add support for mobile UI filtering #10697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3428f12
Add support for mobile UI filtering
bryce-b Apr 25, 2023
4f49932
updated changelog.asciidoc
bryce-b Apr 26, 2023
d052b7e
updated apmpackage changelog.yml
bryce-b Apr 26, 2023
89ca2b6
updated systemtest/approvals
bryce-b Apr 26, 2023
10b09e6
Merge branch 'main' into mobile-filtering-support
bryce-b Apr 26, 2023
7fcd979
Merge branch 'main' into mobile-filtering-support
bryce-b Apr 27, 2023
1eeb5d7
Update changelogs/head.asciidoc
bryce-b Apr 28, 2023
eb80084
Merge branch 'main' into mobile-filtering-support
bryce-b Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apmpackage/apm/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
- description: Store app logs into service-specific data streams
type: enhancement
link: https://github.com/elastic/apm-server/pull/10456
- description: Add `host` and `service.version` to span events
type: enhancement
link: https://github.com/elastic/apm-server/pull/10697
- version: "8.7.1"
changes:
- description: Add missing `agent.activation_method` mapping to `logs-apm.app`, `metrics-apm.app`, `logs-apm.error` and `metrics-apm.internal`
Expand Down
2 changes: 0 additions & 2 deletions apmpackage/apm/data_stream/traces/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ processors:
# Remove some metadata from spans that is available in the parent transaction, to cut down on storage costs.
if: ctx.processor?.event == 'span'
field:
- host
- process
- user
- user_agent
- container
- kubernetes
- service.node
- service.version
- service.language
- service.runtime
- service.framework
Expand Down
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ https://github.com/elastic/apm-server/compare/8.8\...main[View commits]

[float]
==== Added
- Span events now carry `host` and `service.version` attributes. {pull}10697[10697]
22 changes: 22 additions & 0 deletions systemtest/approvals/TestCompressedSpans.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "i386",
"hostname": "beowulf",
"ip": [
"127.0.0.1"
],
"name": "beowulf",
"os": {
"platform": "minix"
}
},
"observer": {
"hostname": "dynamic",
"type": "apm-server",
Expand Down Expand Up @@ -80,6 +91,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "i386",
"hostname": "beowulf",
"ip": [
"127.0.0.1"
],
"name": "beowulf",
"os": {
"platform": "minix"
}
},
"observer": {
"hostname": "dynamic",
"type": "apm-server",
Expand Down
11 changes: 11 additions & 0 deletions systemtest/approvals/TestIntake/Events.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "amd64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "host1",
"os": {
"platform": "Linux"
}
},
"http": {
"request": {
"method": "GET"
Expand Down
10 changes: 10 additions & 0 deletions systemtest/approvals/TestIntake/MinimalEvents.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"ip": [
"127.0.0.1"
]
},
"observer": {
"hostname": "dynamic",
"type": "apm-server",
Expand Down Expand Up @@ -228,6 +233,11 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"ip": [
"127.0.0.1"
]
},
"observer": {
"hostname": "dynamic",
"type": "apm-server",
Expand Down
131 changes: 124 additions & 7 deletions systemtest/approvals/TestIntake/Spans.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"http": {
"request": {
"method": "GET"
Expand Down Expand Up @@ -204,6 +215,17 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -221,7 +243,8 @@
},
"service": {
"environment": "staging",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"action": "call",
Expand Down Expand Up @@ -279,6 +302,17 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "value1",
"tag4": "true"
Expand All @@ -301,7 +335,8 @@
},
"service": {
"environment": "staging",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"duration": {
Expand Down Expand Up @@ -360,6 +395,17 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -377,7 +423,8 @@
},
"service": {
"environment": "prod",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"duration": {
Expand Down Expand Up @@ -436,6 +483,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -453,7 +511,8 @@
},
"service": {
"environment": "staging",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"action": "query",
Expand Down Expand Up @@ -527,6 +586,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"http": {
"request": {
"method": "GET"
Expand Down Expand Up @@ -690,6 +760,17 @@
"ingested": "dynamic",
"outcome": "unknown"
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -707,7 +788,8 @@
},
"service": {
"environment": "staging",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"action": "receive",
Expand Down Expand Up @@ -782,6 +864,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -799,7 +892,8 @@
},
"service": {
"environment": "staging",
"name": "backendspans"
"name": "backendspans",
"version": "5.1.3"
},
"span": {
"action": "query.custom",
Expand Down Expand Up @@ -865,6 +959,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"labels": {
"tag1": "label1"
},
Expand All @@ -886,7 +991,8 @@
"target": {
"name": "localhost:8080",
"type": ""
}
},
"version": "5.1.3"
},
"span": {
"action": "request",
Expand Down Expand Up @@ -960,6 +1066,17 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"hostname": "node-name",
"ip": [
"127.0.0.1"
],
"name": "node-name",
"os": {
"platform": "darwin"
}
},
"http": {
"request": {
"id": "some-request-id",
Expand Down
12 changes: 11 additions & 1 deletion systemtest/approvals/TestIntake/UnknownSpanType.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
"outcome": "success",
"success_count": 1
},
"host": {
"architecture": "x64",
"ip": [
"127.0.0.1"
],
"os": {
"platform": "darwin"
}
},
"http": {
"request": {
"method": "GET"
Expand All @@ -40,7 +49,8 @@
},
"service": {
"environment": "staging",
"name": "1234_service-12a3"
"name": "1234_service-12a3",
"version": "5.1.3"
},
"span": {
"db": {
Expand Down
Loading