From ce6f5a769c15f00687b0eb6eedb23d99cf69ec7d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 20:30:37 +0000 Subject: [PATCH] refactor: pass metric prefix to handler for consistency with otlp (#15444) (#15515) (cherry picked from commit 310dc3c182e3efa67b91394a2a6ec375ce9be2bf) Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- internal/beater/api/mux.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/beater/api/mux.go b/internal/beater/api/mux.go index 712bf933a7..2e4dc8439c 100644 --- a/internal/beater/api/mux.go +++ b/internal/beater/api/mux.go @@ -125,7 +125,7 @@ func NewMux( {AgentConfigRUMPath, builder.rumAgentConfigHandler(fetcher, meterProvider)}, {IntakeRUMPath, rumIntakeHandler}, {IntakeRUMV3Path, rumIntakeHandler}, - {IntakePath, builder.backendIntakeHandler(meterProvider)}, + {IntakePath, builder.backendIntakeHandler("apm-server.server.", meterProvider)}, {OTLPTracesIntakePath, builder.otlpHandler(otlpHandlers.HandleTraces, "apm-server.otlp.http.traces.", meterProvider)}, {OTLPMetricsIntakePath, builder.otlpHandler(otlpHandlers.HandleMetrics, "apm-server.otlp.http.metrics.", meterProvider)}, {OTLPLogsIntakePath, builder.otlpHandler(otlpHandlers.HandleLogs, "apm-server.otlp.http.logs.", meterProvider)}, @@ -171,10 +171,10 @@ type routeBuilder struct { intakeSemaphore input.Semaphore } -func (r *routeBuilder) backendIntakeHandler(mp metric.MeterProvider) func() (request.Handler, error) { +func (r *routeBuilder) backendIntakeHandler(metricsPrefix string, mp metric.MeterProvider) func() (request.Handler, error) { return func() (request.Handler, error) { h := intake.Handler(mp, r.intakeProcessor, backendRequestMetadataFunc(r.cfg), r.batchProcessor) - return middleware.Wrap(h, backendMiddleware(r.cfg, r.authenticator, r.ratelimitStore, "apm-server.server.", mp)...) + return middleware.Wrap(h, backendMiddleware(r.cfg, r.authenticator, r.ratelimitStore, metricsPrefix, mp)...) } }