Skip to content

Commit

Permalink
Mark most client.geo.* as dynamic in TestRUMXForwardedFor approvals (#…
Browse files Browse the repository at this point in the history 
…14997)

Mark client.geo.{city_name,location,region_iso_code,region_name} as dynamic in TestRUMXforwardedFor. This will make it consistent with other systemtest approvals.

(cherry picked from commit 4305ce3)

# Conflicts:
#	systemtest/approvals/TestRUMXForwardedFor.approved.json
  • Loading branch information
@carsonip @mergify
carsonip authored and mergify[bot] committed Dec 20, 2024
1 parent c523686 commit b303823
Show file tree
Hide file tree
Showing 2 changed files with 246 additions and 0 deletions.
243 changes: 243 additions & 0 deletions systemtest/approvals/TestRUMXForwardedFor.approved.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,243 @@
[
{
"@timestamp": [
"dynamic"
],
"agent.name": [
"rum-js"
],
"agent.name.text": [
"rum-js"
],
"agent.version": [
"5.5.0"
],
"client.geo.city_name": [
"dynamic"
],
"client.geo.continent_name": [
"Oceania"
],
"client.geo.country_iso_code": [
"AU"
],
"client.geo.country_name": [
"Australia"
],
"client.geo.location": [
"dynamic"
],
"client.geo.region_iso_code": [
"dynamic"
],
"client.geo.region_name": [
"dynamic"
],
"client.ip": [
"220.244.41.16"
],
"data_stream.dataset": [
"apm.internal"
],
"data_stream.namespace": [
"default"
],
"data_stream.type": [
"metrics"
],
"metricset.name": [
"span_breakdown"
],
"metricset.name.text": [
"span_breakdown"
],
"observer.hostname": [
"dynamic"
],
"observer.type": [
"apm-server"
],
"observer.version": [
"dynamic"
],
"processor.event": [
"metric"
],
"service.name": [
"rum-js-test"
],
"service.name.text": [
"rum-js-test"
],
"source.ip": [
"220.244.41.16"
],
"source.nat.ip": [
"127.0.0.1"
],
"span.self_time.count": [
1
],
"span.self_time.sum.us": [
633
],
"span.subtype": [
"http"
],
"span.type": [
"external"
],
"transaction.name": [
"GET /"
],
"transaction.name.text": [
"GET /"
],
"transaction.type": [
"request"
],
"user_agent.device.name": [
"Other"
],
"user_agent.device.name.text": [
"Other"
],
"user_agent.name": [
"Go-http-client"
],
"user_agent.name.text": [
"Go-http-client"
],
"user_agent.original": [
"Go-http-client/1.1"
],
"user_agent.original.text": [
"Go-http-client/1.1"
],
"user_agent.version": [
"1.1"
]
},
{
"@timestamp": [
"dynamic"
],
"agent.name": [
"rum-js"
],
"agent.name.text": [
"rum-js"
],
"agent.version": [
"5.5.0"
],
"client.geo.city_name": [
"dynamic"
],
"client.geo.continent_name": [
"Oceania"
],
"client.geo.country_iso_code": [
"AU"
],
"client.geo.country_name": [
"Australia"
],
"client.geo.location": [
"dynamic"
],
"client.geo.region_iso_code": [
"dynamic"
],
"client.geo.region_name": [
"dynamic"
],
"client.ip": [
"220.244.41.16"
],
"data_stream.dataset": [
"apm.rum"
],
"data_stream.namespace": [
"default"
],
"data_stream.type": [
"traces"
],
"event.outcome": [
"unknown"
],
"observer.hostname": [
"dynamic"
],
"observer.type": [
"apm-server"
],
"observer.version": [
"dynamic"
],
"processor.event": [
"transaction"
],
"service.name": [
"rum-js-test"
],
"service.name.text": [
"rum-js-test"
],
"source.ip": [
"220.244.41.16"
],
"source.nat.ip": [
"127.0.0.1"
],
"span.id": [
"611f4fa950f04631"
],
"timestamp.us": [
"dynamic"
],
"trace.id": [
"611f4fa950f04631aaaaaaaaaaaaaaaa"
],
"transaction.duration.us": [
643000
],
"transaction.id": [
"611f4fa950f04631"
],
"transaction.representative_count": [
1
],
"transaction.sampled": [
true
],
"transaction.span_count.started": [
0
],
"transaction.type": [
"page-load"
],
"user_agent.device.name": [
"Other"
],
"user_agent.device.name.text": [
"Other"
],
"user_agent.name": [
"Go-http-client"
],
"user_agent.name.text": [
"Go-http-client"
],
"user_agent.original": [
"Go-http-client/1.1"
],
"user_agent.original.text": [
"Go-http-client/1.1"
],
"user_agent.version": [
"1.1"
]
}
]
3 changes: 3 additions & 0 deletions systemtest/rum_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ func testRUMXForwardedFor(t *testing.T, srv *apmservertest.Server) {
"source.port",
// Do not assert the exact contents of the location field since they may change
// slightly depending on the IP lookup.
"client.geo.city_name",
"client.geo.location",
"client.geo.region_iso_code",
"client.geo.region_name",
)
}

Expand Down

0 comments on commit b303823

Please sign in to comment.