Merge branch '3.7-dev'

CHANGELOG.asciidoc

@@ -63,6 +63,7 @@ This release also includes changes from <<release-3-6-8, 3.6.8>>.
 * Fixed so that `TrimGlobalStep` and `TrimLocalStep` have the same character control handling as `Ltrim` and `Rtrim`
 * Fix a bug in `MaxLocalStep`, `MinLocalStep`, `MeanLocalStep` and `SumLocalStep` that it throws `NoSuchElementException` when encounters an empty iterator as input.
 * Fix cases where Map keys of incomparable types could panic in `gremlin-go`.
+* Fixed an issue where missing necessary parameters for logging, resulting in '%!x(MISSING)' output in `gremlin-go`.
 * Added getter method to `ConcatStep`, `ConjoinStep`, `SplitGlobalStep` and `SplitLocalStep` for their private fields.
 
 [[release-3-7-2]]

gremlin-go/driver/graphBinary.go

@@ -1009,7 +1009,7 @@ func readMapUnqualified(data *[]byte, i *int) (interface{}, error) {
 	for j := uint32(0); j < sz; j++ {
 		keyDataType := readDataType(data, i)
 		if keyDataType != stringType {
-			return nil, newError(err0703ReadMapNonStringKeyError)
+			return nil, newError(err0703ReadMapNonStringKeyError, keyDataType)
 		}
 
 		// Skip nullable, key must be present

gremlin-go/driver/graphBinary_test.go

@@ -320,7 +320,7 @@ func TestGraphBinaryV1(t *testing.T) {
 			buff := []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01}
 			m, err := readMapUnqualified(&buff, &i)
 			assert.Nil(t, m)
-			assert.Equal(t, newError(err0703ReadMapNonStringKeyError), err)
+			assert.Equal(t, newError(err0703ReadMapNonStringKeyError, intType), err)
 		})
 	})
 }