Update ratio name

Author: sjberman

internal/mode/static/policies/observability/generator.go

@@ -2,7 +2,6 @@ package observability
 
 import (
 	"fmt"
-	"strings"
 	"text/template"
 
 	ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1"
@@ -70,8 +69,5 @@ func Generate(policy policies.Policy, globalSettings *policies.GlobalPolicySetti
 // CreateRatioVarName builds a variable name for an ObservabilityPolicy to be used with
 // ratio-based trace sampling.
 func CreateRatioVarName(policy *ngfAPI.ObservabilityPolicy) string {
-	namespace := strings.ReplaceAll(policy.GetNamespace(), "-", "_")
-	name := strings.ReplaceAll(policy.GetName(), "-", "_")
-
-	return fmt.Sprintf("$ratio_ns_%s_name_%s", namespace, name)
+	return fmt.Sprintf("$otel_ratio_%d", *policy.Spec.Tracing.Ratio)
 }

internal/mode/static/policies/observability/generator_test.go

@@ -53,7 +53,7 @@ func TestGenerate(t *testing.T) {
 				},
 			},
 			expStrings: []string{
-				"otel_trace $ratio_ns_test_namespace_name_test_policy;",
+				"otel_trace $otel_ratio_25;",
 			},
 		},
 		{
@@ -202,12 +202,13 @@ func TestGeneratePanics(t *testing.T) {
 
 func TestCreateRatioVarName(t *testing.T) {
 	pol := &ngfAPI.ObservabilityPolicy{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-policy",
-			Namespace: "test-namespace",
+		Spec: ngfAPI.ObservabilityPolicySpec{
+			Tracing: &ngfAPI.Tracing{
+				Ratio: helpers.GetPointer[int32](25),
+			},
 		},
 	}
 
 	g := NewWithT(t)
-	g.Expect(observability.CreateRatioVarName(pol)).To(Equal("$ratio_ns_test_namespace_name_test_policy"))
+	g.Expect(observability.CreateRatioVarName(pol)).To(Equal("$otel_ratio_25"))
 }

internal/mode/static/state/dataplane/configuration.go

@@ -641,8 +641,8 @@ func buildTelemetry(g *graph.Graph) Telemetry {
 	for _, pol := range g.NGFPolicies {
 		if obsPol, ok := pol.Source.(*ngfAPI.ObservabilityPolicy); ok {
 			if obsPol.Spec.Tracing != nil && obsPol.Spec.Tracing.Ratio != nil && *obsPol.Spec.Tracing.Ratio > 0 {
-				nsName := observability.CreateRatioVarName(obsPol)
-				ratioMap[nsName] = *obsPol.Spec.Tracing.Ratio
+				ratioName := observability.CreateRatioVarName(obsPol)
+				ratioMap[ratioName] = *obsPol.Spec.Tracing.Ratio
 			}
 		}
 	}

internal/mode/static/state/dataplane/configuration_test.go

@@ -3059,7 +3059,7 @@ func TestBuildTelemetry(t *testing.T) {
 			},
 			expTelemetry: createModifiedTelemetry(func(t Telemetry) Telemetry {
 				t.Ratios = []Ratio{
-					{Name: "$ratio_ns_custom_ns_name_obsPolicy", Value: 25},
+					{Name: "$otel_ratio_25", Value: 25},
 				}
 				return t
 			}),