accesslog: remove ALS gRPC initialMetadata (envoyproxy#3751)

remove ALS gRPC initialMetadata Signed-off-by: zirain <zirain2009@gmail.com>
guydc · Jul 12, 2024 · b9d1493 · b9d1493
1 parent 11dd6d3
commit b9d1493
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 41 deletions.
diff --git a/internal/xds/translator/accesslog.go b/internal/xds/translator/accesslog.go
@@ -6,7 +6,6 @@
 package translator
 
 import (
-	"encoding/json"
 	"errors"
 	"sort"
 	"strings"
@@ -190,27 +189,6 @@ func buildXdsAccessLog(al *ir.AccessLog, forListener bool) []*accesslog.AccessLo
 			TransportApiVersion: cfgcore.ApiVersion_V3,
 		}
 
-		// include text and json format as metadata when initiating stream
-		md := make([]*cfgcore.HeaderValue, 0, 2)
-
-		if als.Text != nil && *als.Text != "" {
-			md = append(md, &cfgcore.HeaderValue{
-				Key:   "x-accesslog-text",
-				Value: strings.ReplaceAll(strings.Trim(*als.Text, "\x00\n\r"), "\x00\n\r", " "),
-			})
-		}
-
-		if len(als.Attributes) > 0 {
-			if attr, err := json.Marshal(als.Attributes); err == nil {
-				md = append(md, &cfgcore.HeaderValue{
-					Key:   "x-accesslog-attr",
-					Value: string(attr),
-				})
-			}
-		}
-
-		cc.GrpcService.InitialMetadata = md
-
 		switch als.Type {
 		case egv1a1.ALSEnvoyProxyAccessLogTypeHTTP:
 			alCfg := &grpcaccesslog.HttpGrpcAccessLogConfig{

diff --git a/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/accesslog.listeners.yaml
@@ -43,14 +43,6 @@
         grpcService:
           envoyGrpc:
             clusterName: accesslog/monitoring/envoy-als/port/9000
-          initialMetadata:
-          - key: x-accesslog-text
-            value: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%
-              %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT%
-              %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%"
-              "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"'
-          - key: x-accesslog-attr
-            value: '{"attr1":"value1","attr2":"value2"}'
         transportApiVersion: V3
   - filter:
       responseFlagFilter:
@@ -127,15 +119,6 @@
               grpcService:
                 envoyGrpc:
                   clusterName: accesslog/monitoring/envoy-als/port/9000
-                initialMetadata:
-                - key: x-accesslog-text
-                  value: '[%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%
-                    %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED%
-                    %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%
-                    "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%"
-                    "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%"'
-                - key: x-accesslog-attr
-                  value: '{"attr1":"value1","attr2":"value2"}'
               transportApiVersion: V3
         - name: envoy.access_loggers.open_telemetry
           typedConfig:

diff --git a/tools/make/kube.mk b/tools/make/kube.mk
@@ -120,7 +120,7 @@ experimental-conformance: create-cluster kube-install-image kube-deploy run-expe
 benchmark: create-cluster kube-install-image kube-deploy-for-benchmark-test run-benchmark delete-cluster ## Create a kind cluster, deploy EG into it, run Envoy Gateway benchmark test, and clean up.
 
 .PHONY: e2e
-e2e: create-cluster kube-install-image kube-deploy install-ratelimit run-e2e delete-cluster
+e2e: create-cluster kube-install-image kube-deploy install-ratelimit install-e2e-telemetry run-e2e delete-cluster
 
 .PHONY: install-ratelimit
 install-ratelimit:
@@ -133,7 +133,7 @@ install-ratelimit:
 	kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-ratelimit --for=condition=Available
 
 .PHONY: run-e2e
-run-e2e: install-e2e-telemetry
+run-e2e: ## Run e2e tests
 	@$(LOG_TARGET)
 	kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-ratelimit --for=condition=Available
 	kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-gateway --for=condition=Available