Merge branch '7.17' into updatecli_7.17_updatecli-update-beats-7.17

elastic · Dec 20, 2024 · f14c3bc · f14c3bc
2 parents 649f2a7 + 806d033
commit f14c3bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json b/systemtest/approvals/TestRUMXForwardedFor/data_streams_disabled.approved.json
@@ -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"
             },
@@ -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"
             },

diff --git a/systemtest/approvals/TestRUMXForwardedFor/data_streams_enabled.approved.json b/systemtest/approvals/TestRUMXForwardedFor/data_streams_enabled.approved.json
@@ -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"
             },
@@ -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"
             },

diff --git a/systemtest/rum_test.go b/systemtest/rum_test.go
@@ -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",
 	)
 }