Fix span never close

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

Author: gearnode

httpserver/httpserver.go

@@ -22,6 +22,7 @@ import (
 	stdlog "log"
 	"net"
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -91,20 +92,30 @@ func NewServer(addr string, h http.Handler, options ...Option) *http.Server {
 		),
 	)
 
+	connSpans := &sync.Map{}
+
 	return &http.Server{
 		Addr:              addr,
 		Handler:           handler,
 		ErrorLog:          stdlog.New(logger, "", 0),
 		ReadHeaderTimeout: 5 * time.Second,
 		IdleTimeout:       15 * time.Second,
 		ConnContext: func(ctx context.Context, c net.Conn) context.Context {
-			ctx, _ = tracer.Start(ctx, "http.connection",
+			ctx, span := tracer.Start(ctx, "http.connection",
 				trace.WithSpanKind(trace.SpanKindServer),
 				trace.WithAttributes(
 					attribute.String("net.peer.addr", c.RemoteAddr().String()),
 				),
 			)
+			connSpans.Store(c, span)
 			return ctx
 		},
+		ConnState: func(c net.Conn, state http.ConnState) {
+			if state == http.StateClosed || state == http.StateHijacked {
+				if span, ok := connSpans.LoadAndDelete(c); ok {
+					span.(trace.Span).End()
+				}
+			}
+		},
 	}
 }