From cf08acc13fbdc98068d93794f1d6819af6aee0d8 Mon Sep 17 00:00:00 2001
From: kruskal <99559985+kruskall@users.noreply.github.com>
Date: Tue, 26 Aug 2025 02:24:02 +0200
Subject: [PATCH] feat: remove WithHTTP2Only option

HTTP/2 has been enabled by default since a long time

the x/net/http2 package has been mostly integrated in the stdlib
and ForceAttemptHTTP2 is used to control HTTP/2
---
 transport/httpcommon/httpcommon.go | 33 +-----------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/transport/httpcommon/httpcommon.go b/transport/httpcommon/httpcommon.go
index 3ef5498..edc53fd 100644
--- a/transport/httpcommon/httpcommon.go
+++ b/transport/httpcommon/httpcommon.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"go.elastic.co/apm/module/apmhttp/v2"
-	"golang.org/x/net/http2"
 
 	"github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
@@ -76,7 +75,6 @@ type (
 
 	extraSettings struct {
 		logger *logp.Logger
-		http2  bool
 	}
 
 	dialerOption interface {
@@ -248,14 +246,7 @@ func (settings *HTTPTransportSettings) RoundTripper(opts ...TransportOption) (ht
 	}
 
 	var rt http.RoundTripper
-	if extra.http2 {
-		rt, err = settings.http2RoundTripper(tls, dialer, tlsDialer, opts...)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		rt = settings.httpRoundTripper(tls, dialer, tlsDialer, opts...)
-	}
+	rt = settings.httpRoundTripper(tls, dialer, tlsDialer, opts...)
 
 	for _, opt := range opts {
 		if rtOpt, ok := opt.(roundTripperOption); ok {
@@ -291,21 +282,6 @@ func (settings *HTTPTransportSettings) httpRoundTripper(
 	return t
 }
 
-func (settings *HTTPTransportSettings) http2RoundTripper(
-	tls *tlscommon.TLSConfig,
-	dialer, tlsDialer transport.Dialer,
-	opts ...TransportOption,
-) (*http2.Transport, error) {
-	t1 := settings.httpRoundTripper(tls, dialer, tlsDialer, opts...)
-	t2, err := http2.ConfigureTransports(t1)
-	if err != nil {
-		return nil, err
-	}
-
-	t2.AllowHTTP = true
-	return t2, nil
-}
-
 // Client creates a new http.Client with configured Transport. The transport is
 // instrumented using apmhttp.WrapRoundTripper.
 func (settings HTTPTransportSettings) Client(opts ...TransportOption) (*http.Client, error) {
@@ -357,13 +333,6 @@ func WithTransportFunc(fn func(*http.Transport)) TransportOption {
 	})
 }
 
-// WithHTTP2Only will ensure that a HTTP 2 only roundtripper is created.
-func WithHTTP2Only(b bool) TransportOption {
-	return extraOptionFunc(func(settings *extraSettings) {
-		settings.http2 = b
-	})
-}
-
 // WithForceAttemptHTTP2 sets the `http.Tansport.ForceAttemptHTTP2` field.
 func WithForceAttemptHTTP2(b bool) TransportOption {
 	return transportOptFunc(func(settings *HTTPTransportSettings, t *http.Transport) {