[v2] Fix failing tests after merging. (elastic#1396)

roncohen · Oct 15, 2018 · 1aab36e · 1aab36e
1 parent 04513c3
commit 1aab36e
Show file tree

Hide file tree

Showing 5 changed files with 499 additions and 488 deletions.
diff --git a/...sor/stream/approved-es-documents/testV2IntakeIntegrationMixedMinimalProcess.approved.json b/...sor/stream/approved-es-documents/testV2IntakeIntegrationMixedMinimalProcess.approved.json
@@ -44,6 +44,9 @@
                     "name": "1234_service-12a3"
                 }
             },
+            "parent": {
+                "id": "ab23456a89012345"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -54,7 +57,6 @@
                 },
                 "hex_id": "0123456a89012345",
                 "name": "GET /api/types",
-                "parent_id": "ab23456a89012345",
                 "start": {
                     "us": 1845
                 },

diff --git a/...ssor/stream/approved-es-documents/testV2IntakeIntegrationOptionalTimestamps.approved.json b/...ssor/stream/approved-es-documents/testV2IntakeIntegrationOptionalTimestamps.approved.json
@@ -76,6 +76,9 @@
                     "name": "backendspans"
                 }
             },
+            "parent": {
+                "id": "012345654321123"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -86,7 +89,6 @@
                 },
                 "hex_id": "0147258369abcdef",
                 "name": "sp1",
-                "parent_id": "012345654321123",
                 "start": {
                     "us": 10000
                 },

diff --git a/processor/stream/approved-es-documents/testV2IntakeIntegrationSpans.approved.json b/processor/stream/approved-es-documents/testV2IntakeIntegrationSpans.approved.json
@@ -47,6 +47,9 @@
                     "name": "backendspans"
                 }
             },
+            "parent": {
+                "id": "0000000011111111"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -57,7 +60,6 @@
                 },
                 "hex_id": "1234abcdef56789568",
                 "name": "GET /api/types",
-                "parent_id": "0000000011111111",
                 "start": {
                     "us": 0
                 },
@@ -81,6 +83,9 @@
                     "name": "backendspans"
                 }
             },
+            "parent": {
+                "id": "abcdefabcdef7890"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -91,7 +96,6 @@
                 },
                 "hex_id": "0123456a89012345",
                 "name": "GET /api/types",
-                "parent_id": "abcdefabcdef7890",
                 "start": {
                     "us": 1845
                 },
@@ -115,6 +119,9 @@
                     "name": "backendspans"
                 }
             },
+            "parent": {
+                "id": "ababcdcdefefabde"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -125,7 +132,6 @@
                 },
                 "hex_id": "abcde56a89012345",
                 "name": "get /api/types",
-                "parent_id": "ababcdcdefefabde",
                 "start": {
                     "us": 0
                 },
@@ -158,6 +164,9 @@
                     "name": "backendspans"
                 }
             },
+            "parent": {
+                "id": "abcdef0123456789"
+            },
             "processor": {
                 "event": "span",
                 "name": "transaction"
@@ -168,7 +177,6 @@
                 },
                 "hex_id": "1234567890aaaade",
                 "name": "SELECT FROM product_types",
-                "parent_id": "abcdef0123456789",
                 "stacktrace": [
                     {
                         "exclude_from_grouping": false,

diff --git a/processor/stream/benchmark_test.go b/processor/stream/benchmark_test.go
@@ -22,7 +22,6 @@ import (
 	"context"
 	"errors"
 	"io/ioutil"
-	"math"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -60,7 +59,7 @@ func BenchmarkStreamProcessor(b *testing.B) {
 			for i := 0; i < b.N; i++ {
 				b.StopTimer()
 				r.Reset(data)
-				reader := decoder.NewNDJSONStreamReader(r, math.MaxInt32)
+				reader := decoder.NewNDJSONStreamReader(r, 100000)
 				b.StartTimer()
 				sp.HandleStream(ctx, map[string]interface{}{}, reader, report)
 			}