--story=129925419 下发Telemetry资源需要区分版本 (merge request !2672)

silenceper · silenceper · commit 29f1b3e2f7bf · 2026-01-15T10:04:46.000Z
Squash merge branch 'fix-mesh-manager-telemetry' into 'master'
fix 下发Telemetry资源需要区分版本

 



TAPD: --story=129925419
diff --git a/bcs-common/pkg/bcsapi/meshmanager/bcs-mesh-manager.pb.go b/bcs-common/pkg/bcsapi/meshmanager/bcs-mesh-manager.pb.go
diff --git a/bcs-services/bcs-mesh-manager/cmd/mesh-manager-migrate/internal/migrator/migrator.go b/bcs-services/bcs-mesh-manager/cmd/mesh-manager-migrate/internal/migrator/migrator.go
@@ -505,9 +505,9 @@ func (m *Migrator) buildObservabilityConfig(
 	}
 
 	// 采样率配置
+	// istio < 1.21 版本使用 Pilot.TraceSampling（0.0-100.0）
 	if values.Pilot != nil && values.Pilot.TraceSampling != nil {
-		// Pilot 中的采样率是 0.0-1.0，需要转换为百分比
-		obsConfig.TracingConfig.TraceSamplingPercent = int32(*values.Pilot.TraceSampling * 100)
+		obsConfig.TracingConfig.TraceSamplingPercent = float32(*values.Pilot.TraceSampling)
 	}
 
 	return obsConfig
diff --git a/bcs-services/bcs-mesh-manager/go.mod b/bcs-services/bcs-mesh-manager/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/imdario/mergo v0.3.13
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.0
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.3.0
@@ -155,7 +156,6 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.48.0 // indirect
diff --git a/bcs-services/bcs-mesh-manager/pkg/clients/k8s/istio.go b/bcs-services/bcs-mesh-manager/pkg/clients/k8s/istio.go
@@ -254,7 +254,7 @@ func DeleteIstioCrd(ctx context.Context, clusterID string) error {
 }
 
 // DeployTelemetry 部署Telemetry资源用于链路追踪
-func DeployTelemetry(ctx context.Context, clusterID []string, randomSamplingPercnt int) error {
+func DeployTelemetry(ctx context.Context, clusterID []string, randomSamplingPercnt float32) error {
 	for _, cluster := range clusterID {
 		if err := DeployResourceByYAML(
 			ctx,
diff --git a/bcs-services/bcs-mesh-manager/pkg/common/feature.go b/bcs-services/bcs-mesh-manager/pkg/common/feature.go
@@ -145,7 +145,7 @@ func GetDefaultObservabilityConfig() *meshmanager.ObservabilityConfig {
 			Enabled:              wrapperspb.Bool(false),
 			Endpoint:             wrapperspb.String(""),
 			BkToken:              wrapperspb.String(""),
-			TraceSamplingPercent: wrapperspb.Int32(10),
+			TraceSamplingPercent: wrapperspb.Float(10),
 		},
 	}
 }
diff --git a/bcs-services/bcs-mesh-manager/pkg/common/monitoring.go b/bcs-services/bcs-mesh-manager/pkg/common/monitoring.go
@@ -96,7 +96,7 @@ spec:
   tracing:
   - providers:
     - name: otel-tracing
-    randomSamplingPercentage: %d`
+    randomSamplingPercentage: %.2f`
 
 // GetPodMonitorYAML 获取PodMonitor YAML模板
 func GetPodMonitorYAML(name string) string {
@@ -109,7 +109,7 @@ func GetServiceMonitorYAML(name string) string {
 }
 
 // GetTelemetryYAML 获取Telemetry YAML模板
-func GetTelemetryYAML(samplePercentage int) string {
+func GetTelemetryYAML(samplePercentage float32) string {
 	return fmt.Sprintf(TelemetryTemplate, samplePercentage)
 }
 
diff --git a/bcs-services/bcs-mesh-manager/pkg/common/values.go b/bcs-services/bcs-mesh-manager/pkg/common/values.go
@@ -126,7 +126,7 @@ type IstiodPilotConfig struct {
 	AutoscaleMin     *int32            `yaml:"autoscaleMin,omitempty"`
 	AutoscaleMax     *int32            `yaml:"autoscaleMax,omitempty"`
 	ReplicaCount     *int32            `yaml:"replicaCount,omitempty"`
-	TraceSampling    *float64          `yaml:"traceSampling,omitempty"`
+	TraceSampling    *float32          `yaml:"traceSampling,omitempty"`
 	ConfigMap        *bool             `yaml:"configMap,omitempty"`
 	CPU              *HPACPUConfig     `yaml:"cpu,omitempty"`
 	Env              map[string]string `yaml:"env,omitempty"`
diff --git a/bcs-services/bcs-mesh-manager/pkg/operation/actions/istio_install.go b/bcs-services/bcs-mesh-manager/pkg/operation/actions/istio_install.go
@@ -161,10 +161,16 @@ func (i *IstioInstallAction) deployTelemetry(ctx context.Context) error {
 		return nil
 	}
 
+	// istio 1.21以上版本才通过Telemetry API下发
+	if !utils.IsVersionSupported(i.ChartVersion, ">=1.21") {
+		blog.Infof("[%s]istio version %s is less than 1.21, skip deploying Telemetry resource", i.MeshID, i.ChartVersion)
+		return nil
+	}
+
 	// 下发Telemetry 资源
-	traceSamplingPercent := 1
+	traceSamplingPercent := float32(1)
 	if i.ObservabilityConfig.TracingConfig.TraceSamplingPercent != nil {
-		traceSamplingPercent = int(i.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
+		traceSamplingPercent = float32(i.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
 	}
 
 	if err := k8s.DeployTelemetry(ctx, i.PrimaryClusters, traceSamplingPercent); err != nil {
diff --git a/bcs-services/bcs-mesh-manager/pkg/operation/actions/istio_update.go b/bcs-services/bcs-mesh-manager/pkg/operation/actions/istio_update.go
@@ -170,9 +170,15 @@ func (i *IstioUpdateAction) updateTelemetry(ctx context.Context) error {
 
 	// 更新链路追踪资源
 	if i.ObservabilityConfig.TracingConfig.Enabled.GetValue() {
-		traceSamplingPercent := 1
+		// istio 1.21以上版本才通过Telemetry API下发
+		if !utils.IsVersionSupported(*i.ChartVersion, ">=1.21") {
+			blog.Infof("[%s]istio version %s is less than 1.21, skip deploying Telemetry resource", i.MeshID, *i.ChartVersion)
+			return nil
+		}
+
+		traceSamplingPercent := float32(1)
 		if i.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue() != 0 {
-			traceSamplingPercent = int(i.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
+			traceSamplingPercent = float32(i.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
 		}
 		if err := k8s.DeployTelemetry(ctx, i.PrimaryClusters, traceSamplingPercent); err != nil {
 			blog.Errorf("[%s]deploy Telemetry failed for clusters, err: %s", i.MeshID, err)
diff --git a/bcs-services/bcs-mesh-manager/pkg/store/entity/mesh_istio.go b/bcs-services/bcs-mesh-manager/pkg/store/entity/mesh_istio.go
@@ -119,10 +119,10 @@ type LogCollectorConfig struct {
 
 // TracingConfig represents tracing configuration
 type TracingConfig struct {
-	Enabled              bool   `bson:"enabled" json:"enabled"`
-	Endpoint             string `bson:"endpoint" json:"endpoint"`
-	BkToken              string `bson:"bkToken" json:"bkToken"`
-	TraceSamplingPercent int32  `bson:"traceSamplingPercent" json:"traceSamplingPercent"`
+	Enabled              bool    `bson:"enabled" json:"enabled"`
+	Endpoint             string  `bson:"endpoint" json:"endpoint"`
+	BkToken              string  `bson:"bkToken" json:"bkToken"`
+	TraceSamplingPercent float32 `bson:"traceSamplingPercent" json:"traceSamplingPercent"`
 }
 
 // FeatureConfig represents a feature configuration
@@ -241,7 +241,7 @@ func (m *MeshIstio) Transfer2ProtoForDetail() *meshmanager.IstioDetailInfo {
 				Enabled:              wrapperspb.Bool(m.ObservabilityConfig.TracingConfig.Enabled),
 				Endpoint:             wrapperspb.String(m.ObservabilityConfig.TracingConfig.Endpoint),
 				BkToken:              wrapperspb.String(m.ObservabilityConfig.TracingConfig.BkToken),
-				TraceSamplingPercent: wrapperspb.Int32(m.ObservabilityConfig.TracingConfig.TraceSamplingPercent),
+				TraceSamplingPercent: wrapperspb.Float(m.ObservabilityConfig.TracingConfig.TraceSamplingPercent),
 			}
 		}
 	}
diff --git a/bcs-services/bcs-mesh-manager/pkg/utils/values_gen.go b/bcs-services/bcs-mesh-manager/pkg/utils/values_gen.go
@@ -567,7 +567,7 @@ func GenIstiodValuesByTracing(
 			if installValues.Pilot == nil {
 				installValues.Pilot = &common.IstiodPilotConfig{}
 			}
-			installValues.Pilot.TraceSampling = pointer.Float64(float64(tracingConfig.TraceSamplingPercent.GetValue()) / 100)
+			installValues.Pilot.TraceSampling = pointer.Float32(tracingConfig.TraceSamplingPercent.GetValue())
 		}
 
 		if installValues.MeshConfig.ExtensionProviders == nil {
@@ -618,7 +618,7 @@ func GenIstiodValuesByTracing(
 		if installValues.Pilot == nil {
 			installValues.Pilot = &common.IstiodPilotConfig{}
 		}
-		installValues.Pilot.TraceSampling = pointer.Float64(float64(tracingConfig.TraceSamplingPercent.GetValue()) / 100)
+		installValues.Pilot.TraceSampling = pointer.Float32(tracingConfig.TraceSamplingPercent.GetValue())
 	}
 	return nil
 }
diff --git a/bcs-services/bcs-mesh-manager/pkg/utils/values_gen_test.go b/bcs-services/bcs-mesh-manager/pkg/utils/values_gen_test.go
@@ -197,14 +197,14 @@ func TestGenIstiodValues(t *testing.T) {
 						Enabled:              &wrappers.BoolValue{Value: true},
 						Endpoint:             &wrappers.StringValue{Value: "http://jaeger-collector.istio-system:14268/api/traces"},
 						BkToken:              &wrappers.StringValue{Value: "test-token"},
-						TraceSamplingPercent: &wrappers.Int32Value{Value: 10},
+						TraceSamplingPercent: &wrappers.FloatValue{Value: 10},
 					},
 				},
 			},
 			expectedFields: []string{
 				"mesh-obs", "net-obs", "accessLogFile", "/dev/stdout",
 				"JSON", `"timestamp"`, "enableTracing: true", "jaeger-collector.istio-system",
-				"traceSampling: 0.1",
+				"traceSampling: 10",
 			},
 		},
 		{
@@ -223,13 +223,13 @@ func TestGenIstiodValues(t *testing.T) {
 					TracingConfig: &meshmanager.TracingConfig{
 						Enabled:              &wrappers.BoolValue{Value: true},
 						Endpoint:             &wrappers.StringValue{Value: "http://zipkin.istio-system:9411/api/v2/spans"},
-						TraceSamplingPercent: &wrappers.Int32Value{Value: 5},
+						TraceSamplingPercent: &wrappers.FloatValue{Value: 5},
 					},
 				},
 			},
 			expectedFields: []string{
 				"mesh-legacy", "net-legacy", "enableTracing: true",
-				"zipkin.istio-system:9411", "traceSampling: 0.05",
+				"zipkin.istio-system:9411", "traceSampling: 5",
 			},
 		},
 		{
@@ -465,7 +465,7 @@ func TestGenIstiodValuesByComponents(t *testing.T) {
 				Enabled:              &wrappers.BoolValue{Value: true},
 				Endpoint:             &wrappers.StringValue{Value: "http://jaeger-collector.istio-system:14268/api/traces"},
 				BkToken:              &wrappers.StringValue{Value: "test-token"},
-				TraceSamplingPercent: &wrappers.Int32Value{Value: 10},
+				TraceSamplingPercent: &wrappers.FloatValue{Value: 10},
 			},
 		}
 
@@ -511,7 +511,7 @@ func TestGenIstiodValuesByComponents(t *testing.T) {
 				},
 			},
 			Pilot: &common.IstiodPilotConfig{
-				TraceSampling: pointer.Float64(0.1),
+				TraceSampling: pointer.Float32(10),
 			},
 		}
 
@@ -557,7 +557,7 @@ func TestGenIstiodValuesByComponents(t *testing.T) {
 				},
 			},
 			Pilot: &common.IstiodPilotConfig{
-				TraceSampling: pointer.Float64(0.1),
+				TraceSampling: pointer.Float32(10),
 			},
 		}
 
diff --git a/bcs-services/bcs-mesh-manager/pkg/utils/values_to_istioinfo.go b/bcs-services/bcs-mesh-manager/pkg/utils/values_to_istioinfo.go
@@ -235,7 +235,7 @@ func convertObservabilityConfigValues(
 	// 获取采样率
 	if istiodValues.Pilot != nil && istiodValues.Pilot.TraceSampling != nil {
 		result.ObservabilityConfig.TracingConfig.TraceSamplingPercent =
-			wrapperspb.Int32(int32(*istiodValues.Pilot.TraceSampling * 100))
+			wrapperspb.Float(float32(*istiodValues.Pilot.TraceSampling))
 	}
 
 	// 更新日志配置
diff --git a/bcs-services/bcs-mesh-manager/pkg/utils/values_to_listinfo_test.go b/bcs-services/bcs-mesh-manager/pkg/utils/values_to_listinfo_test.go
@@ -209,7 +209,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 					AccessLogEncoding: strPtr("TEXT"),
 				},
 				Pilot: &common.IstiodPilotConfig{
-					TraceSampling: float64Ptr(0.1),
+					TraceSampling: float32Ptr(10),
 				},
 			},
 			wantErr: false,
@@ -233,7 +233,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 						result.ObservabilityConfig.TracingConfig.BkToken.GetValue())
 				}
 				if result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue() != 10 {
-					t.Errorf("expected TraceSamplingPercent 10, got %d",
+					t.Errorf("expected TraceSamplingPercent 10, got %.2f",
 						result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
 				}
 				if result.ObservabilityConfig.LogCollectorConfig == nil {
@@ -269,7 +269,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 					},
 				},
 				Pilot: &common.IstiodPilotConfig{
-					TraceSampling: float64Ptr(0.05),
+					TraceSampling: float32Ptr(5),
 				},
 			},
 			wantErr: false,
@@ -289,7 +289,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 						result.ObservabilityConfig.TracingConfig.Endpoint.GetValue())
 				}
 				if result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue() != 5 {
-					t.Errorf("expected TraceSamplingPercent 5, got %d",
+					t.Errorf("expected TraceSamplingPercent 5, got %.2f",
 						result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
 				}
 			},
@@ -440,7 +440,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 					AutoscaleEnabled: boolPtr(true),
 					AutoscaleMin:     int32Ptr(2),
 					AutoscaleMax:     int32Ptr(10),
-					TraceSampling:    float64Ptr(0.01),
+					TraceSampling:    float32Ptr(1.0),
 					ConfigMap:        boolPtr(false),
 					CPU: &common.HPACPUConfig{
 						TargetAverageUtilization: int32Ptr(70),
@@ -550,7 +550,7 @@ func TestConvertValuesToListItem(t *testing.T) {
 						result.ObservabilityConfig.TracingConfig.Endpoint.GetValue())
 				}
 				if result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue() != 1 {
-					t.Errorf("expected TraceSamplingPercent 1, got %d",
+					t.Errorf("expected TraceSamplingPercent 1, got %.2f",
 						result.ObservabilityConfig.TracingConfig.TraceSamplingPercent.GetValue())
 				}
 
@@ -608,6 +608,6 @@ func int32Ptr(i int32) *int32 {
 	return &i
 }
 
-func float64Ptr(f float64) *float64 {
+func float32Ptr(f float32) *float32 {
 	return &f
 }
diff --git a/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.pb.go b/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.pb.go
diff --git a/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.proto b/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.proto
diff --git a/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.swagger.json b/bcs-services/bcs-mesh-manager/proto/bcs-mesh-manager/bcs-mesh-manager.swagger.json

Original file line number	Diff line number	Diff line change
`@@ -505,9 +505,9 @@ func (m *Migrator) buildObservabilityConfig(`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`// 采样率配置`
	`508`	`+ // istio < 1.21 版本使用 Pilot.TraceSampling（0.0-100.0）`
`508`	`509`	`if values.Pilot != nil && values.Pilot.TraceSampling != nil {`
`509`		`- // Pilot 中的采样率是 0.0-1.0，需要转换为百分比`
`510`		`- obsConfig.TracingConfig.TraceSamplingPercent = int32(values.Pilot.TraceSampling 100)`
	`510`	`+ obsConfig.TracingConfig.TraceSamplingPercent = float32(*values.Pilot.TraceSampling)`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`return obsConfig`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func DeleteIstioCrd(ctx context.Context, clusterID string) error {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`// DeployTelemetry 部署Telemetry资源用于链路追踪`
`257`		`-func DeployTelemetry(ctx context.Context, clusterID []string, randomSamplingPercnt int) error {`
	`257`	`+func DeployTelemetry(ctx context.Context, clusterID []string, randomSamplingPercnt float32) error {`
`258`	`258`	`for _, cluster := range clusterID {`
`259`	`259`	`if err := DeployResourceByYAML(`
`260`	`260`	`ctx,`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func GetDefaultObservabilityConfig() *meshmanager.ObservabilityConfig {`
`145`	`145`	`Enabled: wrapperspb.Bool(false),`
`146`	`146`	`Endpoint: wrapperspb.String(""),`
`147`	`147`	`BkToken: wrapperspb.String(""),`
`148`		`- TraceSamplingPercent: wrapperspb.Int32(10),`
	`148`	`+ TraceSamplingPercent: wrapperspb.Float(10),`
`149`	`149`	`},`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ spec:`
`96`	`96`	`tracing:`
`97`	`97`	`- providers:`
`98`	`98`	`- name: otel-tracing`
`99`		- randomSamplingPercentage: %d`
	`99`	+ randomSamplingPercentage: %.2f`
`100`	`100`
`101`	`101`	`// GetPodMonitorYAML 获取PodMonitor YAML模板`
`102`	`102`	`func GetPodMonitorYAML(name string) string {`
`@@ -109,7 +109,7 @@ func GetServiceMonitorYAML(name string) string {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// GetTelemetryYAML 获取Telemetry YAML模板`
`112`		`-func GetTelemetryYAML(samplePercentage int) string {`
	`112`	`+func GetTelemetryYAML(samplePercentage float32) string {`
`113`	`113`	`return fmt.Sprintf(TelemetryTemplate, samplePercentage)`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,10 @@ type LogCollectorConfig struct {`
`119`	`119`
`120`	`120`	`// TracingConfig represents tracing configuration`
`121`	`121`	`type TracingConfig struct {`
`122`		- Enabled bool `bson:"enabled" json:"enabled"`
`123`		- Endpoint string `bson:"endpoint" json:"endpoint"`
`124`		- BkToken string `bson:"bkToken" json:"bkToken"`
`125`		- TraceSamplingPercent int32 `bson:"traceSamplingPercent" json:"traceSamplingPercent"`
	`122`	+ Enabled bool `bson:"enabled" json:"enabled"`
	`123`	+ Endpoint string `bson:"endpoint" json:"endpoint"`
	`124`	+ BkToken string `bson:"bkToken" json:"bkToken"`
	`125`	+ TraceSamplingPercent float32 `bson:"traceSamplingPercent" json:"traceSamplingPercent"`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// FeatureConfig represents a feature configuration`
`@@ -241,7 +241,7 @@ func (m MeshIstio) Transfer2ProtoForDetail() meshmanager.IstioDetailInfo {`
`241`	`241`	`Enabled: wrapperspb.Bool(m.ObservabilityConfig.TracingConfig.Enabled),`
`242`	`242`	`Endpoint: wrapperspb.String(m.ObservabilityConfig.TracingConfig.Endpoint),`
`243`	`243`	`BkToken: wrapperspb.String(m.ObservabilityConfig.TracingConfig.BkToken),`
`244`		`- TraceSamplingPercent: wrapperspb.Int32(m.ObservabilityConfig.TracingConfig.TraceSamplingPercent),`
	`244`	`+ TraceSamplingPercent: wrapperspb.Float(m.ObservabilityConfig.TracingConfig.TraceSamplingPercent),`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`	`}`