test: use more stable ip in otlp grpc logs ip system test (#12037)

elastic · Nov 13, 2023 · bd2a453 · bd2a453
1 parent a88fd41
commit bd2a453
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json
@@ -8,18 +8,15 @@
             },
             "client": {
                 "geo": {
-                    "city_name": "dynamic",
                     "continent_name": "Europe",
-                    "country_iso_code": "ES",
-                    "country_name": "Spain",
+                    "country_iso_code": "DE",
+                    "country_name": "Germany",
                     "location": {
                         "lat": "dynamic",
                         "lon": "dynamic"
-                    },
-                    "region_iso_code": "dynamic",
-                    "region_name": "dynamic"
+                    }
                 },
-                "ip": "195.55.79.118"
+                "ip": "178.162.206.244"
             },
             "data_stream": {
                 "dataset": "apm.app.unknown",
@@ -51,7 +48,7 @@
                 "name": "unknown"
             },
             "source": {
-                "ip": "195.55.79.118",
+                "ip": "178.162.206.244",
                 "nat": {
                     "ip": "127.0.0.1"
                 }

diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go
@@ -464,7 +464,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) {
 	defer cancel()
 
 	// Override local IP address to be found in "GeoLite2-City.mmdb".
-	md := metadata.New(map[string]string{"X-Forwarded-For": "195.55.79.118"})
+	md := metadata.New(map[string]string{"X-Forwarded-For": "178.162.206.244"})
 	ctx = metadata.NewOutgoingContext(ctx, md)
 
 	conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip")))
@@ -478,7 +478,7 @@ func TestOTLPGRPCLogsClientIP(t *testing.T) {
 	require.NoError(t, err)
 
 	result := estest.ExpectDocs(t, systemtest.Elasticsearch, "logs-apm*", nil)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.city_name", "client.geo.location.lat", "client.geo.location.lon", "client.geo.region_iso_code", "client.geo.region_name")
+	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "client.geo.location.lat", "client.geo.location.lon")
 }
 
 func newMobileLogs(body interface{}) plog.Logs {