handler/meter: export Options

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

handler.go

@@ -436,11 +436,12 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var sp tracer.Span
 	if !match && h.hd != nil {
 		if hdlr, ok := h.hd.Handler().(http.Handler); ok {
-			if !slices.Contains(tracer.DefaultSkipEndpoints, h.hd.Name()) {
+			endpointName := fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name)
-				ctx, sp = h.opts.Tracer.Start(ctx, h.hd.Name()+" rpc-server",
+			if !slices.Contains(tracer.DefaultSkipEndpoints, endpointName) {
+				ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server",
 					tracer.WithSpanKind(tracer.SpanKindServer),
 					tracer.WithSpanLabels(
-						"endpoint", h.hd.Name(),
+						"endpoint", endpointName,
 					),
 				)
 				defer func() {
@@ -452,20 +453,20 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				}()
 			}
 
-			if !slices.Contains(meter.DefaultSkipEndpoints, h.hd.Name()) {
+			if !slices.Contains(meter.DefaultSkipEndpoints, endpointName) {
-				h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", h.hd.Name()).Inc()
+				h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "http").Inc()
 
 				defer func() {
 					n := GetRspCode(ctx)
 					if n > 399 {
-						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", h.hd.Name(), "status", "success", "code", strconv.Itoa(n)).Inc()
+						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "http", "status", "success", "code", strconv.Itoa(n)).Inc()
 					} else {
-						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", h.hd.Name(), "status", "failure", "code", strconv.Itoa(n)).Inc()
+						h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "http", "status", "failure", "code", strconv.Itoa(n)).Inc()
 					}
 					te := time.Since(ts)
-					h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", h.hd.Name()).Update(te.Seconds())
+					h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", endpointName, "server", "http").Update(te.Seconds())
-					h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", h.hd.Name()).Update(te.Seconds())
+					h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", endpointName, "server", "http").Update(te.Seconds())
-					h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", h.hd.Name()).Dec()
+					h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "http").Dec()
 				}()
 			}
 
@@ -475,10 +476,11 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	} else if !match {
 		// check for http.HandlerFunc handlers
 		if !slices.Contains(tracer.DefaultSkipEndpoints, r.URL.Path) {
-			ctx, sp = h.opts.Tracer.Start(ctx, r.URL.Path+" rpc-server",
+			ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server",
 				tracer.WithSpanKind(tracer.SpanKindServer),
 				tracer.WithSpanLabels(
 					"endpoint", r.URL.Path,
+					"server", "http",
 				),
 			)
 
@@ -500,10 +502,12 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	endpointName := fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name)
+
 	topts := []tracer.SpanOption{
 		tracer.WithSpanKind(tracer.SpanKindServer),
 		tracer.WithSpanLabels(
 			"endpoint", endpointName,
+			"server", "http",
 		),
 	}
 
@@ -511,20 +515,20 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		topts = append(topts, tracer.WithSpanRecord(false))
 	}
 
-	ctx, sp = h.opts.Tracer.Start(ctx, endpointName+" rpc-server", topts...)
+	ctx, sp = h.opts.Tracer.Start(ctx, "rpc-server", topts...)
 
 	if !slices.Contains(meter.DefaultSkipEndpoints, handler.name) {
 		defer func() {
 			te := time.Since(ts)
-			h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", handler.name).Update(te.Seconds())
+			h.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", handler.name, "server", "http").Update(te.Seconds())
-			h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", handler.name).Update(te.Seconds())
+			h.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", handler.name, "server", "http").Update(te.Seconds())
-			h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", handler.name).Dec()
+			h.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", handler.name, "server", "http").Dec()
 
 			n := GetRspCode(ctx)
 			if n > 399 {
-				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "status", "failure", "code", strconv.Itoa(n)).Inc()
+				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "server", "http", "status", "failure", "code", strconv.Itoa(n)).Inc()
 			} else {
-				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "status", "success", "code", strconv.Itoa(n)).Inc()
+				h.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", handler.name, "server", "http", "status", "success", "code", strconv.Itoa(n)).Inc()
 			}
 		}()
 	}

handler/meter/meter.go

@@ -35,7 +35,7 @@ var bufPool = sync.Pool{
 var _ MeterServiceServer = &Handler{}
 
 type Handler struct {
-	opts Options
+	Options Options
 }
 
 type Option func(*Options)
@@ -81,7 +81,7 @@ func NewOptions(opts ...Option) Options {
 
 func NewHandler(opts ...Option) *Handler {
 	options := NewOptions(opts...)
-	return &Handler{opts: options}
+	return &Handler{Options: options}
 }
 
 func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
@@ -96,7 +96,7 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
 
 	w := io.Writer(buf)
 
-	if md, ok := metadata.FromOutgoingContext(ctx); gzipAccepted(md) && ok && !h.opts.DisableCompress {
+	if md, ok := metadata.FromOutgoingContext(ctx); gzipAccepted(md) && ok && !h.Options.DisableCompress {
 		omd, _ := metadata.FromOutgoingContext(ctx)
 		omd.Set(contentEncodingHeader, "gzip")
 		gz := gzipPool.Get().(*gzip.Writer)
@@ -109,7 +109,7 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
 		gz.Flush()
 	}
 
-	if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil {
+	if err := h.Options.Meter.Write(w, h.Options.MeterOptions...); err != nil {
 		log.Error(ctx, "http/meter write failed", err)
 		return nil
 	}