![dependabot[bot]](/assets/img/avatar_default.png)
Bumps the otel group with 8 updates: | Package | From | To | | --- | --- | --- | | [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.46.1` | `0.48.0` | | [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.45.0` | `0.48.0` | | [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) | `1.21.0` | `1.23.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.23.1` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.23.1` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.23.1` | | [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go) | `1.21.0` | `1.23.1` | | [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) | `1.21.0` | `1.23.1` | Updates `go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc` from 0.46.1 to 0.48.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.46.1...zpages/v0.48.0) Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.45.0 to 0.48.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.45.0...zpages/v0.48.0) Updates `go.opentelemetry.io/otel` from 1.21.0 to 1.23.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.21.0...v1.23.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.19.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.23.1) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.19.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.23.1) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.19.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.23.1) Updates `go.opentelemetry.io/otel/sdk` from 1.21.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.21.0...v1.23.1) Updates `go.opentelemetry.io/otel/trace` from 1.21.0 to 1.23.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.21.0...v1.23.1) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor dependency-group: otel ... Signed-off-by: dependabot[bot] <support@github.com>
87 lines
2.5 KiB
Go
87 lines
2.5 KiB
Go
package httpsnoop
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
)
|
|
|
|
// Metrics holds metrics captured from CaptureMetrics.
|
|
type Metrics struct {
|
|
// Code is the first http response code passed to the WriteHeader func of
|
|
// the ResponseWriter. If no such call is made, a default code of 200 is
|
|
// assumed instead.
|
|
Code int
|
|
// Duration is the time it took to execute the handler.
|
|
Duration time.Duration
|
|
// Written is the number of bytes successfully written by the Write or
|
|
// ReadFrom function of the ResponseWriter. ResponseWriters may also write
|
|
// data to their underlaying connection directly (e.g. headers), but those
|
|
// are not tracked. Therefor the number of Written bytes will usually match
|
|
// the size of the response body.
|
|
Written int64
|
|
}
|
|
|
|
// CaptureMetrics wraps the given hnd, executes it with the given w and r, and
|
|
// returns the metrics it captured from it.
|
|
func CaptureMetrics(hnd http.Handler, w http.ResponseWriter, r *http.Request) Metrics {
|
|
return CaptureMetricsFn(w, func(ww http.ResponseWriter) {
|
|
hnd.ServeHTTP(ww, r)
|
|
})
|
|
}
|
|
|
|
// CaptureMetricsFn wraps w and calls fn with the wrapped w and returns the
|
|
// resulting metrics. This is very similar to CaptureMetrics (which is just
|
|
// sugar on top of this func), but is a more usable interface if your
|
|
// application doesn't use the Go http.Handler interface.
|
|
func CaptureMetricsFn(w http.ResponseWriter, fn func(http.ResponseWriter)) Metrics {
|
|
m := Metrics{Code: http.StatusOK}
|
|
m.CaptureMetrics(w, fn)
|
|
return m
|
|
}
|
|
|
|
// CaptureMetrics wraps w and calls fn with the wrapped w and updates
|
|
// Metrics m with the resulting metrics. This is similar to CaptureMetricsFn,
|
|
// but allows one to customize starting Metrics object.
|
|
func (m *Metrics) CaptureMetrics(w http.ResponseWriter, fn func(http.ResponseWriter)) {
|
|
var (
|
|
start = time.Now()
|
|
headerWritten bool
|
|
hooks = Hooks{
|
|
WriteHeader: func(next WriteHeaderFunc) WriteHeaderFunc {
|
|
return func(code int) {
|
|
next(code)
|
|
|
|
if !(code >= 100 && code <= 199) && !headerWritten {
|
|
m.Code = code
|
|
headerWritten = true
|
|
}
|
|
}
|
|
},
|
|
|
|
Write: func(next WriteFunc) WriteFunc {
|
|
return func(p []byte) (int, error) {
|
|
n, err := next(p)
|
|
|
|
m.Written += int64(n)
|
|
headerWritten = true
|
|
return n, err
|
|
}
|
|
},
|
|
|
|
ReadFrom: func(next ReadFromFunc) ReadFromFunc {
|
|
return func(src io.Reader) (int64, error) {
|
|
n, err := next(src)
|
|
|
|
headerWritten = true
|
|
m.Written += n
|
|
return n, err
|
|
}
|
|
},
|
|
}
|
|
)
|
|
|
|
fn(Wrap(w, hooks))
|
|
m.Duration += time.Since(start)
|
|
}
|