fix formating

Author: rubvs

systemtest/rum_test.go

@@ -51,43 +51,27 @@ func TestRUMXForwardedFor(t *testing.T) {
 	require.NoError(t, err)
 	serverURL.Path = "/intake/v2/rum/events"
 
+	// Send one transaction and one set of breakdown metrics.
+	// They should both have geoIP enrichment applied.
 	const body = `{"metadata":{"service":{"name":"rum-js-test","agent":{"name":"rum-js","version":"5.5.0"}}}}
 {"transaction":{"trace_id":"611f4fa950f04631aaaaaaaaaaaaaaaa","id":"611f4fa950f04631","type":"page-load","duration":643,"span_count":{"started":0}}}
 {"metricset":{"samples":{"transaction.breakdown.count":{"value":12},"transaction.duration.sum.us":{"value":12},"transaction.duration.count":{"value":2},"transaction.self_time.sum.us":{"value":10},"transaction.self_time.count":{"value":2},"span.self_time.count":{"value":1},"span.self_time.sum.us":{"value":633.288}},"transaction":{"type":"request","name":"GET /"},"span":{"type":"external","subtype":"http"},"timestamp": 1496170422281000}}
 `
 
-	req, err := http.NewRequest("POST", serverURL.String(), strings.NewReader(body))
-	require.NoError(t, err)
-
+	req, _ := http.NewRequest("POST", serverURL.String(), strings.NewReader(body))
 	req.Header.Set("Content-Type", "application/x-ndjson")
-	req.Header.Set("X-Forwarded-For", "220.244.41.16")
-
+	ipAddress := "220.244.41.16"
+	req.Header.Set("X-Forwarded-For", ipAddress)
 	resp, err := http.DefaultClient.Do(req)
 	require.NoError(t, err)
-
-	_, err = io.ReadAll(resp.Body)
-	require.NoError(t, err)
 	require.Equal(t, http.StatusAccepted, resp.StatusCode)
-
 	io.Copy(io.Discard, resp.Body)
 	resp.Body.Close()
 
-	idx := []string{
-		"traces-apm*",
-		"metrics-apm*",
-	}
-
-	result := estest.ExpectMinDocs(t,
-		systemtest.Elasticsearch,
-		len(idx),
-		strings.Join(idx, ","),
-		espoll.TermsQuery{
-			Field:  "processor.event",
-			Values: []any{"transaction", "metric"},
-		},
-	)
-
-	// Includes checking for absence of `tags` field.
+	result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 2, "traces-apm*,metrics-apm*", espoll.TermsQuery{
+		Field:  "processor.event",
+		Values: []interface{}{"transaction", "metric"},
+	})
 	approvaltest.ApproveFields(
 		t, t.Name(), result.Hits.Hits,
 		// RUM timestamps are set by the server based on the time the payload is received.