systemtest: approve fields instead of _source

elastic · Nov 24, 2023 · 5b22d96 · 5b22d96
1 parent 5018b52
commit 5b22d96
Show file tree

Hide file tree

Showing 50 changed files with 2,496 additions and 1,871 deletions.
diff --git a/systemtest/agentconfig_test.go b/systemtest/agentconfig_test.go
@@ -139,7 +139,7 @@ func TestAgentConfig(t *testing.T) {
 	require.Len(t, result.Hits.Hits, 2)
 	etag := gjson.GetBytes(result.Hits.Hits[0].RawSource, "labels.etag")
 	assert.Equal(t, etag1, strconv.Quote(etag.String()))
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp", "labels.etag")
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "@timestamp", "labels.etag")
 }
 
 func queryAgentConfig(t testing.TB, serverURL, serviceName, serviceEnvironment, etag string) (map[string]string, *http.Response, map[string]interface{}) {

diff --git a/systemtest/aggregation_test.go b/systemtest/aggregation_test.go
@@ -78,7 +78,7 @@ func TestTransactionAggregation(t *testing.T) {
 	result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 9, "metrics-apm.transaction*",
 		espoll.ExistsQuery{Field: "transaction.duration.histogram"},
 	)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits)
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits)
 
 	// Make sure the _doc_count field is added such that aggregations return
 	// the appropriate per-bucket doc_count values.
@@ -140,7 +140,7 @@ func TestTransactionAggregationShutdown(t *testing.T) {
 	result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 3, "metrics-apm.transaction*",
 		espoll.ExistsQuery{Field: "transaction.duration.histogram"},
 	)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits)
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits)
 }
 
 func TestServiceDestinationAggregation(t *testing.T) {
@@ -176,7 +176,16 @@ func TestServiceDestinationAggregation(t *testing.T) {
 	result := estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.service_destination*",
 		espoll.ExistsQuery{Field: "span.destination.service.response_time.count"},
 	)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits)
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits)
+
+	// _doc_count is not returned in fields, it is only visible in _source and
+	// in the results of aggregations.
+	//
+	// TODO(axw) we should use an aggregation, and check the resturned doc_counts.
+	for _, hit := range result.Hits.Hits {
+		docCount := hit.Source["_doc_count"].(float64)
+		assert.Equal(t, 5.0, docCount)
+	}
 }
 
 func TestTransactionAggregationLabels(t *testing.T) {
@@ -252,7 +261,16 @@ func TestServiceTransactionMetricsAggregation(t *testing.T) {
 	result := estest.ExpectMinDocs(t, systemtest.Elasticsearch, 2, "metrics-apm.service_transaction*",
 		espoll.TermQuery{Field: "metricset.name", Value: "service_transaction"},
 	)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits)
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits)
+
+	// _doc_count is not returned in fields, it is only visible in _source and
+	// in the results of aggregations.
+	//
+	// TODO(axw) we should use an aggregation, and check the resturned doc_counts.
+	for _, hit := range result.Hits.Hits {
+		docCount := hit.Source["_doc_count"].(float64)
+		assert.Equal(t, 2.0, docCount)
+	}
 }
 
 func TestServiceTransactionMetricsAggregationLabels(t *testing.T) {
@@ -371,7 +389,7 @@ func TestServiceSummaryMetricsAggregation(t *testing.T) {
 	result := estest.ExpectDocs(t, systemtest.Elasticsearch, "metrics-apm.service_summary*",
 		espoll.TermQuery{Field: "metricset.name", Value: "service_summary"},
 	)
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits)
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits)
 }
 
 func TestServiceSummaryMetricsAggregationOverflow(t *testing.T) {
@@ -416,7 +434,7 @@ func TestServiceSummaryMetricsAggregationOverflow(t *testing.T) {
 		espoll.TermQuery{Field: "metricset.name", Value: "service_summary"},
 	)
 	// Ignore timestamp because overflow bucket uses time.Now()
-	approvaltest.ApproveEvents(t, t.Name(), result.Hits.Hits, "@timestamp")
+	approvaltest.ApproveFields(t, t.Name(), result.Hits.Hits, "@timestamp")
 }
 
 func TestNonDefaultRollupIntervalHiddenDataStream(t *testing.T) {

diff --git a/systemtest/approvals/TestApprovedMetrics.approved.json b/systemtest/approvals/TestApprovedMetrics.approved.json
@@ -68,6 +68,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     },
     {
@@ -142,6 +145,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     },
     {
@@ -234,6 +240,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     },
     {
@@ -264,15 +273,19 @@
         "labels.tag1": [
             "one"
         ],
-        "latency_distribution.counts": [
-            1,
-            2,
-            3
-        ],
-        "latency_distribution.values": [
-            1.1,
-            2.2,
-            3.3
+        "latency_distribution": [
+            {
+                "counts": [
+                    1,
+                    2,
+                    3
+                ],
+                "values": [
+                    1.1,
+                    2.2,
+                    3.3
+                ]
+            }
         ],
         "metricset.name": [
             "app"
@@ -312,6 +325,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     },
     {
@@ -407,6 +423,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     },
     {
@@ -502,6 +521,9 @@
         ],
         "user.name": [
             "logged-in-user"
+        ],
+        "user.name.text": [
+            "logged-in-user"
         ]
     }
 ]
diff --git a/systemtest/approvals/TestCompressedSpans.approved.json b/systemtest/approvals/TestCompressedSpans.approved.json
@@ -57,6 +57,9 @@
         "process.title": [
             "systemtest.test"
         ],
+        "process.title.text": [
+            "systemtest.test"
+        ],
         "processor.event": [
             "span"
         ],
@@ -179,6 +182,9 @@
         "process.title": [
             "systemtest.test"
         ],
+        "process.title.text": [
+            "systemtest.test"
+        ],
         "processor.event": [
             "span"
         ],

diff --git a/systemtest/approvals/TestDropUnsampled.approved.json b/systemtest/approvals/TestDropUnsampled.approved.json
@@ -54,6 +54,9 @@
         "process.title": [
             "systemtest.test"
         ],
+        "process.title.text": [
+            "systemtest.test"
+        ],
         "processor.event": [
             "transaction"
         ],
@@ -90,6 +93,9 @@
         "transaction.name": [
             "sampled"
         ],
+        "transaction.name.text": [
+            "sampled"
+        ],
         "transaction.representative_count": [
             1
         ],
@@ -185,6 +191,9 @@
         "user_agent.original": [
             "Go-http-client/1.1"
         ],
+        "user_agent.original.text": [
+            "Go-http-client/1.1"
+        ],
         "user_agent.version": [
             "1.1"
         ]

diff --git a/systemtest/approvals/TestErrorIngest.approved.json b/systemtest/approvals/TestErrorIngest.approved.json
@@ -130,6 +130,12 @@
         "process.title": [
             "node"
         ],
+        "process.title.text": [
+            "node"
+        ],
+        "processor.event": [
+            "error"
+        ],
         "service.environment": [
             "staging"
         ],
@@ -192,6 +198,9 @@
         ],
         "user.name": [
             "bar"
+        ],
+        "user.name.text": [
+            "bar"
         ]
     }
 ]