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>
205 lines
6.3 KiB
Go
205 lines
6.3 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptrace"
|
|
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
"go.opentelemetry.io/otel/metric"
|
|
"go.opentelemetry.io/otel/propagation"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
// ScopeName is the instrumentation scope name.
|
|
const ScopeName = "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
|
|
|
|
// config represents the configuration options available for the http.Handler
|
|
// and http.Transport types.
|
|
type config struct {
|
|
ServerName string
|
|
Tracer trace.Tracer
|
|
Meter metric.Meter
|
|
Propagators propagation.TextMapPropagator
|
|
SpanStartOptions []trace.SpanStartOption
|
|
PublicEndpointFn func(*http.Request) bool
|
|
ReadEvent bool
|
|
WriteEvent bool
|
|
Filters []Filter
|
|
SpanNameFormatter func(string, *http.Request) string
|
|
ClientTrace func(context.Context) *httptrace.ClientTrace
|
|
|
|
TracerProvider trace.TracerProvider
|
|
MeterProvider metric.MeterProvider
|
|
MetricAttributesFn func(*http.Request) []attribute.KeyValue
|
|
}
|
|
|
|
// Option interface used for setting optional config properties.
|
|
type Option interface {
|
|
apply(*config)
|
|
}
|
|
|
|
type optionFunc func(*config)
|
|
|
|
func (o optionFunc) apply(c *config) {
|
|
o(c)
|
|
}
|
|
|
|
// newConfig creates a new config struct and applies opts to it.
|
|
func newConfig(opts ...Option) *config {
|
|
c := &config{
|
|
Propagators: otel.GetTextMapPropagator(),
|
|
MeterProvider: otel.GetMeterProvider(),
|
|
}
|
|
for _, opt := range opts {
|
|
opt.apply(c)
|
|
}
|
|
|
|
// Tracer is only initialized if manually specified. Otherwise, can be passed with the tracing context.
|
|
if c.TracerProvider != nil {
|
|
c.Tracer = newTracer(c.TracerProvider)
|
|
}
|
|
|
|
c.Meter = c.MeterProvider.Meter(
|
|
ScopeName,
|
|
metric.WithInstrumentationVersion(Version),
|
|
)
|
|
|
|
return c
|
|
}
|
|
|
|
// WithTracerProvider specifies a tracer provider to use for creating a tracer.
|
|
// If none is specified, the global provider is used.
|
|
func WithTracerProvider(provider trace.TracerProvider) Option {
|
|
return optionFunc(func(cfg *config) {
|
|
if provider != nil {
|
|
cfg.TracerProvider = provider
|
|
}
|
|
})
|
|
}
|
|
|
|
// WithMeterProvider specifies a meter provider to use for creating a meter.
|
|
// If none is specified, the global provider is used.
|
|
func WithMeterProvider(provider metric.MeterProvider) Option {
|
|
return optionFunc(func(cfg *config) {
|
|
if provider != nil {
|
|
cfg.MeterProvider = provider
|
|
}
|
|
})
|
|
}
|
|
|
|
// WithPublicEndpointFn runs with every request, and allows conditionally
|
|
// configuring the Handler to link the span with an incoming span context. If
|
|
// this option is not provided or returns false, then the association is a
|
|
// child association instead of a link.
|
|
func WithPublicEndpointFn(fn func(*http.Request) bool) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.PublicEndpointFn = fn
|
|
})
|
|
}
|
|
|
|
// WithPropagators configures specific propagators. If this
|
|
// option isn't specified, then the global TextMapPropagator is used.
|
|
func WithPropagators(ps propagation.TextMapPropagator) Option {
|
|
return optionFunc(func(c *config) {
|
|
if ps != nil {
|
|
c.Propagators = ps
|
|
}
|
|
})
|
|
}
|
|
|
|
// WithSpanOptions configures an additional set of
|
|
// trace.SpanOptions, which are applied to each new span.
|
|
func WithSpanOptions(opts ...trace.SpanStartOption) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.SpanStartOptions = append(c.SpanStartOptions, opts...)
|
|
})
|
|
}
|
|
|
|
// WithFilter adds a filter to the list of filters used by the handler.
|
|
// If any filter indicates to exclude a request then the request will not be
|
|
// traced. All filters must allow a request to be traced for a Span to be created.
|
|
// If no filters are provided then all requests are traced.
|
|
// Filters will be invoked for each processed request, it is advised to make them
|
|
// simple and fast.
|
|
func WithFilter(f Filter) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.Filters = append(c.Filters, f)
|
|
})
|
|
}
|
|
|
|
// Event represents message event types for [WithMessageEvents].
|
|
type Event int
|
|
|
|
// Different types of events that can be recorded, see WithMessageEvents.
|
|
const (
|
|
unspecifiedEvents Event = iota
|
|
ReadEvents
|
|
WriteEvents
|
|
)
|
|
|
|
// WithMessageEvents configures the Handler to record the specified events
|
|
// (span.AddEvent) on spans. By default only summary attributes are added at the
|
|
// end of the request.
|
|
//
|
|
// Valid events are:
|
|
// - ReadEvents: Record the number of bytes read after every http.Request.Body.Read
|
|
// using the ReadBytesKey
|
|
// - WriteEvents: Record the number of bytes written after every http.ResponeWriter.Write
|
|
// using the WriteBytesKey
|
|
func WithMessageEvents(events ...Event) Option {
|
|
return optionFunc(func(c *config) {
|
|
for _, e := range events {
|
|
switch e {
|
|
case ReadEvents:
|
|
c.ReadEvent = true
|
|
case WriteEvents:
|
|
c.WriteEvent = true
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
// WithSpanNameFormatter takes a function that will be called on every
|
|
// request and the returned string will become the Span Name.
|
|
//
|
|
// When using [http.ServeMux] (or any middleware that sets the Pattern of [http.Request]),
|
|
// the span name formatter will run twice. Once when the span is created, and
|
|
// second time after the middleware, so the pattern can be used.
|
|
func WithSpanNameFormatter(f func(operation string, r *http.Request) string) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.SpanNameFormatter = f
|
|
})
|
|
}
|
|
|
|
// WithClientTrace takes a function that returns client trace instance that will be
|
|
// applied to the requests sent through the otelhttp Transport.
|
|
func WithClientTrace(f func(context.Context) *httptrace.ClientTrace) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.ClientTrace = f
|
|
})
|
|
}
|
|
|
|
// WithServerName returns an Option that sets the name of the (virtual) server
|
|
// handling requests.
|
|
func WithServerName(server string) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.ServerName = server
|
|
})
|
|
}
|
|
|
|
// WithMetricAttributesFn returns an Option to set a function that maps an HTTP request to a slice of attribute.KeyValue.
|
|
// These attributes will be included in metrics for every request.
|
|
//
|
|
// Deprecated: WithMetricAttributesFn is deprecated and will be removed in a
|
|
// future release. Use [Labeler] instead.
|
|
func WithMetricAttributesFn(metricAttributesFn func(r *http.Request) []attribute.KeyValue) Option {
|
|
return optionFunc(func(c *config) {
|
|
c.MetricAttributesFn = metricAttributesFn
|
|
})
|
|
}
|