[chore] Change to use wrapper of jsoniter.Iterator to simplify ReadXYZ calls (#13498)

This is a preparation to auto-generate the UnmarshalJSON using pdatagen.
By doing this we simplify to have all funcs on the Iterator and not
having some on the json package some on the Iterator.

Also, this is less error prune since it forces that all numbers are
correctly handle the string option.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

Author: bogdandrutu

internal/cmd/pdatagen/internal/templates/message_test.go.tmpl

@@ -46,7 +46,7 @@ func Test{{ .structName }}_MarshalAndUnmarshalJSON(t *testing.T) {
 	{{- else }}
 	src.marshalJSONStream(stream)
 	{{- end }}
-	require.NoError(t, stream.Error)
+	require.NoError(t, stream.Error())
 
 	iter := json.BorrowIterator(stream.Buffer())
 	defer json.ReturnIterator(iter)
@@ -56,7 +56,7 @@ func Test{{ .structName }}_MarshalAndUnmarshalJSON(t *testing.T) {
 	{{- else }}
 	dest.unmarshalJSONIter(iter)
 	{{- end }}
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 
 	assert.Equal(t, src, dest)
 }

pdata/internal/data/bytesid.go

@@ -6,12 +6,12 @@ package data // import "go.opentelemetry.io/collector/pdata/internal/data"
 import (
 	"encoding/hex"
 
-	jsoniter "github.com/json-iterator/go"
+	"go.opentelemetry.io/collector/pdata/internal/json"
 )
 
 // unmarshalJSON inflates trace id from hex string, possibly enclosed in quotes.
 // Called by Protobuf JSON deserialization.
-func unmarshalJSON(dst []byte, iter *jsoniter.Iterator) {
+func unmarshalJSON(dst []byte, iter *json.Iterator) {
 	src := iter.ReadStringAsSlice()
 	if len(src) == 0 {
 		return

pdata/internal/data/bytesid_test.go

@@ -18,23 +18,23 @@ func TestUnmarshalJSON(t *testing.T) {
 
 	id := [16]byte{}
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`""`)))
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 	assert.Equal(t, [16]byte{}, id)
 
 	idBytes := [16]byte{0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78}
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`"12345678123456781234567812345678"`)))
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 	assert.Equal(t, idBytes, id)
 
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`"nothex"`)))
-	require.Error(t, iter.Error)
+	require.Error(t, iter.Error())
 
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`"1"`)))
-	require.Error(t, iter.Error)
+	require.Error(t, iter.Error())
 
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`"123"`)))
-	require.Error(t, iter.Error)
+	require.Error(t, iter.Error())
 
 	unmarshalJSON(id[:], iter.ResetBytes([]byte(`"`)))
-	require.Error(t, iter.Error)
+	require.Error(t, iter.Error())
 }

pdata/internal/data/profileid.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	jsoniter "github.com/json-iterator/go"
 
 	"go.opentelemetry.io/collector/pdata/internal/json"
 )
@@ -73,7 +72,7 @@ func (tid ProfileID) MarshalJSONStream(dest *json.Stream) {
 }
 
 // UnmarshalJSONIter decodes ProfileID from hex string.
-func (tid *ProfileID) UnmarshalJSONIter(iter *jsoniter.Iterator) {
+func (tid *ProfileID) UnmarshalJSONIter(iter *json.Iterator) {
 	*tid = [profileIDSize]byte{}
 	unmarshalJSON(tid[:], iter)
 }

pdata/internal/data/profileid_test.go

@@ -63,13 +63,13 @@ func TestProfileIDMarshalAndUnmarshalJSON(t *testing.T) {
 	defer json.ReturnStream(stream)
 	src := ProfileID([16]byte{0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78})
 	src.MarshalJSONStream(stream)
-	require.NoError(t, stream.Error)
+	require.NoError(t, stream.Error())
 
 	iter := json.BorrowIterator(stream.Buffer())
 	defer json.ReturnIterator(iter)
 	dest := ProfileID{}
 	dest.UnmarshalJSONIter(iter)
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 
 	assert.Equal(t, src, dest)
 }

pdata/internal/data/spanid.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	jsoniter "github.com/json-iterator/go"
 
 	"go.opentelemetry.io/collector/pdata/internal/json"
 )
@@ -73,7 +72,7 @@ func (sid SpanID) MarshalJSONStream(dest *json.Stream) {
 }
 
 // UnmarshalJSONIter decodes SpanID from hex string.
-func (sid *SpanID) UnmarshalJSONIter(iter *jsoniter.Iterator) {
+func (sid *SpanID) UnmarshalJSONIter(iter *json.Iterator) {
 	*sid = [spanIDSize]byte{}
 	unmarshalJSON(sid[:], iter)
 }

pdata/internal/data/spanid_test.go

@@ -66,13 +66,13 @@ func TestSpanIDMarshalAndUnmarshalJSON(t *testing.T) {
 	defer json.ReturnStream(stream)
 	src := SpanID([8]byte{0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78})
 	src.MarshalJSONStream(stream)
-	require.NoError(t, stream.Error)
+	require.NoError(t, stream.Error())
 
 	iter := json.BorrowIterator(stream.Buffer())
 	defer json.ReturnIterator(iter)
 	dest := SpanID{}
 	dest.UnmarshalJSONIter(iter)
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 
 	assert.Equal(t, src, dest)
 }

pdata/internal/data/traceid.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	jsoniter "github.com/json-iterator/go"
 
 	"go.opentelemetry.io/collector/pdata/internal/json"
 )
@@ -73,7 +72,7 @@ func (tid TraceID) MarshalJSONStream(dest *json.Stream) {
 }
 
 // UnmarshalJSONIter decodes TraceID from hex string.
-func (tid *TraceID) UnmarshalJSONIter(iter *jsoniter.Iterator) {
+func (tid *TraceID) UnmarshalJSONIter(iter *json.Iterator) {
 	*tid = [profileIDSize]byte{}
 	unmarshalJSON(tid[:], iter)
 }

pdata/internal/data/traceid_test.go

@@ -63,13 +63,13 @@ func TestTraceIDMarshalAndUnmarshalJSON(t *testing.T) {
 	defer json.ReturnStream(stream)
 	src := TraceID([16]byte{0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78, 0x12, 0x34, 0x56, 0x78})
 	src.MarshalJSONStream(stream)
-	require.NoError(t, stream.Error)
+	require.NoError(t, stream.Error())
 
 	iter := json.BorrowIterator(stream.Buffer())
 	defer json.ReturnIterator(iter)
 	dest := TraceID{}
 	dest.UnmarshalJSONIter(iter)
-	require.NoError(t, iter.Error)
+	require.NoError(t, iter.Error())
 
 	assert.Equal(t, src, dest)
 }