Code review

Author: sjberman

internal/mode/static/nginx/config/generator_test.go

@@ -99,11 +99,11 @@ func TestGenerate(t *testing.T) {
 	g.Expect(httpCfg).To(ContainSubstring("upstream"))
 	g.Expect(httpCfg).To(ContainSubstring("split_clients"))
 
-	g.Expect(httpCfg).To(ContainSubstring(`endpoint "1.2.3.4:123";`))
-	g.Expect(httpCfg).To(ContainSubstring(`interval "5s";`))
+	g.Expect(httpCfg).To(ContainSubstring("endpoint 1.2.3.4:123;"))
+	g.Expect(httpCfg).To(ContainSubstring("interval 5s;"))
 	g.Expect(httpCfg).To(ContainSubstring("batch_size 512;"))
 	g.Expect(httpCfg).To(ContainSubstring("batch_count 4;"))
-	g.Expect(httpCfg).To(ContainSubstring(`otel_service_name "ngf:gw-ns:gw-name:my-name";`))
+	g.Expect(httpCfg).To(ContainSubstring("otel_service_name ngf:gw-ns:gw-name:my-name;"))
 
 	g.Expect(files[2].Path).To(Equal("/etc/nginx/conf.d/matches.json"))
 

internal/mode/static/nginx/config/telemetry_template.go

@@ -2,9 +2,9 @@ package config
 
 const otelTemplateText = `
 otel_exporter {
-	endpoint "{{ .Endpoint }}";
+	endpoint {{ .Endpoint }};
 	{{- if .Interval }}
-	interval "{{ .Interval }}";
+	interval {{ .Interval }};
 	{{- end }}
 	{{- if .BatchSize }}
 	batch_size {{ .BatchSize }};
@@ -14,7 +14,7 @@ otel_exporter {
 	{{- end }}
 }
 
-otel_service_name "{{ .ServiceName }}";
+otel_service_name {{ .ServiceName }};
 
 {{- range $attr := .SpanAttributes }}
 otel_span_attr "{{ $attr.Key }}" "{{ $attr.Value }}";

internal/mode/static/nginx/config/telemetry_test.go

@@ -32,12 +32,12 @@ func TestExecuteTelemetry(t *testing.T) {
 
 	g := NewWithT(t)
 	expSubStrings := map[string]int{
-		`endpoint "1.2.3.4:123";`:                        1,
-		`otel_service_name "ngf:gw-ns:gw-name:my-name";`: 1,
-		`interval "5s";`:                                 1,
-		"batch_size 512;":                                1,
-		"batch_count 4;":                                 1,
-		"otel_span_attr":                                 2,
+		"endpoint 1.2.3.4:123;":                        1,
+		"otel_service_name ngf:gw-ns:gw-name:my-name;": 1,
+		"interval 5s;":                                 1,
+		"batch_size 512;":                              1,
+		"batch_count 4;":                               1,
+		"otel_span_attr":                               2,
 	}
 
 	for expSubStr, expCount := range expSubStrings {

internal/mode/static/nginx/config/validation/generic.go

@@ -23,7 +23,7 @@ const (
 
 var alphaNumericStringFmtRegexp = regexp.MustCompile("^" + alphaNumericStringFmt + "$")
 
-// ValidateServiceName validates a k8s service name that can only use alphanumeric characters.
+// ValidateServiceName validates a service name that can only use alphanumeric characters.
 func (GenericValidator) ValidateServiceName(name string) error {
 	if !alphaNumericStringFmtRegexp.MatchString(name) {
 		examples := []string{