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
…backport #14997) (#15017)

* Mark most client.geo.* as dynamic in TestRUMXForwardedFor approvals (#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

* Delete systemtest/approvals/TestRUMXForwardedFor.approved.json

* Update data_streams_enabled.approved.json

* Update data_streams_disabled.approved.json

---------

Co-authored-by: Carson Ip <[email protected]>
Co-authored-by: kruskall <[email protected]>
  • Loading branch information
3 people authored Dec 20, 2024
1 parent c523686 commit 806d033
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
},
"client": {
"geo": {
"city_name": "Perth",
"city_name": "dynamic",
"continent_name": "Oceania",
"country_iso_code": "AU",
"country_name": "Australia",
"location": "dynamic",
"region_iso_code": "AU-WA",
"region_name": "Western Australia"
"region_iso_code": "dynamic",
"region_name": "dynamic"
},
"ip": "220.244.41.16"
},
Expand Down Expand Up @@ -73,13 +73,13 @@
},
"client": {
"geo": {
"city_name": "Perth",
"city_name": "dynamic",
"continent_name": "Oceania",
"country_iso_code": "AU",
"country_name": "Australia",
"location": "dynamic",
"region_iso_code": "AU-WA",
"region_name": "Western Australia"
"region_iso_code": "dynamic",
"region_name": "dynamic"
},
"ip": "220.244.41.16"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
},
"client": {
"geo": {
"city_name": "Perth",
"city_name": "dynamic",
"continent_name": "Oceania",
"country_iso_code": "AU",
"country_name": "Australia",
"location": "dynamic",
"region_iso_code": "AU-WA",
"region_name": "Western Australia"
"region_iso_code": "dynamic",
"region_name": "dynamic"
},
"ip": "220.244.41.16"
},
Expand Down Expand Up @@ -77,13 +77,13 @@
},
"client": {
"geo": {
"city_name": "Perth",
"city_name": "dynamic",
"continent_name": "Oceania",
"country_iso_code": "AU",
"country_name": "Australia",
"location": "dynamic",
"region_iso_code": "AU-WA",
"region_name": "Western Australia"
"region_iso_code": "dynamic",
"region_name": "dynamic"
},
"ip": "220.244.41.16"
},
Expand Down
3 changes: 3 additions & 0 deletions systemtest/rum_test.go
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 806d033

Please sign in to comment.