Skip to content

feat: remove WithHTTP2Only option #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: remove WithHTTP2Only option #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions transport/httpcommon/httpcommon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"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"
Expand Down Expand Up @@ -76,7 +75,6 @@

extraSettings struct {
logger *logp.Logger
http2 bool
}

dialerOption interface {
Expand Down Expand Up @@ -248,14 +246,7 @@
}

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 {
Expand All @@ -270,7 +261,7 @@
dialer, tlsDialer transport.Dialer,
opts ...TransportOption,
) *http.Transport {
t := http.DefaultTransport.(*http.Transport).Clone()

Check failure on line 264 in transport/httpcommon/httpcommon.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

Error return value is not checked (errcheck)
t.DialContext = dialer.DialContext
t.DialTLSContext = tlsDialer.DialContext
t.TLSClientConfig = tls.ToConfig()
Expand All @@ -291,21 +282,6 @@
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) {
Expand Down Expand Up @@ -357,13 +333,6 @@
})
}

// 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) {
Expand Down
Loading