From 3649b638979a31dbdca350f563249ff6f2692c05 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Wed, 1 Nov 2023 10:57:34 +1100 Subject: [PATCH] otelhttp: set unit and description on all instruments --- instrumentation/net/http/otelhttp/handler.go | 9 ++++++--- instrumentation/net/http/otelhttp/test/handler_test.go | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/instrumentation/net/http/otelhttp/handler.go b/instrumentation/net/http/otelhttp/handler.go index a174c005037..b193d8254e0 100644 --- a/instrumentation/net/http/otelhttp/handler.go +++ b/instrumentation/net/http/otelhttp/handler.go @@ -107,13 +107,16 @@ func (h *middleware) createMeasures() { h.counters = make(map[string]metric.Int64Counter) h.valueRecorders = make(map[string]metric.Float64Histogram) - requestBytesCounter, err := h.meter.Int64Counter(RequestContentLength) + requestBytesCounter, err := h.meter.Int64Counter(RequestContentLength, metric.WithUnit("By"), + metric.WithDescription("Measures the size of HTTP request content length (uncompressed)")) handleErr(err) - responseBytesCounter, err := h.meter.Int64Counter(ResponseContentLength) + responseBytesCounter, err := h.meter.Int64Counter(ResponseContentLength, metric.WithUnit("By"), + metric.WithDescription("Measures the size of HTTP response content length (uncompressed)")) handleErr(err) - serverLatencyMeasure, err := h.meter.Float64Histogram(ServerLatency, metric.WithUnit("ms")) + serverLatencyMeasure, err := h.meter.Float64Histogram(ServerLatency, metric.WithUnit("ms"), + metric.WithDescription("Measures the duration of HTTP request handling")) handleErr(err) h.counters[RequestContentLength] = requestBytesCounter diff --git a/instrumentation/net/http/otelhttp/test/handler_test.go b/instrumentation/net/http/otelhttp/test/handler_test.go index 30eec741160..105041dad56 100644 --- a/instrumentation/net/http/otelhttp/test/handler_test.go +++ b/instrumentation/net/http/otelhttp/test/handler_test.go @@ -50,7 +50,9 @@ func assertScopeMetrics(t *testing.T, sm metricdata.ScopeMetrics, attrs attribut require.Len(t, sm.Metrics, 3) want := metricdata.Metrics{ - Name: "http.server.request_content_length", + Name: "http.server.request_content_length", + Description: "Measures the size of HTTP request content length (uncompressed)", + Unit: "By", Data: metricdata.Sum[int64]{ DataPoints: []metricdata.DataPoint[int64]{{Attributes: attrs, Value: 0}}, Temporality: metricdata.CumulativeTemporality, @@ -60,7 +62,9 @@ func assertScopeMetrics(t *testing.T, sm metricdata.ScopeMetrics, attrs attribut metricdatatest.AssertEqual(t, want, sm.Metrics[0], metricdatatest.IgnoreTimestamp()) want = metricdata.Metrics{ - Name: "http.server.response_content_length", + Name: "http.server.response_content_length", + Description: "Measures the size of HTTP response content length (uncompressed)", + Unit: "By", Data: metricdata.Sum[int64]{ DataPoints: []metricdata.DataPoint[int64]{{Attributes: attrs, Value: 11}}, Temporality: metricdata.CumulativeTemporality,