From 50fcc8a8bc18389481c81e8e5f39fe1e2ad01a0f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:50:58 +0000 Subject: [PATCH] [8.9] fix: add back gzip support for grpc otlp endpoint (backport #11434) (#11435) * fix: add back gzip support for grpc otlp endpoint (#11434) * fix: add back gzip support for grpc otlp endpoint * changelog: add changelog entry (cherry picked from commit cfce80b64dfc26b1ee0a61b9fa5ef276589c71ec) # Conflicts: # changelogs/head.asciidoc * changelog: delete head changelog --------- Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- internal/beater/beater.go | 1 + systemtest/otlp_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/beater/beater.go b/internal/beater/beater.go index 015a2efc9d3..6f0338a2a1d 100644 --- a/internal/beater/beater.go +++ b/internal/beater/beater.go @@ -36,6 +36,7 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" "google.golang.org/grpc" + _ "google.golang.org/grpc/encoding/gzip" "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" diff --git a/systemtest/otlp_test.go b/systemtest/otlp_test.go index 7171c4b9255..76c97fa278c 100644 --- a/systemtest/otlp_test.go +++ b/systemtest/otlp_test.go @@ -209,7 +209,7 @@ func TestOTLPGRPCMetrics(t *testing.T) { // opentelemetry-go does not support sending Summary metrics, // so we send them using the lower level OTLP/gRPC client. - conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock()) + conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip"))) require.NoError(t, err) defer conn.Close() metricsClient := pmetricotlp.NewClient(conn) @@ -238,7 +238,7 @@ func TestOTLPGRPCLogs(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock()) + conn, err := grpc.Dial(serverAddr(srv), grpc.WithInsecure(), grpc.WithBlock(), grpc.WithDefaultCallOptions(grpc.UseCompressor("gzip"))) require.NoError(t, err) defer conn.Close()