Skip to content

Commit

Permalink
finalize trace when connection is hijacked / upgraded to grpc, websoc…
Browse files Browse the repository at this point in the history
…ket...
  • Loading branch information
dhontecillas committed Feb 27, 2024
1 parent 66643a0 commit 33d60ff
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 14 deletions.
37 changes: 24 additions & 13 deletions http/server/response_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import (
)

type TrackingResponseWriter struct {
track *tracking
recordHeaders bool
rw http.ResponseWriter
flusher http.Flusher
hijacker http.Hijacker
track *tracking
recordHeaders bool
rw http.ResponseWriter
flusher http.Flusher
hijacker http.Hijacker
hijackCallback func()
}

func (w *TrackingResponseWriter) gatherHeaders() {
Expand Down Expand Up @@ -51,10 +52,18 @@ func (w *TrackingResponseWriter) WriteHeader(statusCode int) {
}

func (w *TrackingResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
var c net.Conn
var rw *bufio.ReadWriter
if w.hijacker != nil {
return w.hijacker.Hijack()
c, rw, w.track.hijackedErr = w.hijacker.Hijack()
} else {
w.track.hijackedErr = fmt.Errorf("not implements Hijacker interface")
}
return nil, nil, fmt.Errorf("not implemented")
w.track.isHijacked = true
if w.hijackCallback != nil {
w.hijackCallback()
}
return c, rw, w.track.hijackedErr
}

func (w *TrackingResponseWriter) Flush() {
Expand All @@ -63,12 +72,14 @@ func (w *TrackingResponseWriter) Flush() {
}
}

func newTrackingResponseWriter(rw http.ResponseWriter, t *tracking, recordHeaders bool) *TrackingResponseWriter {
func newTrackingResponseWriter(rw http.ResponseWriter, t *tracking, recordHeaders bool,
hijackCallback func()) *TrackingResponseWriter {
return &TrackingResponseWriter{
track: t,
recordHeaders: recordHeaders,
rw: rw,
flusher: rw.(http.Flusher),
hijacker: rw.(http.Hijacker),
track: t,
recordHeaders: recordHeaders,
rw: rw,
flusher: rw.(http.Flusher),
hijacker: rw.(http.Hijacker),
hijackCallback: hijackCallback,
}
}
6 changes: 5 additions & 1 deletion http/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ func (h *trackingHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
r = r.WithContext(t.ctx)

if h.metrics != nil || h.traces != nil {
rw = newTrackingResponseWriter(rw, t, h.reportHeaders)
rw = newTrackingResponseWriter(rw, t, h.reportHeaders, func() {
t.Finish()
h.traces.end(t)
h.metrics.report(t, r)
})
}

t.Start()
Expand Down
7 changes: 7 additions & 0 deletions http/server/traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ func (t *tracesHTTP) end(tr *tracking) {
return
}

if tr.isHijacked {
tr.span.SetAttributes(attribute.Bool("http.connection.hijacked", true))
if tr.hijackedErr != nil {
tr.span.SetAttributes(attribute.String("http.connection.error", tr.hijackedErr.Error()))
}
}

tr.span.SetAttributes(
semconv.HTTPRoute(tr.EndpointPattern()),
semconv.HTTPResponseStatusCode(tr.responseStatus),
Expand Down
5 changes: 5 additions & 0 deletions http/server/tracking.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@ type tracking struct {
responseHeaders map[string][]string
writeErrs []error
endpointPattern string
isHijacked bool
hijackedErr error
}

func (t *tracking) EndpointPattern() string {
if len(t.endpointPattern) == 0 {
if t.isHijacked {
return "Upgraded Connection"
}
return "404 Not Found"
}
return t.endpointPattern
Expand Down

0 comments on commit 33d60ff

Please sign in to comment.