Skip to content

Commit

Permalink
Merge branch 'main' into lukasmalkmus/dx-457-tabular-result-format-su…
Browse files Browse the repository at this point in the history
…pport-for-axiom
  • Loading branch information
dasfmi authored Aug 13, 2024
2 parents ce78037 + 8277f4f commit 166ac19
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions axiom/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ import (
"mime"
"net"
"net/http"
"net/http/httptrace"
"net/url"
"strings"
"time"

"github.com/cenkalti/backoff/v4"
"github.com/klauspost/compress/gzhttp"
"go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -71,7 +69,7 @@ func DefaultHTTPTransport() http.RoundTripper {
KeepAlive: time.Second * 30,
}).DialContext,
IdleConnTimeout: time.Second * 90,
ResponseHeaderTimeout: time.Second * 10,
ResponseHeaderTimeout: time.Second * 30,
TLSHandshakeTimeout: time.Second * 10,
ExpectContinueTimeout: time.Second * 1,
ForceAttemptHTTP2: true,
Expand Down Expand Up @@ -215,7 +213,6 @@ func (c *Client) NewRequest(ctx context.Context, method, path string, body any)
}
}

ctx = httptrace.WithClientTrace(ctx, otelhttptrace.NewClientTrace(ctx))
req, err := http.NewRequestWithContext(ctx, method, endpoint.String(), r)
if err != nil {
return nil, err
Expand Down

0 comments on commit 166ac19

Please sign in to comment.