mirror of
https://github.com/owncloud/ocis
synced 2026-04-25 17:25:21 +02:00
* chore(deps): bump @testing-library/jest-dom in /services/idp
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.6.4 to 6.9.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v6.6.4...v6.9.1)
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
dependency-version: 6.9.1
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore(deps): bump filippo.io/edwards25519 from 1.1.0 to 1.1.1
Bumps [filippo.io/edwards25519](https://github.com/FiloSottile/edwards25519) from 1.1.0 to 1.1.1.
- [Commits](https://github.com/FiloSottile/edwards25519/compare/v1.1.0...v1.1.1)
---
updated-dependencies:
- dependency-name: filippo.io/edwards25519
dependency-version: 1.1.1
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
* Merge branch 'master' into dependabot/go_modules/github.com/russellhaering/goxmldsig-1.6.0
* build(deps): bump alpine from 3.23.3 to 3.23.4
Bumps alpine from 3.23.3 to 3.23.4.
---
updated-dependencies:
- dependency-name: alpine
dependency-version: 3.23.4
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump arm64v8/alpine from 3.23.3 to 3.23.4 in /ocis/docker
Bumps arm64v8/alpine from 3.23.3 to 3.23.4.
---
updated-dependencies:
- dependency-name: arm64v8/alpine
dependency-version: 3.23.4
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump actions/cache from 5.0.4 to 5.0.5
Bumps [actions/cache](https://github.com/actions/cache) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](668228422a...27d5ce7f10)
---
updated-dependencies:
- dependency-name: actions/cache
dependency-version: 5.0.5
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump github.com/go-acme/lego/v4 from 4.25.2 to 4.34.0
Bumps [github.com/go-acme/lego/v4](https://github.com/go-acme/lego) from 4.25.2 to 4.34.0.
- [Release notes](https://github.com/go-acme/lego/releases)
- [Changelog](https://github.com/go-acme/lego/blob/master/CHANGELOG.md)
- [Commits](https://github.com/go-acme/lego/compare/v4.25.2...v4.34.0)
---
updated-dependencies:
- dependency-name: github.com/go-acme/lego/v4
dependency-version: 4.34.0
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
* build(deps): bump github.com/go-git/go-git/v5 from 5.17.1 to 5.18.0
Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.17.1 to 5.18.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](https://github.com/go-git/go-git/compare/v5.17.1...v5.18.0)
---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
dependency-version: 5.18.0
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: regenerate pnpm-lock.yaml
* fix(ci): replace nc-based fakeoffice with Python HTTP server
BusyBox nc -k restarts between connections leaving a gap where the
collaboration service gets ECONNRESET at startup, so healthz never
binds and the 300s wait times out. Python HTTPServer is gap-free.
---------
Signed-off-by: dependabot[bot] <support@github.com>
218 lines
6.5 KiB
Go
218 lines
6.5 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
|
|
|
import (
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/felixge/httpsnoop"
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
"go.opentelemetry.io/otel/propagation"
|
|
"go.opentelemetry.io/otel/trace"
|
|
|
|
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/request"
|
|
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv"
|
|
)
|
|
|
|
// middleware is an http middleware which wraps the next handler in a span.
|
|
type middleware struct {
|
|
operation string
|
|
server string
|
|
|
|
tracer trace.Tracer
|
|
propagators propagation.TextMapPropagator
|
|
spanStartOptions []trace.SpanStartOption
|
|
readEvent bool
|
|
writeEvent bool
|
|
filters []Filter
|
|
spanNameFormatter func(string, *http.Request) string
|
|
publicEndpointFn func(*http.Request) bool
|
|
metricAttributesFn func(*http.Request) []attribute.KeyValue
|
|
|
|
semconv semconv.HTTPServer
|
|
}
|
|
|
|
func defaultHandlerFormatter(operation string, _ *http.Request) string {
|
|
return operation
|
|
}
|
|
|
|
// NewHandler wraps the passed handler in a span named after the operation and
|
|
// enriches it with metrics.
|
|
func NewHandler(handler http.Handler, operation string, opts ...Option) http.Handler {
|
|
return NewMiddleware(operation, opts...)(handler)
|
|
}
|
|
|
|
// NewMiddleware returns a tracing and metrics instrumentation middleware.
|
|
// The handler returned by the middleware wraps a handler
|
|
// in a span named after the operation and enriches it with metrics.
|
|
func NewMiddleware(operation string, opts ...Option) func(http.Handler) http.Handler {
|
|
h := middleware{
|
|
operation: operation,
|
|
}
|
|
|
|
defaultOpts := []Option{
|
|
WithSpanOptions(trace.WithSpanKind(trace.SpanKindServer)),
|
|
WithSpanNameFormatter(defaultHandlerFormatter),
|
|
}
|
|
|
|
c := newConfig(append(defaultOpts, opts...)...)
|
|
h.configure(c)
|
|
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
h.serveHTTP(w, r, next)
|
|
})
|
|
}
|
|
}
|
|
|
|
func (h *middleware) configure(c *config) {
|
|
h.tracer = c.Tracer
|
|
h.propagators = c.Propagators
|
|
h.spanStartOptions = c.SpanStartOptions
|
|
h.readEvent = c.ReadEvent
|
|
h.writeEvent = c.WriteEvent
|
|
h.filters = c.Filters
|
|
h.spanNameFormatter = c.SpanNameFormatter
|
|
h.publicEndpointFn = c.PublicEndpointFn
|
|
h.server = c.ServerName
|
|
h.semconv = semconv.NewHTTPServer(c.Meter)
|
|
h.metricAttributesFn = c.MetricAttributesFn
|
|
}
|
|
|
|
// serveHTTP sets up tracing and calls the given next http.Handler with the span
|
|
// context injected into the request context.
|
|
func (h *middleware) serveHTTP(w http.ResponseWriter, r *http.Request, next http.Handler) {
|
|
requestStartTime := time.Now()
|
|
for _, f := range h.filters {
|
|
if !f(r) {
|
|
// Simply pass through to the handler if a filter rejects the request
|
|
next.ServeHTTP(w, r)
|
|
return
|
|
}
|
|
}
|
|
|
|
ctx := h.propagators.Extract(r.Context(), propagation.HeaderCarrier(r.Header))
|
|
opts := []trace.SpanStartOption{
|
|
trace.WithAttributes(h.semconv.RequestTraceAttrs(h.server, r, semconv.RequestTraceAttrsOpts{})...),
|
|
}
|
|
|
|
opts = append(opts, h.spanStartOptions...)
|
|
if h.publicEndpointFn != nil && h.publicEndpointFn(r.WithContext(ctx)) {
|
|
opts = append(opts, trace.WithNewRoot())
|
|
// Linking incoming span context if any for public endpoint.
|
|
if s := trace.SpanContextFromContext(ctx); s.IsValid() && s.IsRemote() {
|
|
opts = append(opts, trace.WithLinks(trace.Link{SpanContext: s}))
|
|
}
|
|
}
|
|
|
|
tracer := h.tracer
|
|
|
|
if tracer == nil {
|
|
if span := trace.SpanFromContext(r.Context()); span.SpanContext().IsValid() {
|
|
tracer = newTracer(span.TracerProvider())
|
|
} else {
|
|
tracer = newTracer(otel.GetTracerProvider())
|
|
}
|
|
}
|
|
|
|
if startTime := StartTimeFromContext(ctx); !startTime.IsZero() {
|
|
opts = append(opts, trace.WithTimestamp(startTime))
|
|
requestStartTime = startTime
|
|
}
|
|
|
|
ctx, span := tracer.Start(ctx, h.spanNameFormatter(h.operation, r), opts...)
|
|
defer span.End()
|
|
|
|
readRecordFunc := func(int64) {}
|
|
if h.readEvent {
|
|
readRecordFunc = func(n int64) {
|
|
span.AddEvent("read", trace.WithAttributes(ReadBytesKey.Int64(n)))
|
|
}
|
|
}
|
|
|
|
// if request body is nil or NoBody, we don't want to mutate the body as it
|
|
// will affect the identity of it in an unforeseeable way because we assert
|
|
// ReadCloser fulfills a certain interface and it is indeed nil or NoBody.
|
|
bw := request.NewBodyWrapper(r.Body, readRecordFunc)
|
|
if r.Body != nil && r.Body != http.NoBody {
|
|
r.Body = bw
|
|
}
|
|
|
|
writeRecordFunc := func(int64) {}
|
|
if h.writeEvent {
|
|
writeRecordFunc = func(n int64) {
|
|
span.AddEvent("write", trace.WithAttributes(WroteBytesKey.Int64(n)))
|
|
}
|
|
}
|
|
|
|
rww := request.NewRespWriterWrapper(w, writeRecordFunc)
|
|
|
|
// Wrap w to use our ResponseWriter methods while also exposing
|
|
// other interfaces that w may implement (http.CloseNotifier,
|
|
// http.Flusher, http.Hijacker, http.Pusher, io.ReaderFrom).
|
|
|
|
w = httpsnoop.Wrap(w, httpsnoop.Hooks{
|
|
Header: func(httpsnoop.HeaderFunc) httpsnoop.HeaderFunc {
|
|
return rww.Header
|
|
},
|
|
Write: func(httpsnoop.WriteFunc) httpsnoop.WriteFunc {
|
|
return rww.Write
|
|
},
|
|
WriteHeader: func(httpsnoop.WriteHeaderFunc) httpsnoop.WriteHeaderFunc {
|
|
return rww.WriteHeader
|
|
},
|
|
Flush: func(httpsnoop.FlushFunc) httpsnoop.FlushFunc {
|
|
return rww.Flush
|
|
},
|
|
})
|
|
|
|
labeler, found := LabelerFromContext(ctx)
|
|
if !found {
|
|
ctx = ContextWithLabeler(ctx, labeler)
|
|
}
|
|
|
|
r = r.WithContext(ctx)
|
|
next.ServeHTTP(w, r)
|
|
|
|
if r.Pattern != "" {
|
|
span.SetName(h.spanNameFormatter(h.operation, r))
|
|
}
|
|
|
|
statusCode := rww.StatusCode()
|
|
bytesWritten := rww.BytesWritten()
|
|
span.SetStatus(h.semconv.Status(statusCode))
|
|
bytesRead := bw.BytesRead()
|
|
span.SetAttributes(h.semconv.ResponseTraceAttrs(semconv.ResponseTelemetry{
|
|
StatusCode: statusCode,
|
|
ReadBytes: bytesRead,
|
|
ReadError: bw.Error(),
|
|
WriteBytes: bytesWritten,
|
|
WriteError: rww.Error(),
|
|
})...)
|
|
|
|
h.semconv.RecordMetrics(ctx, semconv.ServerMetricData{
|
|
ServerName: h.server,
|
|
ResponseSize: bytesWritten,
|
|
MetricAttributes: semconv.MetricAttributes{
|
|
Req: r,
|
|
StatusCode: statusCode,
|
|
AdditionalAttributes: append(labeler.Get(), h.metricAttributesFromRequest(r)...),
|
|
},
|
|
MetricData: semconv.MetricData{
|
|
RequestSize: bytesRead,
|
|
RequestDuration: time.Since(requestStartTime),
|
|
},
|
|
})
|
|
}
|
|
|
|
func (h *middleware) metricAttributesFromRequest(r *http.Request) []attribute.KeyValue {
|
|
var attributeForRequest []attribute.KeyValue
|
|
if h.metricAttributesFn != nil {
|
|
attributeForRequest = h.metricAttributesFn(r)
|
|
}
|
|
return attributeForRequest
|
|
}
|