Default 'sampled' to true

elastic · Jan 4, 2018 · 0680c9d · 0680c9d
1 parent f38a939
commit 0680c9d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 22 deletions.
diff --git a/docs/fields.asciidoc b/docs/fields.asciidoc
@@ -660,7 +660,7 @@ A user-defined mapping of groups of marks.
 
 type: boolean
 
-Unsampled transactions have no spans.
+Sampled transactions have spans. Defaults to true
 
 
 [[exported-fields-beat]]

diff --git a/docs/spec/transactions/transaction.json b/docs/spec/transactions/transaction.json
@@ -58,8 +58,8 @@
         },
         "sampled": {
             "type": "boolean",
-            "description": "Sampled transactions have spans."
+            "description": "Sampled transactions have spans. Defaults to true."
         }
     },
-    "required": ["id", "name", "duration", "type", "timestamp", "sampled"]
+    "required": ["id", "name", "duration", "type", "timestamp"]
 }
diff --git a/processor/transaction/_meta/fields.yml b/processor/transaction/_meta/fields.yml
@@ -48,7 +48,7 @@
         - name: sampled
           type: boolean
           description: >
-            Unsampled transactions have no spans.
+            Sampled transactions have spans. Defaults to true
 
 - key: apm-span
   title: APM Span

diff --git a/processor/transaction/event.go b/processor/transaction/event.go
@@ -18,7 +18,7 @@ type Event struct {
 	Context   common.MapStr
 	Spans     []Span
 	Marks     common.MapStr
-	Sampled   bool
+	Sampled   *bool
 }
 
 func (t *Event) DocType() string {
@@ -33,7 +33,12 @@ func (t *Event) Transform() common.MapStr {
 	enh.Add(tx, "type", t.Type)
 	enh.Add(tx, "result", t.Result)
 	enh.Add(tx, "marks", t.Marks)
-	enh.Add(tx, "sampled", t.Sampled)
+
+	if t.Sampled == nil {
+		enh.Add(tx, "sampled", true)
+	} else {
+		enh.Add(tx, "sampled", t.Sampled)
+	}
 
 	return tx
 }

diff --git a/processor/transaction/event_test.go b/processor/transaction/event_test.go
@@ -16,6 +16,7 @@ func TestEventTransform(t *testing.T) {
 
 	id := "123"
 	result := "tx result"
+	sampled := false
 
 	tests := []struct {
 		Event  Event
@@ -29,7 +30,7 @@ func TestEventTransform(t *testing.T) {
 				"name":     "",
 				"type":     "",
 				"duration": common.MapStr{"us": 0},
-				"sampled":  false,
+				"sampled":  true,
 			},
 			Msg: "Empty Event",
 		},
@@ -43,15 +44,15 @@ func TestEventTransform(t *testing.T) {
 				Duration:  65.98,
 				Context:   common.MapStr{"foo": "bar"},
 				Spans:     []Span{},
-				Sampled:   true,
+				Sampled:   &sampled,
 			},
 			Output: common.MapStr{
 				"id":       id,
 				"name":     "mytransaction",
 				"type":     "tx",
 				"result":   "tx result",
 				"duration": common.MapStr{"us": 65980},
-				"sampled":  true,
+				"sampled":  false,
 			},
 			Msg: "Full Event",
 		},

diff --git a/processor/transaction/payload_test.go b/processor/transaction/payload_test.go
@@ -42,7 +42,7 @@ func TestPayloadTransform(t *testing.T) {
 			"id":       "",
 			"name":     "",
 			"type":     "",
-			"sampled":  false,
+			"sampled":  true,
 		},
 	}
 
@@ -56,7 +56,7 @@ func TestPayloadTransform(t *testing.T) {
 			"id":       "",
 			"name":     "",
 			"type":     "",
-			"sampled":  false,
+			"sampled":  true,
 		},
 		"context": common.MapStr{
 			"system": common.MapStr{
@@ -81,7 +81,7 @@ func TestPayloadTransform(t *testing.T) {
 			"id":       "",
 			"name":     "",
 			"type":     "",
-			"sampled":  false,
+			"sampled":  true,
 		},
 		"context": common.MapStr{
 			"foo": "bar", "user": common.MapStr{"id": "55"},

diff --git a/processor/transaction/schema.go b/processor/transaction/schema.go
@@ -513,10 +513,10 @@ var transactionSchema = `{
         },
         "sampled": {
             "type": "boolean",
-            "description": "Sampled transactions have spans."
+            "description": "Sampled transactions have spans. Defaults to true."
         }
     },
-    "required": ["id", "name", "duration", "type", "timestamp", "sampled"]
+    "required": ["id", "name", "duration", "type", "timestamp"]
             },
             "minItems": 1
         }

diff --git a/tests/data/invalid/transaction/no_sampled.json b/tests/data/invalid/transaction/no_sampled.json
diff --git a/tests/json_schema_test.go b/tests/json_schema_test.go
@@ -91,7 +91,6 @@ func TestTransactionSchema(t *testing.T) {
 		{File: "no_duration.json", Error: `missing properties: "duration"`},
 		{File: "no_type.json", Error: `missing properties: "type"`},
 		{File: "no_timestamp.json", Error: `missing properties: "timestamp"`},
-		{File: "no_sampled.json", Error: `missing properties: "sampled"`},
 		{File: "invalid_id.json", Error: "[#/properties/id/pattern] does not match pattern"},
 		{File: "invalid_timestamp.json", Error: "is not valid \"date-time\""},
 		{File: "invalid_timestamp2.json", Error: "I[#/timestamp] S[#/properties/timestamp/pattern] does not match pattern"},