merge prerelease branch

Author: eli-darkly

ldcontext/context_easyjson.go

@@ -161,6 +161,10 @@ func unmarshalSingleKindEasyJSON(c *Context, in *jlexer.Lexer, knownKind Kind, u
 		case ldattr.AnonymousAttr:
 			c.anonymous = in.Bool()
 		case jsonPropMeta:
+			if in.IsNull() {
+				in.Skip()
+				break
+			}
 			in.Delim('{')
 			for !in.IsDelim('}') {
 				key := in.UnsafeBytes() // see comment above
@@ -271,6 +275,11 @@ func unmarshalOldUserSchemaEasyJSON(c *Context, in *jlexer.Lexer, usingEventForm
 				c.anonymous = in.Bool()
 			}
 		case jsonPropOldUserCustom:
+			if in.IsNull() {
+				in.Skip()
+				attributes = ldvalue.ValueMapBuilder{}
+				break
+			}
 			in.Delim('{')
 			for !in.IsDelim('}') {
 				name := in.String()
@@ -288,15 +297,15 @@ func unmarshalOldUserSchemaEasyJSON(c *Context, in *jlexer.Lexer, usingEventForm
 		case jsonPropOldUserPrivate:
 			if usingEventFormat {
 				in.SkipRecursive()
-				continue
+				break
 			}
 			readPrivateAttributesEasyJSON(in, c, true)
 			// The "true" here means to interpret the strings as literal attribute names, since the
 			// attribute reference path syntax was not used in the old user schema.
 		case jsonPropOldUserRedacted:
 			if !usingEventFormat {
 				in.SkipRecursive()
-				continue
+				break
 			}
 			readPrivateAttributesEasyJSON(in, c, true)
 		case "firstName", "lastName", "email", "country", "avatar", "ip":

ldcontext/context_unmarshaling.go

@@ -114,7 +114,7 @@ func unmarshalSingleKind(c *Context, r *jreader.Reader, knownKind Kind, usingEve
 		case ldattr.AnonymousAttr:
 			b.Anonymous(r.Bool())
 		case jsonPropMeta:
-			for metaObj := r.Object(); metaObj.Next(); {
+			for metaObj := r.ObjectOrNull(); metaObj.Next(); {
 				switch string(metaObj.Name()) {
 				case jsonPropSecondary:
 					b.OptSecondary(readOptString(r))
@@ -187,7 +187,7 @@ func unmarshalOldUserSchema(c *Context, r *jreader.Reader, usingEventFormat bool
 			value, _ := r.BoolOrNull()
 			b.Anonymous(value)
 		case jsonPropOldUserCustom:
-			for customObj := r.Object(); customObj.Next(); {
+			for customObj := r.ObjectOrNull(); customObj.Next(); {
 				name := string(customObj.Name())
 				var value ldvalue.Value
 				value.ReadFromJSONReader(r)

ldcontext/context_unmarshaling_test.go

@@ -33,6 +33,10 @@ func makeContextUnmarshalUnimportantVariantsParams() []contextSerializationParam
 		{NewBuilder("my-key").Build(),
 			`{"kind": "user", "key": "my-key", "_meta": {}}`},
 
+		// _meta: null is same as no _meta
+		{NewBuilder("my-key").Build(),
+			`{"kind": "user", "key": "my-key", "_meta": null}`},
+
 		// privateAttributes: [] is same as no privateAttributes
 		{NewBuilder("my-key").Build(),
 			`{"kind": "user", "key": "my-key", "_meta": {"privateAttributes": null}}`},
@@ -78,6 +82,10 @@ func makeContextUnmarshalFromOldUserSchemaParams() []contextSerializationParams
 		{NewBuilder("key4").Build(),
 			`{"key": "key4", "anonymous": null}`},
 
+		{NewBuilder("key6").Build(),
+			`{"key": "key6", "custom": {}}`},
+		{NewBuilder("key6").Build(),
+			`{"key": "key6", "custom": null}`},
 		{NewBuilder("key6").Build(),
 			`{"key": "key6", "custom": {"attr1": null}}`},
 		{NewBuilder("key6").SetBool("attr1", true).Build(),