Merge branch 'dynamic-sampling' into head-of-trace

client_test.go

@@ -78,11 +78,15 @@ func TestCaptureMessageEmptyString(t *testing.T) {
 		},
 	}
 	got := transport.lastEvent
-	opts := cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
-		return &Event{
-			Exception: e.Exception,
-		}
-	})
+	opts := cmp.Options{
+		cmpopts.IgnoreFields(Event{}, "sdkMetaData"),
+		cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
+			return &Event{
+				Exception: e.Exception,
+			}
+		}),
+	}
+
 	if diff := cmp.Diff(want, got, opts); diff != "" {
 		t.Errorf("(-want +got):\n%s", diff)
 	}
@@ -282,7 +286,7 @@ func TestCaptureEvent(t *testing.T) {
 		},
 	}
 	got := transport.lastEvent
-	opts := cmp.Options{cmpopts.IgnoreFields(Event{}, "Release")}
+	opts := cmp.Options{cmpopts.IgnoreFields(Event{}, "Release", "sdkMetaData")}
 	if diff := cmp.Diff(want, got, opts); diff != "" {
 		t.Errorf("Event mismatch (-want +got):\n%s", diff)
 	}
@@ -309,11 +313,14 @@ func TestCaptureEventNil(t *testing.T) {
 		},
 	}
 	got := transport.lastEvent
-	opts := cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
-		return &Event{
-			Exception: e.Exception,
-		}
-	})
+	opts := cmp.Options{
+		cmpopts.IgnoreFields(Event{}, "sdkMetaData"),
+		cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
+			return &Event{
+				Exception: e.Exception,
+			}
+		}),
+	}
 	if diff := cmp.Diff(want, got, opts); diff != "" {
 		t.Errorf("(-want +got):\n%s", diff)
 	}
@@ -476,13 +483,17 @@ func TestRecover(t *testing.T) {
 			t.Fatalf("events = %s\ngot %d events, want 1", b, len(events))
 		}
 		got := events[0]
-		opts := cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
-			return &Event{
-				Message:   e.Message,
-				Exception: e.Exception,
-				Level:     e.Level,
-			}
-		})
+		opts := cmp.Options{
+			cmpopts.IgnoreFields(Event{}, "sdkMetaData"),
+			cmp.Transformer("SimplifiedEvent", func(e *Event) *Event {
+				return &Event{
+					Message:   e.Message,
+					Exception: e.Exception,
+					Level:     e.Level,
+				}
+			}),
+		}
+
 		if diff := cmp.Diff(want, got, opts); diff != "" {
 			t.Errorf("(-want +got):\n%s", diff)
 		}

fasthttp/sentryfasthttp_test.go

@@ -208,6 +208,7 @@ func TestIntegration(t *testing.T) {
 			sentry.Event{},
 			"Contexts", "EventID", "Extra", "Platform", "Modules",
 			"Release", "Sdk", "ServerName", "Tags", "Timestamp",
+			"sdkMetaData",
 		),
 		cmpopts.IgnoreMapEntries(func(k string, v string) bool {
 			// fasthttp changed Content-Length behavior in

http/sentryhttp_test.go

@@ -216,6 +216,7 @@ func TestIntegration(t *testing.T) {
 			sentry.Event{},
 			"Contexts", "EventID", "Extra", "Platform", "Modules",
 			"Release", "Sdk", "ServerName", "Tags", "Timestamp",
+			"sdkMetaData",
 		),
 		cmpopts.IgnoreFields(
 			sentry.Request{},

interfaces.go

@@ -221,9 +221,9 @@ const (
 	DynamicSamplingContextKey SDKMetaDataKey = "DynamicSamplingContext"
 )
 
-// SDKMetaData is a struct to stash data which is needed at some point in the SDK's event processing pipeline
+// sdkMetaData is a struct to stash data which is needed at some point in the SDK's event processing pipeline
 // but which shouldn't get send to Sentry.
-type SDKMetaData = struct {
+type SDKMetaData struct {
 	DynamicSamplingContextKey DynamicSamplingContext
 }
 
@@ -266,7 +266,7 @@ type Event struct {
 
 	// The fields below are not part of the final JSON payload.
 
-	SDKMetaData SDKMetaData `json:"-"`
+	sdkMetaData SDKMetaData
 }
 
 // TODO: Event.Contexts map[string]interface{} => map[string]EventContext,

tracing.go

@@ -231,8 +231,8 @@ func (s *Span) ToSentryTrace() string {
 }
 
 func (s *Span) ToBaggage() string {
-	if dsc := s.dynamicSamplingContext; len(dsc.Entries) > 0 {
-		return dsc.String()
+	if len(s.dynamicSamplingContext.Entries) > 0 {
+		return s.dynamicSamplingContext.String()
 	}
 
 	return ""
@@ -377,7 +377,7 @@ func (s *Span) toEvent() *Event {
 		Timestamp: s.EndTime,
 		StartTime: s.StartTime,
 		Spans:     finished,
-		SDKMetaData: SDKMetaData{
+		sdkMetaData: SDKMetaData{
 			DynamicSamplingContextKey: s.dynamicSamplingContext,
 		},
 	}
@@ -630,7 +630,7 @@ func ContinueFromRequest(r *http.Request) SpanOption {
 
 // ContinueFromHeaders returns a span option that updates the span to continue
 // an existing TraceID and propagates the Dynamic Sampling context.
-func ContinueFromHeaders(trace string, baggage string) SpanOption {
+func ContinueFromHeaders(trace, baggage string) SpanOption {
 	return func(s *Span) {
 		if trace != "" {
 			s.updateFromSentryTrace([]byte(trace))

tracing_test.go

@@ -161,6 +161,7 @@ func TestStartSpan(t *testing.T) {
 		cmpopts.IgnoreFields(Event{},
 			"Contexts", "EventID", "Level", "Platform",
 			"Release", "Sdk", "ServerName", "Modules",
+			"sdkMetaData",
 		),
 		cmpopts.EquateEmpty(),
 	}
@@ -229,6 +230,7 @@ func TestStartChild(t *testing.T) {
 		cmpopts.IgnoreFields(Event{},
 			"EventID", "Level", "Platform", "Modules",
 			"Release", "Sdk", "ServerName", "Timestamp", "StartTime",
+			"sdkMetaData",
 		),
 		cmpopts.IgnoreMapEntries(func(k string, v interface{}) bool {
 			return k != "trace"
@@ -312,6 +314,7 @@ func TestStartTransaction(t *testing.T) {
 		cmpopts.IgnoreFields(Event{},
 			"Contexts", "EventID", "Level", "Platform",
 			"Release", "Sdk", "ServerName", "Modules",
+			"sdkMetaData",
 		),
 		cmpopts.EquateEmpty(),
 	}

transport.go

@@ -98,7 +98,7 @@ func transactionEnvelopeFromBody(event *Event, dsn *Dsn, sentAt time.Time, body
 	var b bytes.Buffer
 	enc := json.NewEncoder(&b)
 
-	dsc := event.SDKMetaData.DynamicSamplingContextKey
+	dsc := event.sdkMetaData.DynamicSamplingContextKey
 	var trace = map[string]string{}
 
 	for k, v := range dsc.Entries {