From 17ace2347524ee22d289f5176e24e764090d7ba5 Mon Sep 17 00:00:00 2001 From: kruskall <99559985+kruskall@users.noreply.github.com> Date: Tue, 7 May 2024 01:47:37 +0200 Subject: [PATCH] test: use maxmind db test ip to reduce flaky test (#13083) --- .../TestOTLPGRPCLogsClientIP.approved.json | 17 ++++------------- systemtest/otlp_test.go | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json index 3a79cdece68..d90d2fe8f8c 100644 --- a/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json +++ b/systemtest/approvals/TestOTLPGRPCLogsClientIP.approved.json @@ -9,29 +9,20 @@ "agent.version": [ "unknown" ], - "client.geo.city_name": [ - "dynamic" - ], "client.geo.continent_name": [ "Europe" ], "client.geo.country_iso_code": [ - "DE" + "SE" ], "client.geo.country_name": [ - "Germany" + "Sweden" ], "client.geo.location": [ "dynamic" ], - "client.geo.region_iso_code": [ - "dynamic" - ], - "client.geo.region_name": [ - "dynamic" - ], "client.ip": [ - "178.162.206.244" + "89.160.20.128" ], "data_stream.dataset": [ "apm.app.unknown" @@ -73,7 +64,7 @@ "unknown" ], "source.ip": [ - "178.162.206.244" + "89.160.20.128" ], "source.nat.ip": [ "127.0.0.1" diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go index 835275ef780..9f9b892f575 100644 --- a/systemtest/otlp_test.go +++ b/systemtest/otlp_test.go @@ -504,7 +504,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": "178.162.206.244"}) + md := metadata.New(map[string]string{"X-Forwarded-For": "89.160.20.128"}) ctx = metadata.NewOutgoingContext(ctx, md) conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip")))