Merge branch 'main' into generalized-monitoring-extraction

Author: silaslenihan

pkg/codec/element_extractor.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"reflect"
+	"slices"
 	"strings"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
@@ -134,6 +135,12 @@ func expandMap(extractMap map[string]any, key string, _ *ElementExtractorLocatio
 	}
 
 	rItem := reflect.ValueOf(item)
+	// Must be one of these Kinds to check IsNil, this check is not same as item == nil check.
+	if slices.Contains([]reflect.Kind{reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Pointer, reflect.Slice}, rItem.Kind()) && rItem.IsNil() {
+		extractMap[key] = reflect.MakeSlice(reflect.SliceOf(rItem.Type()), 0, 0).Interface()
+		return nil
+	}
+
 	slice := reflect.MakeSlice(reflect.SliceOf(rItem.Type()), 1, 1)
 	slice.Index(0).Set(rItem)
 	extractMap[key] = slice.Interface()

pkg/codec/element_extractor_test.go

@@ -26,6 +26,13 @@ func TestElementExtractor(t *testing.T) {
 		D uint64
 	}
 
+	type nilFields struct {
+		A *int64
+		B string
+		C *testStruct
+		D []testStruct
+	}
+
 	type nestedTestStruct struct {
 		A string
 		B testStruct
@@ -131,6 +138,27 @@ func TestElementExtractor(t *testing.T) {
 		assert.Equal(t, iInput.Interface(), newInput)
 	})
 
+	t.Run("TransformToOnChain and TransformToOffChain works on nil ptr by initialising empty values", func(t *testing.T) {
+		inputType, err := extractor.RetypeToOffChain(reflect.TypeOf(nilFields{}), "")
+		require.NoError(t, err)
+
+		iInput := reflect.Indirect(reflect.New(inputType))
+		output, err := extractor.TransformToOnChain(iInput.Interface(), "")
+		require.NoError(t, err)
+
+		expected := nilFields{}
+		assert.Equal(t, expected, output)
+
+		newInput, err := extractor.TransformToOffChain(expected, "")
+		require.NoError(t, err)
+
+		// Lossy modification
+		iInput.FieldByName("A").Set(reflect.ValueOf([]*int64{}))
+		iInput.FieldByName("C").Set(reflect.ValueOf([]*testStruct{}))
+		iInput.FieldByName("D").Set(reflect.ValueOf([][]testStruct{}))
+		assert.Equal(t, iInput.Interface(), newInput)
+	})
+
 	t.Run("TransformToOnChain and TransformToOffChain returns error if input type was not from TransformToOnChain", func(t *testing.T) {
 		_, err := invalidExtractor.TransformToOnChain(testStruct{}, "")
 		assert.True(t, errors.Is(err, types.ErrInvalidType))

pkg/utils/retry/retry.go

@@ -12,7 +12,9 @@ import (
 )
 
 // CtxKeyTracingID is the context key for tracing ID
-const CtxKeyTracingID = "tracingID"
+type ctxKey string
+
+const CtxKeyTracingID string = "tracingID"
 
 // Exponential backoff (default) is used to handle retries with increasing wait times in case of errors
 var BackoffStrategyDefault = backoff.Backoff{