Enable Lint Rule: redefines-builtin-id

Signed-off-by: ZXYxc <[email protected]>

.golangci.yml

@@ -211,9 +211,6 @@ linters-settings:
         # this is idiocy, promotes less readable code. Don't enable.
         - name: var-declaration
           disabled: true
-        # enable after cleanup
-        - name: redefines-builtin-id
-          disabled: true
         # "no nested structs are allowed" - don't enable, doesn't make sense
         - name: nested-structs
           disabled: true

cmd/agent/app/configmanager/grpc/manager_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
-func close(t *testing.T, c io.Closer) {
+func closeTestGrpcConn(t *testing.T, c io.Closer) {
 	require.NoError(t, c.Close())
 }
 
@@ -27,7 +27,7 @@ func TestSamplingManager_GetSamplingStrategy(t *testing.T) {
 		api_v2.RegisterSamplingManagerServer(s, &mockSamplingHandler{})
 	})
 	conn, err := grpc.NewClient(addr.String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer close(t, conn)
+	defer closeTestGrpcConn(t, conn)
 	require.NoError(t, err)
 	defer s.GracefulStop()
 	manager := NewConfigManager(conn)
@@ -38,7 +38,7 @@ func TestSamplingManager_GetSamplingStrategy(t *testing.T) {
 
 func TestSamplingManager_GetSamplingStrategy_error(t *testing.T) {
 	conn, err := grpc.NewClient("foo", grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer close(t, conn)
+	defer closeTestGrpcConn(t, conn)
 	require.NoError(t, err)
 	manager := NewConfigManager(conn)
 	resp, err := manager.GetSamplingStrategy(context.Background(), "any")

plugin/sampling/strategyprovider/static/provider.go

@@ -375,7 +375,7 @@ func deepCopy(s *api_v2.SamplingStrategyResponse) *api_v2.SamplingStrategyRespon
 	enc := gob.NewEncoder(&buf)
 	dec := gob.NewDecoder(&buf)
 	enc.Encode(*s)
-	var copy api_v2.SamplingStrategyResponse
-	dec.Decode(&copy)
-	return &copy
+	var copyValue api_v2.SamplingStrategyResponse
+	dec.Decode(&copyValue)
+	return &copyValue
 }