fix(deps): update module github.com/golangci/golangci-lint to v1.60.2 (#6008)

renovate[bot] · MrAlias · dmathieu · web-flow · commit fd2862021f8c · 2024-08-23T08:07:56.000-07:00
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/golangci/golangci-lint](https://togithub.com/golangci/golangci-lint) | `v1.60.1` -> `v1.60.2` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgolangci%2fgolangci-lint/v1.60.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgolangci%2fgolangci-lint/v1.60.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgolangci%2fgolangci-lint/v1.60.1/v1.60.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgolangci%2fgolangci-lint/v1.60.1/v1.60.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>golangci/golangci-lint (github.com/golangci/golangci-lint)</summary> ### [`v1.60.2`](https://togithub.com/golangci/golangci-lint/compare/v1.60.1...v1.60.2) [Compare Source](https://togithub.com/golangci/golangci-lint/compare/v1.60.1...v1.60.2) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-go-contrib).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tyler Yahn <codingalias@gmail.com> Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> Co-authored-by: Damien Mathieu <42@dmathieu.com>
diff --git a/bridges/otelslog/handler.go b/bridges/otelslog/handler.go
@@ -425,7 +425,12 @@ func convertValue(v slog.Value) log.Value {
 	case slog.KindTime:
 		return log.Int64Value(v.Time().UnixNano())
 	case slog.KindUint64:
-		return log.Int64Value(int64(v.Uint64()))
+		const maxInt64 = ^uint64(0) >> 1
+		u := v.Uint64()
+		if u > maxInt64 {
+			return log.Float64Value(float64(u))
+		}
+		return log.Int64Value(int64(u)) // nolint:gosec  // Overflow checked above.
 	case slog.KindGroup:
 		g := v.Group()
 		buf := newKVBuffer(len(g))
diff --git a/bridges/otelzap/encoder.go b/bridges/otelzap/encoder.go
@@ -175,7 +175,7 @@ func (m *objectEncoder) AddUint16(k string, v uint16) {
 }
 
 func (m *objectEncoder) AddUint8(k string, v uint8) {
-	m.AddInt64(k, int64(v))
+	m.AddInt64(k, int64(v)) // nolint: gosec  // https://github.com/securego/gosec/issues/1185
 }
 
 func (m *objectEncoder) AddUintptr(k string, v uintptr) {
@@ -187,7 +187,7 @@ func assignUintValue(v uint64) log.Value {
 	if v > maxInt64 {
 		return log.Float64Value(float64(v))
 	}
-	return log.Int64Value(int64(v))
+	return log.Int64Value(int64(v)) // nolint:gosec  // Overflow checked above.
 }
 
 // arrayEncoder implements [zapcore.ArrayEncoder].
@@ -272,8 +272,10 @@ func (a *arrayEncoder) AppendTime(v time.Time)         { a.AppendInt64(v.UnixNan
 func (a *arrayEncoder) AppendUint(v uint)              { a.AppendUint64(uint64(v)) }
 func (a *arrayEncoder) AppendUint32(v uint32)          { a.AppendInt64(int64(v)) }
 func (a *arrayEncoder) AppendUint16(v uint16)          { a.AppendInt64(int64(v)) }
-func (a *arrayEncoder) AppendUint8(v uint8)            { a.AppendInt64(int64(v)) }
 func (a *arrayEncoder) AppendUintptr(v uintptr)        { a.AppendUint64(uint64(v)) }
+func (a *arrayEncoder) AppendUint8(v uint8) {
+	a.AppendInt64(int64(v)) // nolint: gosec  // https://github.com/securego/gosec/issues/1185
+}
 
 func convertValue(v interface{}) log.Value {
 	switch v := v.(type) {
diff --git a/bridges/prometheus/producer.go b/bridges/prometheus/producer.go
@@ -214,10 +214,10 @@ func convertExponentialBuckets(bucketSpans []*dto.BucketSpan, deltas []int64) me
 	initialOffset := bucketSpans[0].GetOffset() - 1
 	// We will have one bucket count for each delta, and zeros for the offsets
 	// after the initial offset.
-	lenCounts := int32(len(deltas))
+	lenCounts := len(deltas)
 	for i, bs := range bucketSpans {
 		if i != 0 {
-			lenCounts += bs.GetOffset()
+			lenCounts += int(bs.GetOffset())
 		}
 	}
 	counts := make([]uint64, lenCounts)
diff --git a/config/metric.go b/config/metric.go
@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"math"
 	"net"
 	"net/http"
 	"net/url"
@@ -358,8 +359,8 @@ func aggregation(aggr *ViewStreamAggregation) sdkmetric.Aggregation {
 
 	if aggr.Base2ExponentialBucketHistogram != nil {
 		return sdkmetric.AggregationBase2ExponentialHistogram{
-			MaxSize:  int32(intOrZero(aggr.Base2ExponentialBucketHistogram.MaxSize)),
-			MaxScale: int32(intOrZero(aggr.Base2ExponentialBucketHistogram.MaxScale)),
+			MaxSize:  int32OrZero(aggr.Base2ExponentialBucketHistogram.MaxSize),
+			MaxScale: int32OrZero(aggr.Base2ExponentialBucketHistogram.MaxScale),
 			// Need to negate because config has the positive action RecordMinMax.
 			NoMinMax: !boolOrFalse(aggr.Base2ExponentialBucketHistogram.RecordMinMax),
 		}
@@ -426,11 +427,18 @@ func boolOrFalse(pBool *bool) bool {
 	return *pBool
 }
 
-func intOrZero(pInt *int) int {
+func int32OrZero(pInt *int) int32 {
 	if pInt == nil {
 		return 0
 	}
-	return *pInt
+	i := *pInt
+	if i > math.MaxInt32 {
+		return math.MaxInt32
+	}
+	if i < math.MinInt32 {
+		return math.MinInt32
+	}
+	return int32(i) // nolint: gosec  // Overflow and underflow checked above.
 }
 
 func strOrEmpty(pStr *string) string {
diff --git a/config/resource.go b/config/resource.go
@@ -23,7 +23,7 @@ func keyVal(k string, v any) attribute.KeyValue {
 	case int8:
 		return attribute.Int64(k, int64(val))
 	case uint8:
-		return attribute.Int64(k, int64(val))
+		return attribute.Int64(k, int64(val)) // nolint: gosec  // https://github.com/securego/gosec/issues/1185
 	case int16:
 		return attribute.Int64(k, int64(val))
 	case uint16:
diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/internal/semconvutil/netconv.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil/netconv.go b/instrumentation/github.com/gin-gonic/gin/otelgin/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/github.com/gorilla/mux/otelmux/internal/semconvutil/netconv.go b/instrumentation/github.com/gorilla/mux/otelmux/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil/netconv.go b/instrumentation/github.com/labstack/echo/otelecho/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/internal/test/test_utils.go b/instrumentation/google.golang.org/grpc/otelgrpc/internal/test/test_utils.go
@@ -44,12 +44,12 @@ import (
 )
 
 var (
-	reqSizes            = []int{27182, 8, 1828, 45904}
-	respSizes           = []int{31415, 9, 2653, 58979}
-	largeReqSize        = 271828
-	largeRespSize       = 314159
-	initialMetadataKey  = "x-grpc-test-echo-initial"
-	trailingMetadataKey = "x-grpc-test-echo-trailing-bin"
+	reqSizes                  = []int32{27182, 8, 1828, 45904}
+	respSizes                 = []int32{31415, 9, 2653, 58979}
+	largeReqSize              = 271828
+	largeRespSize       int32 = 314159
+	initialMetadataKey        = "x-grpc-test-echo-initial"
+	trailingMetadataKey       = "x-grpc-test-echo-trailing-bin"
 
 	logger = grpclog.Component("interop")
 )
@@ -87,7 +87,7 @@ func DoLargeUnaryCall(ctx context.Context, tc testpb.TestServiceClient, args ...
 	pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)
 	req := &testpb.SimpleRequest{
 		ResponseType: testpb.PayloadType_COMPRESSABLE,
-		ResponseSize: int32(largeRespSize),
+		ResponseSize: largeRespSize,
 		Payload:      pl,
 	}
 	reply, err := tc.UnaryCall(ctx, req, args...)
@@ -96,7 +96,7 @@ func DoLargeUnaryCall(ctx context.Context, tc testpb.TestServiceClient, args ...
 	}
 	t := reply.GetPayload().GetType()
 	s := len(reply.GetPayload().GetBody())
-	if t != testpb.PayloadType_COMPRESSABLE || s != largeRespSize {
+	if t != testpb.PayloadType_COMPRESSABLE || s != int(largeRespSize) {
 		logger.Fatalf("Got the reply with type %d len %d; want %d, %d", t, s, testpb.PayloadType_COMPRESSABLE, largeRespSize)
 	}
 }
@@ -107,9 +107,9 @@ func DoClientStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..
 	if err != nil {
 		logger.Fatalf("%v.StreamingInputCall(_) = _, %v", tc, err)
 	}
-	var sum int
+	var sum int32
 	for _, s := range reqSizes {
-		pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, s)
+		pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, int(s))
 		req := &testpb.StreamingInputCallRequest{
 			Payload: pl,
 		}
@@ -122,7 +122,7 @@ func DoClientStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..
 	if err != nil {
 		logger.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)
 	}
-	if reply.GetAggregatedPayloadSize() != int32(sum) {
+	if reply.GetAggregatedPayloadSize() != sum {
 		logger.Fatalf("%v.CloseAndRecv().GetAggregatePayloadSize() = %v; want %v", stream, reply.GetAggregatedPayloadSize(), sum)
 	}
 }
@@ -132,7 +132,7 @@ func DoServerStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..
 	respParam := make([]*testpb.ResponseParameters, len(respSizes))
 	for i, s := range respSizes {
 		respParam[i] = &testpb.ResponseParameters{
-			Size: int32(s),
+			Size: s,
 		}
 	}
 	req := &testpb.StreamingOutputCallRequest{
@@ -157,7 +157,7 @@ func DoServerStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..
 			logger.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
 		}
 		size := len(reply.GetPayload().GetBody())
-		if size != respSizes[index] {
+		if size != int(respSizes[index]) {
 			logger.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
 		}
 		index++
@@ -181,10 +181,10 @@ func DoPingPong(ctx context.Context, tc testpb.TestServiceClient, args ...grpc.C
 	for index < len(reqSizes) {
 		respParam := []*testpb.ResponseParameters{
 			{
-				Size: int32(respSizes[index]),
+				Size: respSizes[index],
 			},
 		}
-		pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, reqSizes[index])
+		pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, int(reqSizes[index]))
 		req := &testpb.StreamingOutputCallRequest{
 			ResponseType:       testpb.PayloadType_COMPRESSABLE,
 			ResponseParameters: respParam,
@@ -202,7 +202,7 @@ func DoPingPong(ctx context.Context, tc testpb.TestServiceClient, args ...grpc.C
 			logger.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)
 		}
 		size := len(reply.GetPayload().GetBody())
-		if size != respSizes[index] {
+		if size != int(respSizes[index]) {
 			logger.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])
 		}
 		index++
@@ -304,19 +304,21 @@ func (s *testServer) StreamingOutputCall(args *testpb.StreamingOutputCallRequest
 }
 
 func (s *testServer) StreamingInputCall(stream testpb.TestService_StreamingInputCallServer) error {
-	var sum int
+	var sum int32
 	for {
 		in, err := stream.Recv()
 		if errors.Is(err, io.EOF) {
 			return stream.SendAndClose(&testpb.StreamingInputCallResponse{
-				AggregatedPayloadSize: int32(sum),
+				AggregatedPayloadSize: sum,
 			})
 		}
 		if err != nil {
 			return err
 		}
-		p := in.GetPayload().GetBody()
-		sum += len(p)
+		n := len(in.GetPayload().GetBody())
+		// This could overflow, but given this is a test and the negative value
+		// should be detectable this should be good enough.
+		sum += int32(n) // nolint: gosec
 	}
 }
 
diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/internal/semconvutil/netconv.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/host/host.go b/instrumentation/host/host.go
@@ -6,6 +6,7 @@ package host // import "go.opentelemetry.io/contrib/instrumentation/host"
 import (
 	"context"
 	"fmt"
+	"math"
 	"os"
 	"sync"
 
@@ -118,7 +119,11 @@ func (h *host) register() error {
 		lock sync.Mutex
 	)
 
-	proc, err := process.NewProcess(int32(os.Getpid()))
+	pid := os.Getpid()
+	if pid > math.MaxInt32 || pid < math.MinInt32 {
+		return fmt.Errorf("invalid process ID: %d", pid)
+	}
+	proc, err := process.NewProcess(int32(pid)) // nolint: gosec  // Overflow checked above.
 	if err != nil {
 		return fmt.Errorf("could not find this process: %w", err)
 	}
@@ -246,9 +251,9 @@ func (h *host) register() error {
 
 			// Host memory usage
 			opt = metric.WithAttributeSet(AttributeMemoryUsed)
-			o.ObserveInt64(hostMemoryUsage, int64(vmStats.Used), opt)
+			o.ObserveInt64(hostMemoryUsage, clampInt64(vmStats.Used), opt)
 			opt = metric.WithAttributeSet(AttributeMemoryAvailable)
-			o.ObserveInt64(hostMemoryUsage, int64(vmStats.Available), opt)
+			o.ObserveInt64(hostMemoryUsage, clampInt64(vmStats.Available), opt)
 
 			// Host memory utilization
 			opt = metric.WithAttributeSet(AttributeMemoryUsed)
@@ -262,9 +267,9 @@ func (h *host) register() error {
 			// interface, with similar questions to those posed
 			// about per-CPU measurements above.
 			opt = metric.WithAttributeSet(AttributeNetworkTransmit)
-			o.ObserveInt64(networkIOUsage, int64(ioStats[0].BytesSent), opt)
+			o.ObserveInt64(networkIOUsage, clampInt64(ioStats[0].BytesSent), opt)
 			opt = metric.WithAttributeSet(AttributeNetworkReceive)
-			o.ObserveInt64(networkIOUsage, int64(ioStats[0].BytesRecv), opt)
+			o.ObserveInt64(networkIOUsage, clampInt64(ioStats[0].BytesRecv), opt)
 
 			return nil
 		},
@@ -280,3 +285,10 @@ func (h *host) register() error {
 
 	return nil
 }
+
+func clampInt64(v uint64) int64 {
+	if v > math.MaxInt64 {
+		return math.MaxInt64
+	}
+	return int64(v) // nolint: gosec  // Overflow checked.
+}
diff --git a/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/netconv.go b/instrumentation/net/http/httptrace/otelhttptrace/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/net/http/otelhttp/internal/semconv/util.go b/instrumentation/net/http/otelhttp/internal/semconv/util.go
@@ -50,7 +50,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Byte size checked 16 above.
 }
 
 func requiredHTTPPort(https bool, port int) int { // nolint:revive
diff --git a/instrumentation/net/http/otelhttp/internal/semconvutil/netconv.go b/instrumentation/net/http/otelhttp/internal/semconvutil/netconv.go
@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {
 	if err != nil {
 		return
 	}
-	return host, int(p)
+	return host, int(p) // nolint: gosec  // Bitsize checked to be 16 above.
 }
 
 func netProtocol(proto string) (name string, version string) {
diff --git a/instrumentation/runtime/internal/deprecatedruntime/runtime.go b/instrumentation/runtime/internal/deprecatedruntime/runtime.go
diff --git a/instrumentation/runtime/runtime.go b/instrumentation/runtime/runtime.go
diff --git a/internal/shared/semconvutil/netconv.go.tmpl b/internal/shared/semconvutil/netconv.go.tmpl
diff --git a/samplers/probability/consistent/base2.go b/samplers/probability/consistent/base2.go
diff --git a/samplers/probability/consistent/sampler.go b/samplers/probability/consistent/sampler.go
diff --git a/tools/go.mod b/tools/go.mod
diff --git a/tools/go.sum b/tools/go.sum

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func (m *objectEncoder) AddUint16(k string, v uint16) {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`func (m *objectEncoder) AddUint8(k string, v uint8) {`
`178`		`- m.AddInt64(k, int64(v))`
	`178`	`+ m.AddInt64(k, int64(v)) // nolint: gosec // https://github.com/securego/gosec/issues/1185`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func (m *objectEncoder) AddUintptr(k string, v uintptr) {`
`@@ -187,7 +187,7 @@ func assignUintValue(v uint64) log.Value {`
`187`	`187`	`if v > maxInt64 {`
`188`	`188`	`return log.Float64Value(float64(v))`
`189`	`189`	`}`
`190`		`- return log.Int64Value(int64(v))`
	`190`	`+ return log.Int64Value(int64(v)) // nolint:gosec // Overflow checked above.`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`// arrayEncoder implements [zapcore.ArrayEncoder].`
`@@ -272,8 +272,10 @@ func (a *arrayEncoder) AppendTime(v time.Time) { a.AppendInt64(v.UnixNan`
`272`	`272`	`func (a *arrayEncoder) AppendUint(v uint) { a.AppendUint64(uint64(v)) }`
`273`	`273`	`func (a *arrayEncoder) AppendUint32(v uint32) { a.AppendInt64(int64(v)) }`
`274`	`274`	`func (a *arrayEncoder) AppendUint16(v uint16) { a.AppendInt64(int64(v)) }`
`275`		`-func (a *arrayEncoder) AppendUint8(v uint8) { a.AppendInt64(int64(v)) }`
`276`	`275`	`func (a *arrayEncoder) AppendUintptr(v uintptr) { a.AppendUint64(uint64(v)) }`
	`276`	`+func (a *arrayEncoder) AppendUint8(v uint8) {`
	`277`	`+ a.AppendInt64(int64(v)) // nolint: gosec // https://github.com/securego/gosec/issues/1185`
	`278`	`+}`
`277`	`279`
`278`	`280`	`func convertValue(v interface{}) log.Value {`
`279`	`281`	`switch v := v.(type) {`
Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,10 @@ func convertExponentialBuckets(bucketSpans []*dto.BucketSpan, deltas []int64) me`
`214`	`214`	`initialOffset := bucketSpans[0].GetOffset() - 1`
`215`	`215`	`// We will have one bucket count for each delta, and zeros for the offsets`
`216`	`216`	`// after the initial offset.`
`217`		`- lenCounts := int32(len(deltas))`
	`217`	`+ lenCounts := len(deltas)`
`218`	`218`	`for i, bs := range bucketSpans {`
`219`	`219`	`if i != 0 {`
`220`		`- lenCounts += bs.GetOffset()`
	`220`	`+ lenCounts += int(bs.GetOffset())`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`counts := make([]uint64, lenCounts)`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func splitHostPort(hostport string) (host string, port int) {`
`195`	`195`	`if err != nil {`
`196`	`196`	`return`
`197`	`197`	`}`
`198`		`- return host, int(p)`
	`198`	`+ return host, int(p) // nolint: gosec // Bitsize checked to be 16 above.`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`func netProtocol(proto string) (name string, version string) {`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ import (`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`var (`
`47`		`- reqSizes = []int{27182, 8, 1828, 45904}`
`48`		`- respSizes = []int{31415, 9, 2653, 58979}`
`49`		`- largeReqSize = 271828`
`50`		`- largeRespSize = 314159`
`51`		`- initialMetadataKey = "x-grpc-test-echo-initial"`
`52`		`- trailingMetadataKey = "x-grpc-test-echo-trailing-bin"`
	`47`	`+ reqSizes = []int32{27182, 8, 1828, 45904}`
	`48`	`+ respSizes = []int32{31415, 9, 2653, 58979}`
	`49`	`+ largeReqSize = 271828`
	`50`	`+ largeRespSize int32 = 314159`
	`51`	`+ initialMetadataKey = "x-grpc-test-echo-initial"`
	`52`	`+ trailingMetadataKey = "x-grpc-test-echo-trailing-bin"`
`53`	`53`
`54`	`54`	`logger = grpclog.Component("interop")`
`55`	`55`	`)`
`@@ -87,7 +87,7 @@ func DoLargeUnaryCall(ctx context.Context, tc testpb.TestServiceClient, args ...`
`87`	`87`	`pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, largeReqSize)`
`88`	`88`	`req := &testpb.SimpleRequest{`
`89`	`89`	`ResponseType: testpb.PayloadType_COMPRESSABLE,`
`90`		`- ResponseSize: int32(largeRespSize),`
	`90`	`+ ResponseSize: largeRespSize,`
`91`	`91`	`Payload: pl,`
`92`	`92`	`}`
`93`	`93`	`reply, err := tc.UnaryCall(ctx, req, args...)`
`@@ -96,7 +96,7 @@ func DoLargeUnaryCall(ctx context.Context, tc testpb.TestServiceClient, args ...`
`96`	`96`	`}`
`97`	`97`	`t := reply.GetPayload().GetType()`
`98`	`98`	`s := len(reply.GetPayload().GetBody())`
`99`		`- if t != testpb.PayloadType_COMPRESSABLE \|\| s != largeRespSize {`
	`99`	`+ if t != testpb.PayloadType_COMPRESSABLE \|\| s != int(largeRespSize) {`
`100`	`100`	`logger.Fatalf("Got the reply with type %d len %d; want %d, %d", t, s, testpb.PayloadType_COMPRESSABLE, largeRespSize)`
`101`	`101`	`}`
`102`	`102`	`}`
`@@ -107,9 +107,9 @@ func DoClientStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..`
`107`	`107`	`if err != nil {`
`108`	`108`	`logger.Fatalf("%v.StreamingInputCall(_) = _, %v", tc, err)`
`109`	`109`	`}`
`110`		`- var sum int`
	`110`	`+ var sum int32`
`111`	`111`	`for _, s := range reqSizes {`
`112`		`- pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, s)`
	`112`	`+ pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, int(s))`
`113`	`113`	`req := &testpb.StreamingInputCallRequest{`
`114`	`114`	`Payload: pl,`
`115`	`115`	`}`
`@@ -122,7 +122,7 @@ func DoClientStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..`
`122`	`122`	`if err != nil {`
`123`	`123`	`logger.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)`
`124`	`124`	`}`
`125`		`- if reply.GetAggregatedPayloadSize() != int32(sum) {`
	`125`	`+ if reply.GetAggregatedPayloadSize() != sum {`
`126`	`126`	`logger.Fatalf("%v.CloseAndRecv().GetAggregatePayloadSize() = %v; want %v", stream, reply.GetAggregatedPayloadSize(), sum)`
`127`	`127`	`}`
`128`	`128`	`}`
`@@ -132,7 +132,7 @@ func DoServerStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..`
`132`	`132`	`respParam := make([]*testpb.ResponseParameters, len(respSizes))`
`133`	`133`	`for i, s := range respSizes {`
`134`	`134`	`respParam[i] = &testpb.ResponseParameters{`
`135`		`- Size: int32(s),`
	`135`	`+ Size: s,`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`req := &testpb.StreamingOutputCallRequest{`
`@@ -157,7 +157,7 @@ func DoServerStreaming(ctx context.Context, tc testpb.TestServiceClient, args ..`
`157`	`157`	`logger.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)`
`158`	`158`	`}`
`159`	`159`	`size := len(reply.GetPayload().GetBody())`
`160`		`- if size != respSizes[index] {`
	`160`	`+ if size != int(respSizes[index]) {`
`161`	`161`	`logger.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])`
`162`	`162`	`}`
`163`	`163`	`index++`
`@@ -181,10 +181,10 @@ func DoPingPong(ctx context.Context, tc testpb.TestServiceClient, args ...grpc.C`
`181`	`181`	`for index < len(reqSizes) {`
`182`	`182`	`respParam := []*testpb.ResponseParameters{`
`183`	`183`	`{`
`184`		`- Size: int32(respSizes[index]),`
	`184`	`+ Size: respSizes[index],`
`185`	`185`	`},`
`186`	`186`	`}`
`187`		`- pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, reqSizes[index])`
	`187`	`+ pl := ClientNewPayload(testpb.PayloadType_COMPRESSABLE, int(reqSizes[index]))`
`188`	`188`	`req := &testpb.StreamingOutputCallRequest{`
`189`	`189`	`ResponseType: testpb.PayloadType_COMPRESSABLE,`
`190`	`190`	`ResponseParameters: respParam,`
`@@ -202,7 +202,7 @@ func DoPingPong(ctx context.Context, tc testpb.TestServiceClient, args ...grpc.C`
`202`	`202`	`logger.Fatalf("Got the reply of type %d, want %d", t, testpb.PayloadType_COMPRESSABLE)`
`203`	`203`	`}`
`204`	`204`	`size := len(reply.GetPayload().GetBody())`
`205`		`- if size != respSizes[index] {`
	`205`	`+ if size != int(respSizes[index]) {`
`206`	`206`	`logger.Fatalf("Got reply body of length %d, want %d", size, respSizes[index])`
`207`	`207`	`}`
`208`	`208`	`index++`
`@@ -304,19 +304,21 @@ func (s testServer) StreamingOutputCall(args testpb.StreamingOutputCallRequest`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`func (s *testServer) StreamingInputCall(stream testpb.TestService_StreamingInputCallServer) error {`
`307`		`- var sum int`
	`307`	`+ var sum int32`
`308`	`308`	`for {`
`309`	`309`	`in, err := stream.Recv()`
`310`	`310`	`if errors.Is(err, io.EOF) {`
`311`	`311`	`return stream.SendAndClose(&testpb.StreamingInputCallResponse{`
`312`		`- AggregatedPayloadSize: int32(sum),`
	`312`	`+ AggregatedPayloadSize: sum,`
`313`	`313`	`})`
`314`	`314`	`}`
`315`	`315`	`if err != nil {`
`316`	`316`	`return err`
`317`	`317`	`}`
`318`		`- p := in.GetPayload().GetBody()`
`319`		`- sum += len(p)`
	`318`	`+ n := len(in.GetPayload().GetBody())`
	`319`	`+ // This could overflow, but given this is a test and the negative value`
	`320`	`+ // should be detectable this should be good enough.`
	`321`	`+ sum += int32(n) // nolint: gosec`
`320`	`322`	`}`
`321`	`323`	`}`
`322`	`324`