Merge pull request #19851 from k8s-infra-cherrypick-robot/cherry-pick-19843-to-release-3.6

[release-3.6] remove DistributedTracing from feature gate list.

Author: ahrtr

server/embed/config_test.go

@@ -111,7 +111,6 @@ func TestConfigFileFeatureGates(t *testing.T) {
 		{
 			name: "default",
 			expectedFeatures: map[featuregate.Feature]bool{
-				features.DistributedTracing:           false,
 				features.StopGRPCServiceOnDefrag:      false,
 				features.InitialCorruptCheck:          false,
 				features.TxnModeWriteWithSharedBuffer: true,
@@ -139,12 +138,12 @@ func TestConfigFileFeatureGates(t *testing.T) {
 		},
 		{
 			name:                                "ok to set different experimental flag and feature gate flag",
-			serverFeatureGatesJSON:              "DistributedTracing=true",
+			serverFeatureGatesJSON:              "InitialCorruptCheck=true",
 			experimentalStopGRPCServiceOnDefrag: "true",
 			expectedFeatures: map[featuregate.Feature]bool{
-				features.DistributedTracing:           true,
 				features.StopGRPCServiceOnDefrag:      true,
 				features.TxnModeWriteWithSharedBuffer: true,
+				features.InitialCorruptCheck:          true,
 			},
 		},
 		{

server/etcdmain/config_test.go

@@ -480,7 +480,6 @@ func TestParseFeatureGateFlags(t *testing.T) {
 			name: "default",
 			expectedFeatures: map[featuregate.Feature]bool{
 				features.StopGRPCServiceOnDefrag: false,
-				features.DistributedTracing:      false,
 			},
 		},
 		{
@@ -495,11 +494,11 @@ func TestParseFeatureGateFlags(t *testing.T) {
 			name: "ok to set different experimental flag and feature gate flag",
 			args: []string{
 				"--experimental-stop-grpc-service-on-defrag=true",
-				"--feature-gates=DistributedTracing=true",
+				"--feature-gates=InitialCorruptCheck=true",
 			},
 			expectedFeatures: map[featuregate.Feature]bool{
 				features.StopGRPCServiceOnDefrag: true,
-				features.DistributedTracing:      true,
+				features.InitialCorruptCheck:     true,
 			},
 		},
 		{
@@ -509,17 +508,17 @@ func TestParseFeatureGateFlags(t *testing.T) {
 			},
 			expectedFeatures: map[featuregate.Feature]bool{
 				features.StopGRPCServiceOnDefrag: true,
-				features.DistributedTracing:      false,
+				features.InitialCorruptCheck:     false,
 			},
 		},
 		{
 			name: "can set feature gate from feature gate flag",
 			args: []string{
-				"--feature-gates=StopGRPCServiceOnDefrag=true,DistributedTracing=true",
+				"--feature-gates=StopGRPCServiceOnDefrag=true,InitialCorruptCheck=true",
 			},
 			expectedFeatures: map[featuregate.Feature]bool{
 				features.StopGRPCServiceOnDefrag: true,
-				features.DistributedTracing:      true,
+				features.InitialCorruptCheck:     true,
 			},
 		},
 	}

server/features/etcd_features.go

@@ -35,11 +35,6 @@ const (
 	// of code conflicts because changes are more likely to be scattered
 	// across the file.
 
-	// DistributedTracing enables experimental distributed  tracing using OpenTelemetry Tracing.
-	// owner: @dashpole
-	// alpha: v3.5
-	// issue: https://github.com/etcd-io/etcd/issues/12460
-	DistributedTracing featuregate.Feature = "DistributedTracing"
 	// StopGRPCServiceOnDefrag enables etcd gRPC service to stop serving client requests on defragmentation.
 	// owner: @chaochn47
 	// alpha: v3.6
@@ -83,7 +78,6 @@ const (
 
 var (
 	DefaultEtcdServerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-		DistributedTracing:           {Default: false, PreRelease: featuregate.Alpha},
 		StopGRPCServiceOnDefrag:      {Default: false, PreRelease: featuregate.Alpha},
 		InitialCorruptCheck:          {Default: false, PreRelease: featuregate.Alpha},
 		CompactHashCheck:             {Default: false, PreRelease: featuregate.Alpha},