launchdarkly
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎internal/sharedtest/custom_attributes.go‎
Lines changed: 25 additions & 0 deletions b/‎internal/sharedtest/custom_attributes.go‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎internal/sharedtest/old_user_test_data.go‎
Lines changed: 30 additions & 0 deletions b/‎internal/sharedtest/old_user_test_data.go‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎internal/sharedtest/package_info.go‎
Lines changed: 3 additions & 0 deletions b/‎internal/sharedtest/package_info.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎lduser/testdata_benchmark_test.go‎
Lines changed: 68 additions & 0 deletions b/‎lduser/testdata_benchmark_test.go‎
Lines changed: 68 additions & 0 deletions
diff --git a/‎lduser/user_benchmark_test.go‎
Lines changed: 37 additions & 0 deletions b/‎lduser/user_benchmark_test.go‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎lduser/user_builder_benchmark_test.go‎
Lines changed: 15 additions & 23 deletions b/‎lduser/user_builder_benchmark_test.go‎
Lines changed: 15 additions & 23 deletions
diff --git a/‎lduser/user_serialization_benchmark_test.go‎
Lines changed: 53 additions & 34 deletions b/‎lduser/user_serialization_benchmark_test.go‎
Lines changed: 53 additions & 34 deletions
diff --git a/‎lduser/user_serialization_easyjson_benchmark_test.go‎
Lines changed: 14 additions & 12 deletions b/‎lduser/user_serialization_easyjson_benchmark_test.go‎
Lines changed: 14 additions & 12 deletions
@@ -70,7 +70,7 @@ benchmark-allocs:
 
 $(LINTER_VERSION_FILE):
 	rm -f $(LINTER)
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s $(GOLANGCI_LINT_VERSION)
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 	touch $(LINTER_VERSION_FILE)
 
 lint: $(LINTER_VERSION_FILE)
 
@@ -0,0 +1,25 @@
+package sharedtest
+
+import (
+	"fmt"
+
+	"gopkg.in/launchdarkly/go-sdk-common.v2/ldvalue"
+)
+
+const (
+	SmallNumberOfCustomAttributes = 2  //nolint:revive
+	LargeNumberOfCustomAttributes = 20 //nolint:revive
+)
+
+type NameAndLDValue struct { //nolint:revive
+	Name  string
+	Value ldvalue.Value
+}
+
+func MakeCustomAttributeNamesAndValues(count int) []NameAndLDValue { //nolint:revive
+	ret := make([]NameAndLDValue, 0, count)
+	for i := 1; i <= count; i++ {
+		ret = append(ret, NameAndLDValue{fmt.Sprintf("attr%d", i), ldvalue.String(fmt.Sprintf("value%d", i))})
+	}
+	return ret
+}
@@ -0,0 +1,30 @@
+package sharedtest
+
+// These functions return standardized test inputs for unmarshaling JSON user data in the old user schema.
+
+type UnmarshalingTestParams struct { //nolint:revive
+	Name string
+	Data []byte
+}
+
+func MakeOldUserUnmarshalingTestParams() []UnmarshalingTestParams { //nolint:revive
+	return []UnmarshalingTestParams{
+		{"old user with key only", MakeOldUserWithKeyOnlyJSON()},
+		{"old user with few attrs", MakeOldUserWithFewAttributesJSON()},
+		{"old user with all attrs", MakeOldUserWithAllAttributesJSON()},
+	}
+}
+
+func MakeOldUserWithKeyOnlyJSON() []byte { //nolint:revive
+	return []byte(`{"key":"user-key"}`)
+}
+
+func MakeOldUserWithFewAttributesJSON() []byte { //nolint:revive
+	return []byte(`{"key":"user-key","name":"Name","email":"test@example.com","custom":{"attr":"value"}}`)
+}
+
+func MakeOldUserWithAllAttributesJSON() []byte { //nolint:revive
+	return []byte(`{"key":"user-key","secondary":"secondary-value","name":"Name","ip":"ip-value","country":"us",` +
+		`"email":"test@example.com","firstName":"First","lastName":"Last","avatar":"avatar-value","anonymous":true,` +
+		`"custom":{"attr":"value"}}`)
+}
@@ -0,0 +1,3 @@
+// Package sharedtest contains test helpers that may be used in unit tests and/or benchmarks for
+// multiple packages in go-sdk-common. It should not import any go-sdk-common packages except ldvalue.
+package sharedtest
@@ -0,0 +1,68 @@
+package lduser
+
+import (
+	"gopkg.in/launchdarkly/go-sdk-common.v2/ldvalue"
+)
+
+var (
+	benchmarkUserBuilder                        = NewUserBuilder("key")
+	benchmarkUserBuilderWithAllScalarAttributes = NewUserBuilder("key").
+							Secondary("s").
+							IP("i").
+							Country("c").
+							Email("e").
+							FirstName("f").
+							LastName("l").
+							Avatar("a").
+							Name("n").
+							Anonymous(true)
+
+	benchmarkUserResult  User
+	benchmarkUserPointer *User
+
+	benchmarkValue ldvalue.Value
+
+	benchmarkJSONResult []byte
+
+	benchmarkErr error
+)
+
+type benchmarkMarshalTestParams struct {
+	name string
+	user User
+}
+
+func makeBenchmarkMarshalTestParams() []benchmarkMarshalTestParams {
+	return []benchmarkMarshalTestParams{
+		{"user with key only", makeBenchmarkUserWithKeyOnly()},
+		{"user with few attrs", makeBenchmarkUserWithFewAttributes()},
+		{"user with all attrs", makeBenchmarkUserWithAllAttributes()},
+	}
+}
+
+func makeBenchmarkUserWithKeyOnly() User {
+	return NewUser("user-key")
+}
+
+func makeBenchmarkUserWithFewAttributes() User {
+	return NewUserBuilder("user-key").
+		Name("Name").
+		Email("test@example.com").
+		SetAttribute(UserAttribute("attr"), ldvalue.String("value")).
+		Build()
+}
+
+func makeBenchmarkUserWithAllAttributes() User {
+	return NewUserBuilder("user-key").
+		Secondary("secondary-value").
+		Name("Name").
+		IP("ip-value").
+		Country("us").
+		Email("test@example.com").
+		FirstName("First").
+		LastName("Last").
+		Avatar("avatar-value").
+		Anonymous(true).
+		SetAttribute(UserAttribute("attr"), ldvalue.String("value")).
+		Build()
+}
@@ -0,0 +1,37 @@
+package lduser
+
+import (
+	"fmt"
+	"testing"
+
+	"gopkg.in/launchdarkly/go-sdk-common.v2/internal/sharedtest"
+)
+
+func BenchmarkUserMinimumAllocationSize(b *testing.B) {
+	// This just measures the minimum number of bytes taken up by a User.
+	for i := 0; i < b.N; i++ {
+		benchmarkUserPointer = makeEmptyUserPointer()
+	}
+}
+
+func makeEmptyUserPointer() *User {
+	return &User{}
+}
+
+func BenchmarkUserGetCustomAttrNoAlloc(b *testing.B) {
+	for _, n := range []int{sharedtest.SmallNumberOfCustomAttributes, sharedtest.LargeNumberOfCustomAttributes} {
+		b.Run(fmt.Sprintf("with %d attributes", n), func(b *testing.B) {
+			builder := NewUserBuilder("key")
+			attrs := sharedtest.MakeCustomAttributeNamesAndValues(n)
+			for _, a := range attrs {
+				builder.SetAttribute(UserAttribute(a.Name), a.Value)
+			}
+			user := builder.Build()
+			lastAttr := UserAttribute(attrs[n-1].Name)
+			b.ResetTimer()
+			for i := 0; i < b.N; i++ {
+				benchmarkValue = user.GetAttribute(lastAttr)
+			}
+		})
+	}
+}
@@ -1,25 +1,10 @@
 package lduser
 
 import (
+	"fmt"
 	"testing"
 
-	"gopkg.in/launchdarkly/go-sdk-common.v2/ldvalue"
-)
-
-var (
-	benchmarkUserBuilder                        = NewUserBuilder("key")
-	benchmarkUserBuilderWithAllScalarAttributes = NewUserBuilder("key").
-							Secondary("s").
-							IP("i").
-							Country("c").
-							Email("e").
-							FirstName("f").
-							LastName("l").
-							Avatar("a").
-							Name("n").
-							Anonymous(true)
-
-	benchmarkUserResult User
+	"gopkg.in/launchdarkly/go-sdk-common.v2/internal/sharedtest"
 )
 
 func BenchmarkNewUserNoAlloc(b *testing.B) {
@@ -40,12 +25,19 @@ func BenchmarkNewUserFromBuilder(b *testing.B) {
 	}
 }
 
-func BenchmarkNewUserFromBuilderWithCustom(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		benchmarkUserResult = NewUserBuilder("key").
-			Custom("attr1", ldvalue.String("value1")).
-			Custom("attr2", ldvalue.String("value2")).
-			Build()
+func BenchmarkBuildWithCustomAttributes(b *testing.B) {
+	for _, n := range []int{sharedtest.SmallNumberOfCustomAttributes, sharedtest.LargeNumberOfCustomAttributes} {
+		b.Run(fmt.Sprintf("with %d attributes", n), func(b *testing.B) {
+			attrs := sharedtest.MakeCustomAttributeNamesAndValues(n)
+			b.ResetTimer()
+			for i := 0; i < b.N; i++ {
+				builder := NewUserBuilder("key")
+				for _, a := range attrs {
+					builder.SetAttribute(UserAttribute(a.Name), a.Value)
+				}
+				benchmarkUserResult = builder.Build()
+			}
+		})
 	}
 }
 
 
@@ -4,49 +4,68 @@ import (
 	"encoding/json"
 	"testing"
 
-	"gopkg.in/launchdarkly/go-sdk-common.v2/ldvalue"
-)
+	"gopkg.in/launchdarkly/go-sdk-common.v2/internal/sharedtest"
 
-var (
-	benchmarkSimpleUser            = NewUser("user-key")
-	benchmarkSimpleUserJSON        = []byte(`{"key":"user-key"}`)
-	benchmarkUserWithAllAttributes = NewUserBuilder("user-key").
-					Secondary("s").
-					IP("i").
-					Country("c").
-					Email("e").
-					FirstName("f").
-					LastName("l").
-					Avatar("a").
-					Name("n").
-					Anonymous(true).
-					Custom("attr", ldvalue.String("value")).
-					Build()
-	benchmarkUserWithAllAttributesJSON = []byte(benchmarkUserWithAllAttributes.String())
-
-	benchmarkJSONResult []byte
+	"gopkg.in/launchdarkly/go-jsonstream.v1/jreader"
+	"gopkg.in/launchdarkly/go-jsonstream.v1/jwriter"
 )
 
-func BenchmarkUserSerializationWithKeyOnly(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		benchmarkJSONResult, _ = json.Marshal(benchmarkUserWithAllAttributes)
+func doMarshalBenchmark(b *testing.B, marshalFn func(*User) ([]byte, error)) {
+	for _, p := range makeBenchmarkMarshalTestParams() {
+		b.Run(p.name, func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				if benchmarkJSONResult, benchmarkErr = marshalFn(&p.user); benchmarkErr != nil {
+					b.Fatal(benchmarkErr)
+				}
+			}
+		})
 	}
 }
 
-func BenchmarkUserSerializationWithAllAttributes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		benchmarkJSONResult, _ = json.Marshal(benchmarkSimpleUser)
+func doUnmarshalBenchmark(b *testing.B, unmarshalFn func(*User, []byte) error) {
+	for _, p := range sharedtest.MakeOldUserUnmarshalingTestParams() {
+		b.Run(p.Name, func(b *testing.B) {
+			for i := 0; i < b.N; i++ {
+				if benchmarkErr = unmarshalFn(&benchmarkUserResult, p.Data); benchmarkErr != nil {
+					b.Fatal(benchmarkErr)
+				}
+			}
+		})
 	}
 }
 
-func BenchmarkUserDeserializationWithKeyOnly(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = json.Unmarshal(benchmarkSimpleUserJSON, &benchmarkUserResult)
-	}
+func jsonMarshalTestFn(u *User) ([]byte, error) {
+	return json.Marshal(u)
 }
 
-func BenchmarkUserDeserializationWithAllAttributes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = json.Unmarshal(benchmarkUserWithAllAttributesJSON, &benchmarkUserResult)
-	}
+func jsonStreamMarshalTestFn(u *User) ([]byte, error) {
+	w := jwriter.NewWriter()
+	u.WriteToJSONWriter(&w)
+	return w.Bytes(), w.Error()
+}
+
+func jsonUnmarshalTestFn(u *User, data []byte) error {
+	return json.Unmarshal(data, u)
+}
+
+func jsonStreamUnmarshalTestFn(u *User, data []byte) error {
+	r := jreader.NewReader(data)
+	u.ReadFromJSONReader(&r)
+	return r.Error()
+}
+
+func BenchmarkJSONMarshal(b *testing.B) {
+	doMarshalBenchmark(b, jsonMarshalTestFn)
+}
+
+func BenchmarkJSONStreamMarshal(b *testing.B) {
+	doMarshalBenchmark(b, jsonStreamMarshalTestFn)
+}
+
+func BenchmarkJSONUnmarshal(b *testing.B) {
+	doUnmarshalBenchmark(b, jsonUnmarshalTestFn)
+}
+
+func BenchmarkJSONStreamUnmarshal(b *testing.B) {
+	doUnmarshalBenchmark(b, jsonStreamUnmarshalTestFn)
 }
@@ -1,24 +1,26 @@
+//go:build launchdarkly_easyjson
 // +build launchdarkly_easyjson
 
 package lduser
 
 import (
 	"testing"
 
-	"github.com/mailru/easyjson/jlexer"
-	"github.com/mailru/easyjson/jwriter"
+	easyjson "github.com/mailru/easyjson"
 )
 
-func BenchmarkUserSerializationWithAllAttributesEasyJSON(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		writer := jwriter.Writer{}
-		benchmarkSimpleUser.MarshalEasyJSON(&writer)
-	}
+func easyJSONMarshalTestFn(u *User) ([]byte, error) {
+	return easyjson.Marshal(u)
 }
 
-func BenchmarkUserDeserializationWithAllAttributesEasyJSON(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		lexer := jlexer.Lexer{Data: benchmarkUserWithAllAttributesJSON}
-		benchmarkUserResult.UnmarshalEasyJSON(&lexer)
-	}
+func easyJSONUnmarshalTestFn(u *User, data []byte) error {
+	return easyjson.Unmarshal(data, u)
+}
+
+func BenchmarkEasyJSONMarshal(b *testing.B) {
+	doMarshalBenchmark(b, easyJSONMarshalTestFn)
+}
+
+func BenchmarkEasyJSONUnmarshal(b *testing.B) {
+	doUnmarshalBenchmark(b, easyJSONUnmarshalTestFn)
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Package sharedtest contains test helpers that may be used in unit tests and/or benchmarks for`
	`2`	`+// multiple packages in go-sdk-common. It should not import any go-sdk-common packages except ldvalue.`
	`3`	`+package sharedtest`