From ce7e18fbf944820f409eaecc03b0650653a0b72a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 00:13:02 -0400
Subject: [PATCH] [8.10] fix: add back gzip support for grpc otlp endpoint
 (backport #11434) (#11436)

(cherry picked from commit cfce80b64dfc26b1ee0a61b9fa5ef276589c71ec)

Co-authored-by: kruskall <99559985+kruskall@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 8ac7b30b29a..6bf2155c870 100644
--- a/internal/beater/beater.go
+++ b/internal/beater/beater.go
@@ -39,6 +39,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 b2bf3833b88..5d3a84b10c5 100644
--- a/systemtest/otlp_test.go
+++ b/systemtest/otlp_test.go
@@ -206,7 +206,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.NewGRPCClient(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()