[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 cfce80b) # Conflicts: # changelogs/head.asciidoc * changelog: delete head changelog --------- Co-authored-by: kruskall <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
elastic · Aug 22, 2023 · 50fcc8a · 50fcc8a
1 parent 4990ac2
commit 50fcc8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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()