[query] Use OTEL's helpers for http server

cmd/query/app/apiv3/http_gateway.go

@@ -60,18 +60,16 @@ func (h *HTTPGateway) RegisterRoutes(router *mux.Router) {
 
 // addRoute adds a new endpoint to the router with given path and handler function.
 // This code is mostly copied from ../http_handler.
-func (h *HTTPGateway) addRoute(
+func (*HTTPGateway) addRoute(
 	router *mux.Router,
 	f func(http.ResponseWriter, *http.Request),
 	route string,
 	_ ...any, /* args */
 ) *mux.Route {
 	var handler http.Handler = http.HandlerFunc(f)
-	traceMiddleware := otelhttp.NewHandler(
-		otelhttp.WithRouteTag(route, handler),
-		route,
-		otelhttp.WithTracerProvider(h.Tracer))
-	return router.HandleFunc(route, traceMiddleware.ServeHTTP)
+	handler = otelhttp.WithRouteTag(route, handler)
+	handler = spanNameHandler(route, handler)
+	return router.HandleFunc(route, handler.ServeHTTP)
 }
 
 // tryHandleError checks if the passed error is not nil and handles it by writing
@@ -242,3 +240,11 @@ func (h *HTTPGateway) getOperations(w http.ResponseWriter, r *http.Request) {
 	}
 	h.marshalResponse(&api_v3.GetOperationsResponse{Operations: apiOperations}, w)
 }
+
+func spanNameHandler(spanName string, handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		span := trace.SpanFromContext(r.Context())
+		span.SetName(spanName)
+		handler.ServeHTTP(w, r)
+	})
+}

cmd/query/app/http_handler.go

@@ -132,11 +132,10 @@ func (aH *APIHandler) handleFunc(
 ) *mux.Route {
 	route := aH.formatRoute(routeFmt, args...)
 	var handler http.Handler = http.HandlerFunc(f)
-	traceMiddleware := otelhttp.NewHandler(
-		otelhttp.WithRouteTag(route, traceResponseHandler(handler)),
-		route,
-		otelhttp.WithTracerProvider(aH.tracer))
-	return router.HandleFunc(route, traceMiddleware.ServeHTTP)
+	handler = traceResponseHandler(handler)
+	handler = otelhttp.WithRouteTag(route, handler)
+	handler = spanNameHandler(route, handler)
+	return router.HandleFunc(route, handler.ServeHTTP)
 }
 
 func (aH *APIHandler) formatRoute(route string, args ...any) string {
@@ -532,3 +531,11 @@ func traceResponseHandler(handler http.Handler) http.Handler {
 		handler.ServeHTTP(w, r)
 	})
 }
+
+func spanNameHandler(spanName string, handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		span := trace.SpanFromContext(r.Context())
+		span.SetName(spanName)
+		handler.ServeHTTP(w, r)
+	})
+}

cmd/query/app/http_handler_test.go

@@ -329,9 +329,6 @@ func TestGetTrace(t *testing.T) {
 			require.NoError(t, err)
 			assert.Empty(t, response.Errors)
 
-			assert.Len(t, exporter.GetSpans(), 1, "HTTP request was traced and span reported")
-			assert.Equal(t, "/api/traces/{traceID}", exporter.GetSpans()[0].Name)
-
 			traces := extractTraces(t, &response)
 			assert.Len(t, traces[0].Spans, 2)
 			assert.Len(t, traces[0].Spans[1].References, testCase.numSpanRefs)

cmd/query/app/server.go

@@ -91,8 +91,12 @@
 		return nil, err
 	}
 	registerGRPCHandlers(grpcServer, querySvc, metricsQuerySvc, telset)
-
-	httpServer, err := createHTTPServer(ctx, querySvc, metricsQuerySvc, options, tm, telset)
+	var httpServer *httpServer
+	if !separatePorts {
+		httpServer, err = createHTTPServerLegacy(ctx, querySvc, metricsQuerySvc, options, tm, telset)
+	} else {
+		httpServer, err = createHTTPServerOTEL(ctx, querySvc, metricsQuerySvc, options, tm, telset)
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -243,7 +247,7 @@
 	return handler, staticHandlerCloser
 }
 
-func createHTTPServer(
+func createHTTPServerLegacy(
 	ctx context.Context,
 	querySvc *querysvc.QueryService,
 	metricsQuerySvc querysvc.MetricsQueryService,
@@ -254,18 +258,58 @@
 	handler, staticHandlerCloser := initRouter(querySvc, metricsQuerySvc, queryOpts, tm, telset)
 	handler = responseHeadersHandler(handler, queryOpts.HTTP.ResponseHeaders)
 	handler = handlers.CompressHandler(handler)
-	recoveryHandler := recoveryhandler.NewRecoveryHandler(telset.Logger, true)
-
+	handler = recoveryhandler.NewRecoveryHandler(telset.Logger, true)(handler)
 	errorLog, _ := zap.NewStdLogAt(telset.Logger, zapcore.ErrorLevel)
 	server := &httpServer{
 		Server: &http.Server{
-			Handler:           recoveryHandler(handler),
+			Handler:           handler,
 			ErrorLog:          errorLog,
 			ReadHeaderTimeout: 2 * time.Second,
 		},
 		staticHandlerCloser: staticHandlerCloser,
 	}
 
+	if queryOpts.HTTP.TLSSetting != nil {
+		tlsCfg, err := queryOpts.HTTP.TLSSetting.LoadTLSConfig(ctx) // This checks if the certificates are correctly provided
+		if err != nil {
+			return nil, errors.Join(err, staticHandlerCloser.Close())
+		}
+		server.TLSConfig = tlsCfg
+	}
+	return server, nil
+}
+
+func createHTTPServerOTEL(
+	ctx context.Context,
+	querySvc *querysvc.QueryService,
+	metricsQuerySvc querysvc.MetricsQueryService,
+	queryOpts *QueryOptions,
+	tm *tenancy.Manager,
+	telset telemetery.Setting,
+) (*httpServer, error) {
+	handler, staticHandlerCloser := initRouter(querySvc, metricsQuerySvc, queryOpts, tm, telset)
+	handler = recoveryhandler.NewRecoveryHandler(telset.Logger, true)(handler)
+	hs, err := queryOpts.HTTP.ToServer(
+		ctx,
+		telset.Host,
+		component.TelemetrySettings{
+			Logger:         telset.Logger,
+			TracerProvider: telset.TracerProvider,
+			LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
+				return noop.NewMeterProvider()
+			},
+		},
+		handler,
+	)
+	if err != nil {
+		return nil, errors.Join(err, staticHandlerCloser.Close())
+	}
+	server := &httpServer{
+		Server:              hs,
+		staticHandlerCloser: staticHandlerCloser,
+	}
+
+	// TODO why doesn't OTEL helper do that already?
 	if queryOpts.HTTP.TLSSetting != nil {
 		tlsCfg, err := queryOpts.HTTP.TLSSetting.LoadTLSConfig(ctx) // This checks if the certificates are correctly provided
 		if err != nil {
@@ -293,7 +337,7 @@
 			return nil, err
 		}
 
-		s.httpConn, err = net.Listen("tcp", s.queryOptions.HTTP.Endpoint)
+		s.httpConn, err = s.queryOptions.HTTP.ToListener(ctx)
 		if err != nil {
 			return nil, err
 		}

cmd/query/app/server_test.go

@@ -881,32 +881,30 @@ func TestServerHTTP_TracesRequest(t *testing.T) {
 		expectedTrace string
 	}{
 		{
-			name:          "different ports",
+			name:          "different ports (OTEL implementation)",
 			httpEndpoint:  ":8080",
 			grpcEndpoint:  ":8081",
 			queryString:   "/api/traces/123456aBC",
 			expectedTrace: "/api/traces/{traceID}",
 		},
 		{
-			name:          "different ports for v3 api",
+			name:          "different ports (OTEL implementation) for v3 api",
 			httpEndpoint:  ":8080",
 			grpcEndpoint:  ":8081",
 			queryString:   "/api/v3/traces/123456aBC",
 			expectedTrace: "/api/v3/traces/{trace_id}",
 		},
 		{
-			name:          "same port",
-			httpEndpoint:  ":8080",
-			grpcEndpoint:  ":8080",
-			queryString:   "/api/traces/123456aBC",
-			expectedTrace: "/api/traces/{traceID}",
+			name:         "same port (legacy implementation) [no tracing]",
+			httpEndpoint: ":8080",
+			grpcEndpoint: ":8080",
+			queryString:  "/api/traces/123456aBC",
 		},
 		{
-			name:          "same port for v3 api",
-			httpEndpoint:  ":8080",
-			grpcEndpoint:  ":8080",
-			queryString:   "/api/v3/traces/123456aBC",
-			expectedTrace: "/api/v3/traces/{trace_id}",
+			name:         "same port (legacy implementation) for v3 api [no tracing]",
+			httpEndpoint: ":8080",
+			grpcEndpoint: ":8080",
+			queryString:  "/api/v3/traces/123456aBC",
 		},
 	}