Update grpc to v1.66.0 and switch to CodecV2

cmd/es-index-cleaner/README.md

@@ -1,8 +1,8 @@
-# es-index-cleaner
+# jaeger-es-index-cleaner
 
 It is common to only keep observability data for a limited time.
 However, Elasticsearch does no support expiring of old data via TTL.
-To help with this task, `es-index-cleaner` can be used to purge
+To help with this task, `jaeger-es-index-cleaner` can be used to purge
 old Jaeger indices. For example, to delete indixes older than 14 days:
 
 ```

go.mod

@@ -90,7 +90,7 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/net v0.28.0
 	golang.org/x/sys v0.24.0
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.66.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -109,8 +109,8 @@ github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=
-github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0=
+github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 h1:IgJPqnrlY2Mr4pYB6oaMKvFvwJ9H+X6CCY5x1vCTcpc=
+github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155/go.mod h1:5Wkq+JduFtdAXihLmeTJf+tRYIT4KBc2vPXDhwVo1pA=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=
 github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
@@ -438,6 +438,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjL
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -838,8 +840,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
-google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
+google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

pkg/gogocodec/codec.go

@@ -11,14 +11,15 @@ import (
 	gogoproto "github.com/gogo/protobuf/proto"
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
+	"google.golang.org/grpc/mem"
 )
 
 const (
 	jaegerProtoGenPkgPath = "github.com/jaegertracing/jaeger/proto-gen"
 	jaegerModelPkgPath    = "github.com/jaegertracing/jaeger/model"
 )
 
-var defaultCodec encoding.Codec
+var defaultCodec encoding.CodecV2
 
 // CustomType is an interface that Gogo expects custom types to implement.
 // https://github.com/gogo/protobuf/blob/master/custom_types.md
@@ -34,16 +35,16 @@ type CustomType interface {
 }
 
 func init() {
-	defaultCodec = encoding.GetCodec(proto.Name)
+	defaultCodec = encoding.GetCodecV2(proto.Name)
 	defaultCodec.Name() // ensure it's not nil
-	encoding.RegisterCodec(newCodec())
+	encoding.RegisterCodecV2(newCodec())
 }
 
 // gogoCodec forces the use of gogo proto marshalling/unmarshalling for
 // Jaeger proto types (package jaeger/gen-proto).
 type gogoCodec struct{}
 
-var _ encoding.Codec = (*gogoCodec)(nil)
+var _ encoding.CodecV2 = (*gogoCodec)(nil)
 
 func newCodec() *gogoCodec {
 	return &gogoCodec{}
@@ -55,23 +56,24 @@ func (*gogoCodec) Name() string {
 }
 
 // Marshal implements encoding.Codec
-func (*gogoCodec) Marshal(v any) ([]byte, error) {
+func (*gogoCodec) Marshal(v any) (mem.BufferSlice, error) {
 	t := reflect.TypeOf(v)
 	elem := t.Elem()
 	// use gogo proto only for Jaeger types
 	if useGogo(elem) {
-		return gogoproto.Marshal(v.(gogoproto.Message))
+		bytes, err := gogoproto.Marshal(v.(gogoproto.Message))
+		return mem.BufferSlice{mem.SliceBuffer(bytes)}, err
 	}
 	return defaultCodec.Marshal(v)
 }
 
 // Unmarshal implements encoding.Codec
-func (*gogoCodec) Unmarshal(data []byte, v any) error {
+func (*gogoCodec) Unmarshal(data mem.BufferSlice, v any) error {
 	t := reflect.TypeOf(v)
 	elem := t.Elem() // only for collections
 	// use gogo proto only for Jaeger types
 	if useGogo(elem) {
-		return gogoproto.Unmarshal(data, v.(gogoproto.Message))
+		return gogoproto.Unmarshal(data.Materialize(), v.(gogoproto.Message))
 	}
 	return defaultCodec.Unmarshal(data, v)
 }

pkg/gogocodec/codec_test.go

@@ -4,11 +4,14 @@
 package gogocodec
 
 import (
+	"os"
 	"reflect"
 	"testing"
 
+	"github.com/gogo/protobuf/jsonpb"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/mem"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -54,14 +57,14 @@ func TestWireCompatibility(t *testing.T) {
 	require.NoError(t, err)
 
 	var goprotoMessage emptypb.Empty
-	err = proto.Unmarshal(data, &goprotoMessage)
+	err = proto.Unmarshal(data.Materialize(), &goprotoMessage)
 	require.NoError(t, err)
 
 	data2, err := proto.Marshal(&goprotoMessage)
 	require.NoError(t, err)
 
 	s2 := &model.Span{}
-	err = c.Unmarshal(data2, s2)
+	err = c.Unmarshal(mem.BufferSlice{mem.SliceBuffer(data2)}, s2)
 	require.NoError(t, err)
 	assert.Equal(t, s1, s2)
 }
@@ -73,6 +76,33 @@ func TestUseGogo(t *testing.T) {
 	assert.True(t, useGogo(reflect.TypeOf(span)))
 }
 
+func BenchmarkCodecUnmarshal25Spans(b *testing.B) {
+	const fileName = "../../model/converter/thrift/jaeger/fixtures/domain_01.json"
+	jsonFile, err := os.Open(fileName)
+	require.NoError(b, err, "Failed to open json fixture file %s", fileName)
+	var trace model.Trace
+	require.NoError(b, jsonpb.Unmarshal(jsonFile, &trace), fileName)
+	require.NotEmpty(b, trace.Spans)
+	spans := make([]*model.Span, 25)
+	for i := 0; i < len(spans); i++ {
+		spans[i] = trace.Spans[0]
+	}
+	trace.Spans = spans
+	c := newCodec()
+	bytes, err := c.Marshal(&trace)
+	require.NoError(b, err)
+
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		var trace model.Trace
+		err := c.Unmarshal(bytes, &trace)
+		if err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
 func TestMain(m *testing.M) {
 	testutils.VerifyGoLeaks(m)
 }