tracer: move es transport to net/http + format

This commit is contained in:
cortze 2023-05-22 09:43:07 +02:00
parent bb92984dca
commit 42d2f4d7e4
3 changed files with 3 additions and 76 deletions

View File

@ -645,7 +645,7 @@ func (trw *tracerWrapper) Trace(evt *pubsub_pb.TraceEvent) {
}
}
// check if there was any of the Iwant msgs
validIwant := len(iwant) > 0
validIwant := len(iwant) > 0
// trace the msgs if any of the flags was triggered
if validIhave || validIwant || validTopic {

View File

@ -5,6 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/url"
"time"
@ -34,7 +35,7 @@ func NewElasticSearchTransport(connectionString string, elasticsearchIndex strin
},
Username: username,
Password: password,
Transport: &FastHttpTransport{},
Transport: &http.Transport{},
}
es, err := elasticsearch.NewClient(cfg)

View File

@ -1,74 +0,0 @@
package tracer
import (
"io"
"net/http"
"strings"
"github.com/valyala/fasthttp"
)
// Transport implements the elastictransport interface with
// the github.com/valyala/fasthttp HTTP client.
type FastHttpTransport struct{}
// RoundTrip performs the request and returns a response or error
func (t *FastHttpTransport) RoundTrip(req *http.Request) (*http.Response, error) {
freq := fasthttp.AcquireRequest()
defer fasthttp.ReleaseRequest(freq)
fres := fasthttp.AcquireResponse()
defer fasthttp.ReleaseResponse(fres)
t.copyRequest(freq, req)
err := fasthttp.Do(freq, fres)
if err != nil {
return nil, err
}
res := &http.Response{Header: make(http.Header)}
t.copyResponse(res, fres)
return res, nil
}
// copyRequest converts a http.Request to fasthttp.Request
func (t *FastHttpTransport) copyRequest(dst *fasthttp.Request, src *http.Request) *fasthttp.Request {
if src.Method == "GET" && src.Body != nil {
src.Method = "POST"
}
dst.SetHost(src.Host)
dst.SetRequestURI(src.URL.String())
dst.Header.SetRequestURI(src.URL.String())
dst.Header.SetMethod(src.Method)
for k, vv := range src.Header {
for _, v := range vv {
dst.Header.Set(k, v)
}
}
if src.Body != nil {
dst.SetBodyStream(src.Body, -1)
}
return dst
}
// copyResponse converts a http.Response to fasthttp.Response
func (t *FastHttpTransport) copyResponse(dst *http.Response, src *fasthttp.Response) *http.Response {
dst.StatusCode = src.StatusCode()
src.Header.VisitAll(func(k, v []byte) {
dst.Header.Set(string(k), string(v))
})
// Cast to a string to make a copy seeing as src.Body() won't
// be valid after the response is released back to the pool (fasthttp.ReleaseResponse).
dst.Body = io.NopCloser(strings.NewReader(string(src.Body())))
return dst
}