veqryn/marshal-json: convert json into strings

bugsnag · Apr 9, 2024 · 2fa53ac · 2fa53ac
1 parent c17eb96
commit 2fa53ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/v2/metadata.go b/v2/metadata.go
@@ -2,6 +2,7 @@ package bugsnag
 
 import (
 	"encoding"
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strings"
@@ -114,6 +115,11 @@ func (s sanitizer) Sanitize(data interface{}) interface{} {
 		if b, err := dataT.MarshalText(); err == nil {
 			return string(b)
 		}
+
+	case json.Marshaler:
+		if b, err := dataT.MarshalJSON(); err == nil {
+			return string(b)
+		}
 	}
 
 	switch t.Kind() {

diff --git a/v2/metadata_test.go b/v2/metadata_test.go
@@ -1,6 +1,7 @@
 package bugsnag
 
 import (
+	"encoding/json"
 	stderrors "errors"
 	"reflect"
 	"testing"
@@ -215,6 +216,7 @@ func TestMetaDataSanitize(t *testing.T) {
 			"time":     time.Date(2023, 12, 5, 23, 59, 59, 123456789, time.UTC),
 			"duration": 105567462 * time.Millisecond,
 			"text":     _textMarshaller{},
+			"json":     json.RawMessage(`{"hello": "world"}`),
 			"array": []hash{{
 				"creditcard": "1234567812345678",
 				"broken":     broken,
@@ -240,6 +242,7 @@ func TestMetaDataSanitize(t *testing.T) {
 			"time":     "2023-12-05T23:59:59.123456789Z",
 			"duration": "29h19m27.462s",
 			"text":     "marshalled text",
+			"json":     `{"hello": "world"}`,
 			"array": []interface{}{map[string]interface{}{
 				"creditcard": "[FILTERED]",
 				"broken": map[string]interface{}{