highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-09 19:52:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update OTel semconv

Browse Source
This commit is contained in:
DarthSim
2023-04-27 19:37:00 +03:00
parent e2987c21cc
commit 2bdf868345
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
metrics/otel/otel.go
View File

@@ -26,12 +26,12 @@ import (
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/instrument" "go.opentelemetry.io/otel/metric/instrument"
"go.opentelemetry.io/otel/metric/unit"
"go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/propagation"
sdkmetric "go.opentelemetry.io/otel/sdk/metric" sdkmetric "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.12.0" semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
"go.opentelemetry.io/otel/semconv/v1.17.0/httpconv"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
@@ -345,19 +345,15 @@ func StartRootSpan(ctx context.Context, rw http.ResponseWriter, r *http.Request)
ctx, span := tracer.Start( ctx, span := tracer.Start(
ctx, "/request", ctx, "/request",
trace.WithSpanKind(trace.SpanKindServer), trace.WithSpanKind(trace.SpanKindServer),
trace.WithAttributes(semconv.NetAttributesFromHTTPRequest("tcp", r)...), trace.WithAttributes(httpconv.ServerRequest("imgproxy", r)...),
trace.WithAttributes(semconv.EndUserAttributesFromHTTPRequest(r)...),
trace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest("imgproxy", "/", r)...),
) )
ctx = context.WithValue(ctx, hasSpanCtxKey{}, struct{}{}) ctx = context.WithValue(ctx, hasSpanCtxKey{}, struct{}{})
newRw := httpsnoop.Wrap(rw, httpsnoop.Hooks{ newRw := httpsnoop.Wrap(rw, httpsnoop.Hooks{
WriteHeader: func(next httpsnoop.WriteHeaderFunc) httpsnoop.WriteHeaderFunc { WriteHeader: func(next httpsnoop.WriteHeaderFunc) httpsnoop.WriteHeaderFunc {
return func(statusCode int) { return func(statusCode int) {
attrs := semconv.HTTPAttributesFromHTTPStatusCode(statusCode) span.SetStatus(httpconv.ServerStatus(statusCode))
spanStatus, spanMessage := semconv.SpanStatusFromHTTPStatusCodeAndSpanKind(statusCode, trace.SpanKindServer) span.SetAttributes(semconv.HTTPStatusCode(statusCode))
span.SetAttributes(attrs...)
span.SetStatus(spanStatus, spanMessage)
next(statusCode) next(statusCode)
} }
@@ -410,7 +406,7 @@ func AddGaugeFunc(name, desc, u string, f GaugeFunc) {
gauge, err := meter.Float64ObservableGauge( gauge, err := meter.Float64ObservableGauge(
name, name,
instrument.WithUnit(unit.Unit(u)), instrument.WithUnit(u),
instrument.WithDescription(desc), instrument.WithDescription(desc),
) )
if err != nil { if err != nil {