From ed434dc9f561741f355f745e753ec4fc2087339f Mon Sep 17 00:00:00 2001
From: vissajanardhan <janardhan1819@gmail.com>
Date: Wed, 14 Aug 2024 15:06:58 +0530
Subject: [PATCH 1/5] Fixed linter issues for superfluous-else,
 increment-decrement, indent-error-flow, var-declaration

---
 cmd/protoc-gen-go-grpc/grpc.go                      | 13 +++++++------
 examples/features/flow_control/client/main.go       |  2 +-
 examples/features/flow_control/server/main.go       |  2 +-
 internal/channelz/funcs.go                          |  2 +-
 internal/internal.go                                |  4 ++--
 internal/transport/http2_client.go                  |  6 ++----
 internal/transport/http_util.go                     |  2 +-
 profiling/cmd/remote.go                             |  6 +++---
 server.go                                           |  4 ++--
 stats/opentelemetry/internal/testutils/testutils.go |  4 ++--
 10 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go
index abc216022928..720b203bdebf 100644
--- a/cmd/protoc-gen-go-grpc/grpc.go
+++ b/cmd/protoc-gen-go-grpc/grpc.go
@@ -347,11 +347,12 @@ func clientStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingClient")) + "[" + typeParam + "]"
-	} else if method.Desc.IsStreamingClient() {
+	}
+	if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingClient")) + "[" + typeParam + "]"
-	} else { // i.e. if method.Desc.IsStreamingServer()
-		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
+	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
+
 }
 
 func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, index int) {
@@ -514,11 +515,11 @@ func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingServer")) + "[" + typeParam + "]"
-	} else if method.Desc.IsStreamingClient() {
+	}
+	if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]"
-	} else { // i.e. if method.Desc.IsStreamingServer()
-		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
+	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 }
 
 func genServerMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, hnameFuncNameFormatter func(string) string) string {
diff --git a/examples/features/flow_control/client/main.go b/examples/features/flow_control/client/main.go
index 5aea26b9bd4b..b1296f529e1a 100644
--- a/examples/features/flow_control/client/main.go
+++ b/examples/features/flow_control/client/main.go
@@ -34,7 +34,7 @@ import (
 
 var addr = flag.String("addr", "localhost:50052", "the address to connect to")
 
-var payload string = string(make([]byte, 8*1024)) // 8KB
+var payload = string(make([]byte, 8*1024)) // 8KB
 
 func main() {
 	flag.Parse()
diff --git a/examples/features/flow_control/server/main.go b/examples/features/flow_control/server/main.go
index 1b674cab416b..5452c3e622a5 100644
--- a/examples/features/flow_control/server/main.go
+++ b/examples/features/flow_control/server/main.go
@@ -35,7 +35,7 @@ import (
 
 var port = flag.Int("port", 50052, "port number")
 
-var payload string = string(make([]byte, 8*1024)) // 8KB
+var payload = string(make([]byte, 8*1024)) // 8KB
 
 // server is used to implement EchoServer.
 type server struct {
diff --git a/internal/channelz/funcs.go b/internal/channelz/funcs.go
index 03e24e1507aa..078bb81238bc 100644
--- a/internal/channelz/funcs.go
+++ b/internal/channelz/funcs.go
@@ -33,7 +33,7 @@ var (
 	// outside this package except by tests.
 	IDGen IDGenerator
 
-	db *channelMap = newChannelMap()
+	db = newChannelMap()
 	// EntriesPerPage defines the number of channelz entries to be shown on a web page.
 	EntriesPerPage = 50
 	curState       int32
diff --git a/internal/internal.go b/internal/internal.go
index e1e1422e15c4..0eb4a4fedb2d 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -183,7 +183,7 @@ var (
 
 	// GRPCResolverSchemeExtraMetadata determines when gRPC will add extra
 	// metadata to RPCs.
-	GRPCResolverSchemeExtraMetadata string = "xds"
+	GRPCResolverSchemeExtraMetadata = "xds"
 
 	// EnterIdleModeForTesting gets the ClientConn to enter IDLE mode.
 	EnterIdleModeForTesting any // func(*grpc.ClientConn)
@@ -203,7 +203,7 @@ var (
 
 	// UserSetDefaultScheme is set to true if the user has overridden the
 	// default resolver scheme.
-	UserSetDefaultScheme bool = false
+	UserSetDefaultScheme = false
 
 	// ShuffleAddressListForTesting pseudo-randomizes the order of addresses.  n
 	// is the number of elements.  swap swaps the elements with indexes i and j.
diff --git a/internal/transport/http2_client.go b/internal/transport/http2_client.go
index 3c63c706986d..cc7ca4c07623 100644
--- a/internal/transport/http2_client.go
+++ b/internal/transport/http2_client.go
@@ -1642,11 +1642,9 @@ func (t *http2Client) reader(errCh chan<- error) {
 					t.closeStream(s, status.Error(code, msg), true, http2.ErrCodeProtocol, status.New(code, msg), nil, false)
 				}
 				continue
-			} else {
-				// Transport error.
-				t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
-				return
 			}
+			t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
+			return
 		}
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
diff --git a/internal/transport/http_util.go b/internal/transport/http_util.go
index 39cef3bd442e..b5303c54622d 100644
--- a/internal/transport/http_util.go
+++ b/internal/transport/http_util.go
@@ -389,7 +389,7 @@ type framer struct {
 	fr     *http2.Framer
 }
 
-var writeBufferPoolMap map[int]*sync.Pool = make(map[int]*sync.Pool)
+var writeBufferPoolMap = make(map[int]*sync.Pool)
 var writeBufferMutex sync.Mutex
 
 func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32) *framer {
diff --git a/profiling/cmd/remote.go b/profiling/cmd/remote.go
index 71c21c332b74..b75c3e3bb33b 100644
--- a/profiling/cmd/remote.go
+++ b/profiling/cmd/remote.go
@@ -90,9 +90,9 @@ func remoteCommand() error {
 
 	if *flagEnableProfiling || *flagDisableProfiling {
 		return setEnabled(ctx, c, *flagEnableProfiling)
-	} else if *flagRetrieveSnapshot {
+	}
+	if *flagRetrieveSnapshot {
 		return retrieveSnapshot(ctx, c, *flagSnapshot)
-	} else {
-		return fmt.Errorf("what should I do with the remote target?")
 	}
+	return fmt.Errorf("what should I do with the remote target?")
 }
diff --git a/server.go b/server.go
index 89f8e4792bf1..58f2311b5020 100644
--- a/server.go
+++ b/server.go
@@ -86,7 +86,7 @@ func init() {
 var statusOK = status.New(codes.OK, "")
 var logger = grpclog.Component("core")
 
-type methodHandler func(srv any, ctx context.Context, dec func(any) error, interceptor UnaryServerInterceptor) (any, error)
+type methodHandler func(ctx context.Context, srv any, dec func(any) error, interceptor UnaryServerInterceptor) (any, error)
 
 // MethodDesc represents an RPC service's method specification.
 type MethodDesc struct {
@@ -1376,7 +1376,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, t transport.ServerTranspor
 		return nil
 	}
 	ctx = NewContextWithServerTransportStream(ctx, stream)
-	reply, appErr := md.Handler(info.serviceImpl, ctx, df, s.opts.unaryInt)
+	reply, appErr := md.Handler(ctx, info.serviceImpl, df, s.opts.unaryInt)
 	if appErr != nil {
 		appStatus, ok := status.FromError(appErr)
 		if !ok {
diff --git a/stats/opentelemetry/internal/testutils/testutils.go b/stats/opentelemetry/internal/testutils/testutils.go
index 10856409eeaf..721ce00cd347 100644
--- a/stats/opentelemetry/internal/testutils/testutils.go
+++ b/stats/opentelemetry/internal/testutils/testutils.go
@@ -131,8 +131,8 @@ func createBucketCounts(recordingPoints []float64, bounds []float64) []uint64 {
 			continue
 		}
 		for recordingPoints[recordingPointIndex] <= bound {
-			bucketCount += 1
-			recordingPointIndex += 1
+			bucketCount++
+			recordingPointIndex++
 			if recordingPointIndex >= len(recordingPoints) {
 				break
 			}

From 3ea5488a3e021fb9bfdd24a4fa821543f61ae11a Mon Sep 17 00:00:00 2001
From: vissajanardhan <janardhan1819@gmail.com>
Date: Wed, 14 Aug 2024 16:00:13 +0530
Subject: [PATCH 2/5] Reverting context-as-argument in server.go

---
 server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.go b/server.go
index 58f2311b5020..89f8e4792bf1 100644
--- a/server.go
+++ b/server.go
@@ -86,7 +86,7 @@ func init() {
 var statusOK = status.New(codes.OK, "")
 var logger = grpclog.Component("core")
 
-type methodHandler func(ctx context.Context, srv any, dec func(any) error, interceptor UnaryServerInterceptor) (any, error)
+type methodHandler func(srv any, ctx context.Context, dec func(any) error, interceptor UnaryServerInterceptor) (any, error)
 
 // MethodDesc represents an RPC service's method specification.
 type MethodDesc struct {
@@ -1376,7 +1376,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, t transport.ServerTranspor
 		return nil
 	}
 	ctx = NewContextWithServerTransportStream(ctx, stream)
-	reply, appErr := md.Handler(ctx, info.serviceImpl, df, s.opts.unaryInt)
+	reply, appErr := md.Handler(info.serviceImpl, ctx, df, s.opts.unaryInt)
 	if appErr != nil {
 		appStatus, ok := status.FromError(appErr)
 		if !ok {

From bd4478732c62c50e6e1a1a231d66f4270b236be7 Mon Sep 17 00:00:00 2001
From: janardhanvissa <47281167+janardhanvissa@users.noreply.github.com>
Date: Sun, 18 Aug 2024 11:20:48 +0530
Subject: [PATCH 3/5] Revert "Optimising the code by fixing var-declaration,
 indent-error-flow, increment-decrement, superfluous-else"

---
 cmd/protoc-gen-go-grpc/grpc.go                      | 13 ++++++-------
 examples/features/flow_control/client/main.go       |  2 +-
 examples/features/flow_control/server/main.go       |  2 +-
 internal/channelz/funcs.go                          |  2 +-
 internal/internal.go                                |  4 ++--
 internal/transport/http2_client.go                  |  6 ++++--
 internal/transport/http_util.go                     |  2 +-
 profiling/cmd/remote.go                             |  6 +++---
 stats/opentelemetry/internal/testutils/testutils.go |  4 ++--
 9 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go
index 720b203bdebf..abc216022928 100644
--- a/cmd/protoc-gen-go-grpc/grpc.go
+++ b/cmd/protoc-gen-go-grpc/grpc.go
@@ -347,12 +347,11 @@ func clientStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingClient")) + "[" + typeParam + "]"
-	}
-	if method.Desc.IsStreamingClient() {
+	} else if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingClient")) + "[" + typeParam + "]"
+	} else { // i.e. if method.Desc.IsStreamingServer()
+		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
-	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
-
 }
 
 func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, index int) {
@@ -515,11 +514,11 @@ func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingServer")) + "[" + typeParam + "]"
-	}
-	if method.Desc.IsStreamingClient() {
+	} else if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]"
+	} else { // i.e. if method.Desc.IsStreamingServer()
+		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
-	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 }
 
 func genServerMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, hnameFuncNameFormatter func(string) string) string {
diff --git a/examples/features/flow_control/client/main.go b/examples/features/flow_control/client/main.go
index b1296f529e1a..5aea26b9bd4b 100644
--- a/examples/features/flow_control/client/main.go
+++ b/examples/features/flow_control/client/main.go
@@ -34,7 +34,7 @@ import (
 
 var addr = flag.String("addr", "localhost:50052", "the address to connect to")
 
-var payload = string(make([]byte, 8*1024)) // 8KB
+var payload string = string(make([]byte, 8*1024)) // 8KB
 
 func main() {
 	flag.Parse()
diff --git a/examples/features/flow_control/server/main.go b/examples/features/flow_control/server/main.go
index 5452c3e622a5..1b674cab416b 100644
--- a/examples/features/flow_control/server/main.go
+++ b/examples/features/flow_control/server/main.go
@@ -35,7 +35,7 @@ import (
 
 var port = flag.Int("port", 50052, "port number")
 
-var payload = string(make([]byte, 8*1024)) // 8KB
+var payload string = string(make([]byte, 8*1024)) // 8KB
 
 // server is used to implement EchoServer.
 type server struct {
diff --git a/internal/channelz/funcs.go b/internal/channelz/funcs.go
index 078bb81238bc..03e24e1507aa 100644
--- a/internal/channelz/funcs.go
+++ b/internal/channelz/funcs.go
@@ -33,7 +33,7 @@ var (
 	// outside this package except by tests.
 	IDGen IDGenerator
 
-	db = newChannelMap()
+	db *channelMap = newChannelMap()
 	// EntriesPerPage defines the number of channelz entries to be shown on a web page.
 	EntriesPerPage = 50
 	curState       int32
diff --git a/internal/internal.go b/internal/internal.go
index 0eb4a4fedb2d..e1e1422e15c4 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -183,7 +183,7 @@ var (
 
 	// GRPCResolverSchemeExtraMetadata determines when gRPC will add extra
 	// metadata to RPCs.
-	GRPCResolverSchemeExtraMetadata = "xds"
+	GRPCResolverSchemeExtraMetadata string = "xds"
 
 	// EnterIdleModeForTesting gets the ClientConn to enter IDLE mode.
 	EnterIdleModeForTesting any // func(*grpc.ClientConn)
@@ -203,7 +203,7 @@ var (
 
 	// UserSetDefaultScheme is set to true if the user has overridden the
 	// default resolver scheme.
-	UserSetDefaultScheme = false
+	UserSetDefaultScheme bool = false
 
 	// ShuffleAddressListForTesting pseudo-randomizes the order of addresses.  n
 	// is the number of elements.  swap swaps the elements with indexes i and j.
diff --git a/internal/transport/http2_client.go b/internal/transport/http2_client.go
index cc7ca4c07623..3c63c706986d 100644
--- a/internal/transport/http2_client.go
+++ b/internal/transport/http2_client.go
@@ -1642,9 +1642,11 @@ func (t *http2Client) reader(errCh chan<- error) {
 					t.closeStream(s, status.Error(code, msg), true, http2.ErrCodeProtocol, status.New(code, msg), nil, false)
 				}
 				continue
+			} else {
+				// Transport error.
+				t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
+				return
 			}
-			t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
-			return
 		}
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
diff --git a/internal/transport/http_util.go b/internal/transport/http_util.go
index b5303c54622d..39cef3bd442e 100644
--- a/internal/transport/http_util.go
+++ b/internal/transport/http_util.go
@@ -389,7 +389,7 @@ type framer struct {
 	fr     *http2.Framer
 }
 
-var writeBufferPoolMap = make(map[int]*sync.Pool)
+var writeBufferPoolMap map[int]*sync.Pool = make(map[int]*sync.Pool)
 var writeBufferMutex sync.Mutex
 
 func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32) *framer {
diff --git a/profiling/cmd/remote.go b/profiling/cmd/remote.go
index b75c3e3bb33b..71c21c332b74 100644
--- a/profiling/cmd/remote.go
+++ b/profiling/cmd/remote.go
@@ -90,9 +90,9 @@ func remoteCommand() error {
 
 	if *flagEnableProfiling || *flagDisableProfiling {
 		return setEnabled(ctx, c, *flagEnableProfiling)
-	}
-	if *flagRetrieveSnapshot {
+	} else if *flagRetrieveSnapshot {
 		return retrieveSnapshot(ctx, c, *flagSnapshot)
+	} else {
+		return fmt.Errorf("what should I do with the remote target?")
 	}
-	return fmt.Errorf("what should I do with the remote target?")
 }
diff --git a/stats/opentelemetry/internal/testutils/testutils.go b/stats/opentelemetry/internal/testutils/testutils.go
index 721ce00cd347..10856409eeaf 100644
--- a/stats/opentelemetry/internal/testutils/testutils.go
+++ b/stats/opentelemetry/internal/testutils/testutils.go
@@ -131,8 +131,8 @@ func createBucketCounts(recordingPoints []float64, bounds []float64) []uint64 {
 			continue
 		}
 		for recordingPoints[recordingPointIndex] <= bound {
-			bucketCount++
-			recordingPointIndex++
+			bucketCount += 1
+			recordingPointIndex += 1
 			if recordingPointIndex >= len(recordingPoints) {
 				break
 			}

From 7e51c2aac09670a6122819a5d563710ca00783c3 Mon Sep 17 00:00:00 2001
From: vissajanardhan <janardhan1819@gmail.com>
Date: Sun, 18 Aug 2024 12:22:24 +0530
Subject: [PATCH 4/5] Optimising the code by fixing var-declaration,
 indent-error-flow, increment-decrement, superfluous-else

---
 cmd/protoc-gen-go-grpc/grpc.go                      | 12 ++++++------
 examples/features/flow_control/client/main.go       |  2 +-
 examples/features/flow_control/server/main.go       |  2 +-
 internal/channelz/funcs.go                          |  2 +-
 internal/internal.go                                |  4 ++--
 internal/transport/http2_client.go                  |  7 +++----
 internal/transport/http_util.go                     |  2 +-
 profiling/cmd/remote.go                             |  6 +++---
 stats/opentelemetry/internal/testutils/testutils.go |  4 ++--
 9 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go
index abc216022928..f4dea1854658 100644
--- a/cmd/protoc-gen-go-grpc/grpc.go
+++ b/cmd/protoc-gen-go-grpc/grpc.go
@@ -347,11 +347,11 @@ func clientStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingClient")) + "[" + typeParam + "]"
-	} else if method.Desc.IsStreamingClient() {
+	}
+	if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingClient")) + "[" + typeParam + "]"
-	} else { // i.e. if method.Desc.IsStreamingServer()
-		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
+	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingClient")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 }
 
 func genClientMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, index int) {
@@ -514,11 +514,11 @@ func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	typeParam := g.QualifiedGoIdent(method.Input.GoIdent) + ", " + g.QualifiedGoIdent(method.Output.GoIdent)
 	if method.Desc.IsStreamingClient() && method.Desc.IsStreamingServer() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("BidiStreamingServer")) + "[" + typeParam + "]"
-	} else if method.Desc.IsStreamingClient() {
+	}
+	if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]"
-	} else { // i.e. if method.Desc.IsStreamingServer()
-		return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 	}
+	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 }
 
 func genServerMethod(gen *protogen.Plugin, file *protogen.File, g *protogen.GeneratedFile, method *protogen.Method, hnameFuncNameFormatter func(string) string) string {
diff --git a/examples/features/flow_control/client/main.go b/examples/features/flow_control/client/main.go
index 5aea26b9bd4b..b1296f529e1a 100644
--- a/examples/features/flow_control/client/main.go
+++ b/examples/features/flow_control/client/main.go
@@ -34,7 +34,7 @@ import (
 
 var addr = flag.String("addr", "localhost:50052", "the address to connect to")
 
-var payload string = string(make([]byte, 8*1024)) // 8KB
+var payload = string(make([]byte, 8*1024)) // 8KB
 
 func main() {
 	flag.Parse()
diff --git a/examples/features/flow_control/server/main.go b/examples/features/flow_control/server/main.go
index 1b674cab416b..5452c3e622a5 100644
--- a/examples/features/flow_control/server/main.go
+++ b/examples/features/flow_control/server/main.go
@@ -35,7 +35,7 @@ import (
 
 var port = flag.Int("port", 50052, "port number")
 
-var payload string = string(make([]byte, 8*1024)) // 8KB
+var payload = string(make([]byte, 8*1024)) // 8KB
 
 // server is used to implement EchoServer.
 type server struct {
diff --git a/internal/channelz/funcs.go b/internal/channelz/funcs.go
index 03e24e1507aa..078bb81238bc 100644
--- a/internal/channelz/funcs.go
+++ b/internal/channelz/funcs.go
@@ -33,7 +33,7 @@ var (
 	// outside this package except by tests.
 	IDGen IDGenerator
 
-	db *channelMap = newChannelMap()
+	db = newChannelMap()
 	// EntriesPerPage defines the number of channelz entries to be shown on a web page.
 	EntriesPerPage = 50
 	curState       int32
diff --git a/internal/internal.go b/internal/internal.go
index e1e1422e15c4..0eb4a4fedb2d 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -183,7 +183,7 @@ var (
 
 	// GRPCResolverSchemeExtraMetadata determines when gRPC will add extra
 	// metadata to RPCs.
-	GRPCResolverSchemeExtraMetadata string = "xds"
+	GRPCResolverSchemeExtraMetadata = "xds"
 
 	// EnterIdleModeForTesting gets the ClientConn to enter IDLE mode.
 	EnterIdleModeForTesting any // func(*grpc.ClientConn)
@@ -203,7 +203,7 @@ var (
 
 	// UserSetDefaultScheme is set to true if the user has overridden the
 	// default resolver scheme.
-	UserSetDefaultScheme bool = false
+	UserSetDefaultScheme = false
 
 	// ShuffleAddressListForTesting pseudo-randomizes the order of addresses.  n
 	// is the number of elements.  swap swaps the elements with indexes i and j.
diff --git a/internal/transport/http2_client.go b/internal/transport/http2_client.go
index 3c63c706986d..0b79c406dc7b 100644
--- a/internal/transport/http2_client.go
+++ b/internal/transport/http2_client.go
@@ -1642,11 +1642,10 @@ func (t *http2Client) reader(errCh chan<- error) {
 					t.closeStream(s, status.Error(code, msg), true, http2.ErrCodeProtocol, status.New(code, msg), nil, false)
 				}
 				continue
-			} else {
-				// Transport error.
-				t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
-				return
 			}
+			// Transport error.
+			t.Close(connectionErrorf(true, err, "error reading from server: %v", err))
+			return
 		}
 		switch frame := frame.(type) {
 		case *http2.MetaHeadersFrame:
diff --git a/internal/transport/http_util.go b/internal/transport/http_util.go
index 39cef3bd442e..b5303c54622d 100644
--- a/internal/transport/http_util.go
+++ b/internal/transport/http_util.go
@@ -389,7 +389,7 @@ type framer struct {
 	fr     *http2.Framer
 }
 
-var writeBufferPoolMap map[int]*sync.Pool = make(map[int]*sync.Pool)
+var writeBufferPoolMap = make(map[int]*sync.Pool)
 var writeBufferMutex sync.Mutex
 
 func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32) *framer {
diff --git a/profiling/cmd/remote.go b/profiling/cmd/remote.go
index 71c21c332b74..b75c3e3bb33b 100644
--- a/profiling/cmd/remote.go
+++ b/profiling/cmd/remote.go
@@ -90,9 +90,9 @@ func remoteCommand() error {
 
 	if *flagEnableProfiling || *flagDisableProfiling {
 		return setEnabled(ctx, c, *flagEnableProfiling)
-	} else if *flagRetrieveSnapshot {
+	}
+	if *flagRetrieveSnapshot {
 		return retrieveSnapshot(ctx, c, *flagSnapshot)
-	} else {
-		return fmt.Errorf("what should I do with the remote target?")
 	}
+	return fmt.Errorf("what should I do with the remote target?")
 }
diff --git a/stats/opentelemetry/internal/testutils/testutils.go b/stats/opentelemetry/internal/testutils/testutils.go
index 10856409eeaf..721ce00cd347 100644
--- a/stats/opentelemetry/internal/testutils/testutils.go
+++ b/stats/opentelemetry/internal/testutils/testutils.go
@@ -131,8 +131,8 @@ func createBucketCounts(recordingPoints []float64, bounds []float64) []uint64 {
 			continue
 		}
 		for recordingPoints[recordingPointIndex] <= bound {
-			bucketCount += 1
-			recordingPointIndex += 1
+			bucketCount++
+			recordingPointIndex++
 			if recordingPointIndex >= len(recordingPoints) {
 				break
 			}

From fb38c64be83ae679104bdba29a1c6ae63af8b7fb Mon Sep 17 00:00:00 2001
From: vissajanardhan <janardhan1819@gmail.com>
Date: Sun, 18 Aug 2024 12:52:10 +0530
Subject: [PATCH 5/5] dummy commit for re-trigger

---
 cmd/protoc-gen-go-grpc/grpc.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go
index f4dea1854658..4c65f1955f2a 100644
--- a/cmd/protoc-gen-go-grpc/grpc.go
+++ b/cmd/protoc-gen-go-grpc/grpc.go
@@ -518,6 +518,7 @@ func serverStreamInterface(g *protogen.GeneratedFile, method *protogen.Method) s
 	if method.Desc.IsStreamingClient() {
 		return g.QualifiedGoIdent(grpcPackage.Ident("ClientStreamingServer")) + "[" + typeParam + "]"
 	}
+
 	return g.QualifiedGoIdent(grpcPackage.Ident("ServerStreamingServer")) + "[" + g.QualifiedGoIdent(method.Output.GoIdent) + "]"
 }