From 42dd7ac9d9dfb163e922fe5236c6cef59967ed1d Mon Sep 17 00:00:00 2001
From: ulas <45449532+ulascansenturk@users.noreply.github.com>
Date: Thu, 30 Mar 2023 03:04:12 +0300
Subject: [PATCH] Use anypb.New instead of ptypes.MarshalAny (#6074)

---
 channelz/service/func_linux.go | 9 +++++----
 channelz/service/service.go    | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/channelz/service/func_linux.go b/channelz/service/func_linux.go
index ae759aa74..0873603c8 100644
--- a/channelz/service/func_linux.go
+++ b/channelz/service/func_linux.go
@@ -25,6 +25,7 @@ import (
 	durpb "github.com/golang/protobuf/ptypes/duration"
 	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
 	"google.golang.org/grpc/internal/channelz"
+	"google.golang.org/protobuf/types/known/anypb"
 )
 
 func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
@@ -34,7 +35,7 @@ func convertToPtypesDuration(sec int64, usec int64) *durpb.Duration {
 func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOption {
 	var opts []*channelzpb.SocketOption
 	if skopts.Linger != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionLinger{
+		additional, err := anypb.New(&channelzpb.SocketOptionLinger{
 			Active:   skopts.Linger.Onoff != 0,
 			Duration: convertToPtypesDuration(int64(skopts.Linger.Linger), 0),
 		})
@@ -48,7 +49,7 @@ func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOptio
 		}
 	}
 	if skopts.RecvTimeout != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
+		additional, err := anypb.New(&channelzpb.SocketOptionTimeout{
 			Duration: convertToPtypesDuration(int64(skopts.RecvTimeout.Sec), int64(skopts.RecvTimeout.Usec)),
 		})
 		if err == nil {
@@ -61,7 +62,7 @@ func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOptio
 		}
 	}
 	if skopts.SendTimeout != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTimeout{
+		additional, err := anypb.New(&channelzpb.SocketOptionTimeout{
 			Duration: convertToPtypesDuration(int64(skopts.SendTimeout.Sec), int64(skopts.SendTimeout.Usec)),
 		})
 		if err == nil {
@@ -74,7 +75,7 @@ func sockoptToProto(skopts *channelz.SocketOptionData) []*channelzpb.SocketOptio
 		}
 	}
 	if skopts.TCPInfo != nil {
-		additional, err := ptypes.MarshalAny(&channelzpb.SocketOptionTcpInfo{
+		additional, err := anypb.New(&channelzpb.SocketOptionTcpInfo{
 			TcpiState:       uint32(skopts.TCPInfo.State),
 			TcpiCaState:     uint32(skopts.TCPInfo.Ca_state),
 			TcpiRetransmits: uint32(skopts.TCPInfo.Retransmits),
diff --git a/channelz/service/service.go b/channelz/service/service.go
index 9e325376f..ae19ed379 100644
--- a/channelz/service/service.go
+++ b/channelz/service/service.go
@@ -25,15 +25,18 @@ import (
 
 	"github.com/golang/protobuf/ptypes"
 	wrpb "github.com/golang/protobuf/ptypes/wrappers"
-	"google.golang.org/grpc"
 	channelzgrpc "google.golang.org/grpc/channelz/grpc_channelz_v1"
 	channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
+
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/internal/channelz"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/protoadapt"
+	"google.golang.org/protobuf/types/known/anypb"
 )
 
 func init() {
@@ -187,7 +190,7 @@ func securityToProto(se credentials.ChannelzSecurityValue) *channelzpb.Security
 		otherSecurity := &channelzpb.Security_OtherSecurity{
 			Name: v.Name,
 		}
-		if anyval, err := ptypes.MarshalAny(v.Value); err == nil {
+		if anyval, err := anypb.New(protoadapt.MessageV2Of(v.Value)); err == nil {
 			otherSecurity.Value = anyval
 		}
 		return &channelzpb.Security{Model: &channelzpb.Security_Other{Other: otherSecurity}}