From 1155ed31d6c730acbade1eb0d8c4fac021dd20a6 Mon Sep 17 00:00:00 2001
From: Brandon Sprague <brandon00sprague@gmail.com>
Date: Sat, 6 May 2023 11:49:45 -0700
Subject: [PATCH] Introduce Str + Strs generic string helpers (#1281)

---
 exp/zapfield/zapfield.go      | 46 +++++++++++++++++++
 exp/zapfield/zapfield_test.go | 84 +++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 exp/zapfield/zapfield.go
 create mode 100644 exp/zapfield/zapfield_test.go

diff --git a/exp/zapfield/zapfield.go b/exp/zapfield/zapfield.go
new file mode 100644
index 000000000..729082498
--- /dev/null
+++ b/exp/zapfield/zapfield.go
@@ -0,0 +1,46 @@
+// Copyright (c) 2016-2023 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+// Package zapfield provides experimental zap.Field helpers whose APIs may be unstable.
+package zapfield
+
+import (
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+// Str constructs a field with the given string-like key and value.
+func Str[K ~string, V ~string](k K, v V) zap.Field {
+	return zap.String(string(k), string(v))
+}
+
+type stringArray[T ~string] []T
+
+func (a stringArray[T]) MarshalLogArray(enc zapcore.ArrayEncoder) error {
+	for i := range a {
+		enc.AppendString(string(a[i]))
+	}
+	return nil
+}
+
+// Strs constructs a field that carries a slice of string-like values.
+func Strs[K ~string, V ~[]S, S ~string](k K, v V) zap.Field {
+	return zap.Array(string(k), stringArray[S](v))
+}
diff --git a/exp/zapfield/zapfield_test.go b/exp/zapfield/zapfield_test.go
new file mode 100644
index 000000000..5ca0f00d3
--- /dev/null
+++ b/exp/zapfield/zapfield_test.go
@@ -0,0 +1,84 @@
+// Copyright (c) 2016-2023 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package zapfield
+
+import (
+	"sync"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+type (
+	MyKey    string
+	MyValue  string
+	MyValues []MyValue
+)
+
+func TestFieldConstructors(t *testing.T) {
+	var (
+		key    = MyKey("test key")
+		value  = MyValue("test value")
+		values = []MyValue{
+			MyValue("test value 1"),
+			MyValue("test value 2"),
+		}
+	)
+
+	tests := []struct {
+		name   string
+		field  zap.Field
+		expect zap.Field
+	}{
+		{"Str", zap.Field{Type: zapcore.StringType, Key: "test key", String: "test value"}, Str(key, value)},
+		{"Strs", zap.Array("test key", stringArray[MyValue]{"test value 1", "test value 2"}), Strs(key, values)},
+	}
+
+	for _, tt := range tests {
+		if !assert.Equal(t, tt.expect, tt.field, "Unexpected output from convenience field constructor %s.", tt.name) {
+			t.Logf("type expected: %T\nGot: %T", tt.expect.Interface, tt.field.Interface)
+		}
+		assertCanBeReused(t, tt.field)
+	}
+
+}
+
+func assertCanBeReused(t testing.TB, field zap.Field) {
+	var wg sync.WaitGroup
+
+	for i := 0; i < 100; i++ {
+		enc := zapcore.NewMapObjectEncoder()
+
+		// Ensure using the field in multiple encoders in separate goroutines
+		// does not cause any races or panics.
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			assert.NotPanics(t, func() {
+				field.AddTo(enc)
+			}, "Reusing a field should not cause issues")
+		}()
+	}
+
+	wg.Wait()
+}