mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
rebase: bump github.com/aws/aws-sdk-go-v2/service/sts
Bumps the github-dependencies group with 1 update: [github.com/aws/aws-sdk-go-v2/service/sts](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/sts` from 1.31.3 to 1.32.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.31.3...v1.32.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
mergify[bot]
parent
71193bcaa1
commit
921c43a999
15
vendor/github.com/aws/smithy-go/CHANGELOG.md
generated
vendored
15
vendor/github.com/aws/smithy-go/CHANGELOG.md
generated
vendored
@ -1,3 +1,18 @@
|
||||
# Release (2024-10-03)
|
||||
|
||||
## General Highlights
|
||||
* **Dependency Update**: Updated to the latest SDK module versions
|
||||
|
||||
## Module Highlights
|
||||
* `github.com/aws/smithy-go`: v1.22.0
|
||||
* **Feature**: Add HTTP client metrics.
|
||||
|
||||
# Release (2024-09-25)
|
||||
|
||||
## Module Highlights
|
||||
* `github.com/aws/smithy-go/aws-http-auth`: [v1.0.0](aws-http-auth/CHANGELOG.md#v100-2024-09-25)
|
||||
* **Release**: Initial release of module aws-http-auth, which implements generically consumable SigV4 and SigV4a request signing.
|
||||
|
||||
# Release (2024-09-19)
|
||||
|
||||
## General Highlights
|
||||
|
2
vendor/github.com/aws/smithy-go/go_module_metadata.go
generated
vendored
2
vendor/github.com/aws/smithy-go/go_module_metadata.go
generated
vendored
@ -3,4 +3,4 @@
|
||||
package smithy
|
||||
|
||||
// goModuleVersion is the tagged release for this module
|
||||
const goModuleVersion = "1.21.0"
|
||||
const goModuleVersion = "1.22.0"
|
||||
|
27
vendor/github.com/aws/smithy-go/transport/http/client.go
generated
vendored
27
vendor/github.com/aws/smithy-go/transport/http/client.go
generated
vendored
@ -6,6 +6,7 @@ import (
|
||||
"net/http"
|
||||
|
||||
smithy "github.com/aws/smithy-go"
|
||||
"github.com/aws/smithy-go/metrics"
|
||||
"github.com/aws/smithy-go/middleware"
|
||||
"github.com/aws/smithy-go/tracing"
|
||||
)
|
||||
@ -28,13 +29,30 @@ func (fn ClientDoFunc) Do(r *http.Request) (*http.Response, error) {
|
||||
// implementation is http.Client.
|
||||
type ClientHandler struct {
|
||||
client ClientDo
|
||||
|
||||
Meter metrics.Meter // For HTTP client metrics.
|
||||
}
|
||||
|
||||
// NewClientHandler returns an initialized middleware handler for the client.
|
||||
//
|
||||
// Deprecated: Use [NewClientHandlerWithOptions].
|
||||
func NewClientHandler(client ClientDo) ClientHandler {
|
||||
return ClientHandler{
|
||||
return NewClientHandlerWithOptions(client)
|
||||
}
|
||||
|
||||
// NewClientHandlerWithOptions returns an initialized middleware handler for the client
|
||||
// with applied options.
|
||||
func NewClientHandlerWithOptions(client ClientDo, opts ...func(*ClientHandler)) ClientHandler {
|
||||
h := ClientHandler{
|
||||
client: client,
|
||||
}
|
||||
for _, opt := range opts {
|
||||
opt(&h)
|
||||
}
|
||||
if h.Meter == nil {
|
||||
h.Meter = metrics.NopMeterProvider{}.Meter("")
|
||||
}
|
||||
return h
|
||||
}
|
||||
|
||||
// Handle implements the middleware Handler interface, that will invoke the
|
||||
@ -46,6 +64,11 @@ func (c ClientHandler) Handle(ctx context.Context, input interface{}) (
|
||||
ctx, span := tracing.StartSpan(ctx, "DoHTTPRequest")
|
||||
defer span.End()
|
||||
|
||||
ctx, client, err := withMetrics(ctx, c.client, c.Meter)
|
||||
if err != nil {
|
||||
return nil, metadata, fmt.Errorf("instrument with HTTP metrics: %w", err)
|
||||
}
|
||||
|
||||
req, ok := input.(*Request)
|
||||
if !ok {
|
||||
return nil, metadata, fmt.Errorf("expect Smithy http.Request value as input, got unsupported type %T", input)
|
||||
@ -66,7 +89,7 @@ func (c ClientHandler) Handle(ctx context.Context, input interface{}) (
|
||||
span.SetProperty("http.request_content_length", length)
|
||||
}
|
||||
|
||||
resp, err := c.client.Do(builtRequest)
|
||||
resp, err := client.Do(builtRequest)
|
||||
if resp == nil {
|
||||
// Ensure a http response value is always present to prevent unexpected
|
||||
// panics.
|
||||
|
184
vendor/github.com/aws/smithy-go/transport/http/metrics.go
generated
vendored
Normal file
184
vendor/github.com/aws/smithy-go/transport/http/metrics.go
generated
vendored
Normal file
@ -0,0 +1,184 @@
|
||||
package http
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"net/http"
|
||||
"net/http/httptrace"
|
||||
"time"
|
||||
|
||||
"github.com/aws/smithy-go/metrics"
|
||||
)
|
||||
|
||||
var now = time.Now
|
||||
|
||||
// withMetrics instruments an HTTP client and context to collect HTTP metrics.
|
||||
func withMetrics(parent context.Context, client ClientDo, meter metrics.Meter) (
|
||||
context.Context, ClientDo, error,
|
||||
) {
|
||||
hm, err := newHTTPMetrics(meter)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
ctx := httptrace.WithClientTrace(parent, &httptrace.ClientTrace{
|
||||
DNSStart: hm.DNSStart,
|
||||
ConnectStart: hm.ConnectStart,
|
||||
TLSHandshakeStart: hm.TLSHandshakeStart,
|
||||
|
||||
GotConn: hm.GotConn(parent),
|
||||
PutIdleConn: hm.PutIdleConn(parent),
|
||||
ConnectDone: hm.ConnectDone(parent),
|
||||
DNSDone: hm.DNSDone(parent),
|
||||
TLSHandshakeDone: hm.TLSHandshakeDone(parent),
|
||||
GotFirstResponseByte: hm.GotFirstResponseByte(parent),
|
||||
})
|
||||
return ctx, &timedClientDo{client, hm}, nil
|
||||
}
|
||||
|
||||
type timedClientDo struct {
|
||||
ClientDo
|
||||
hm *httpMetrics
|
||||
}
|
||||
|
||||
func (c *timedClientDo) Do(r *http.Request) (*http.Response, error) {
|
||||
c.hm.doStart = now()
|
||||
resp, err := c.ClientDo.Do(r)
|
||||
|
||||
c.hm.DoRequestDuration.Record(r.Context(), elapsed(c.hm.doStart))
|
||||
return resp, err
|
||||
}
|
||||
|
||||
type httpMetrics struct {
|
||||
DNSLookupDuration metrics.Float64Histogram // client.http.connections.dns_lookup_duration
|
||||
ConnectDuration metrics.Float64Histogram // client.http.connections.acquire_duration
|
||||
TLSHandshakeDuration metrics.Float64Histogram // client.http.connections.tls_handshake_duration
|
||||
ConnectionUsage metrics.Int64UpDownCounter // client.http.connections.usage
|
||||
|
||||
DoRequestDuration metrics.Float64Histogram // client.http.do_request_duration
|
||||
TimeToFirstByte metrics.Float64Histogram // client.http.time_to_first_byte
|
||||
|
||||
doStart time.Time
|
||||
dnsStart time.Time
|
||||
connectStart time.Time
|
||||
tlsStart time.Time
|
||||
}
|
||||
|
||||
func newHTTPMetrics(meter metrics.Meter) (*httpMetrics, error) {
|
||||
hm := &httpMetrics{}
|
||||
|
||||
var err error
|
||||
hm.DNSLookupDuration, err = meter.Float64Histogram("client.http.connections.dns_lookup_duration", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "s"
|
||||
o.Description = "The time it takes a request to perform DNS lookup."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hm.ConnectDuration, err = meter.Float64Histogram("client.http.connections.acquire_duration", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "s"
|
||||
o.Description = "The time it takes a request to acquire a connection."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hm.TLSHandshakeDuration, err = meter.Float64Histogram("client.http.connections.tls_handshake_duration", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "s"
|
||||
o.Description = "The time it takes an HTTP request to perform the TLS handshake."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hm.ConnectionUsage, err = meter.Int64UpDownCounter("client.http.connections.usage", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "{connection}"
|
||||
o.Description = "Current state of connections pool."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hm.DoRequestDuration, err = meter.Float64Histogram("client.http.do_request_duration", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "s"
|
||||
o.Description = "Time spent performing an entire HTTP transaction."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
hm.TimeToFirstByte, err = meter.Float64Histogram("client.http.time_to_first_byte", func(o *metrics.InstrumentOptions) {
|
||||
o.UnitLabel = "s"
|
||||
o.Description = "Time from start of transaction to when the first response byte is available."
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return hm, nil
|
||||
}
|
||||
|
||||
func (m *httpMetrics) DNSStart(httptrace.DNSStartInfo) {
|
||||
m.dnsStart = now()
|
||||
}
|
||||
|
||||
func (m *httpMetrics) ConnectStart(string, string) {
|
||||
m.connectStart = now()
|
||||
}
|
||||
|
||||
func (m *httpMetrics) TLSHandshakeStart() {
|
||||
m.tlsStart = now()
|
||||
}
|
||||
|
||||
func (m *httpMetrics) GotConn(ctx context.Context) func(httptrace.GotConnInfo) {
|
||||
return func(httptrace.GotConnInfo) {
|
||||
m.addConnAcquired(ctx, 1)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) PutIdleConn(ctx context.Context) func(error) {
|
||||
return func(error) {
|
||||
m.addConnAcquired(ctx, -1)
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) DNSDone(ctx context.Context) func(httptrace.DNSDoneInfo) {
|
||||
return func(httptrace.DNSDoneInfo) {
|
||||
m.DNSLookupDuration.Record(ctx, elapsed(m.dnsStart))
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) ConnectDone(ctx context.Context) func(string, string, error) {
|
||||
return func(string, string, error) {
|
||||
m.ConnectDuration.Record(ctx, elapsed(m.connectStart))
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) TLSHandshakeDone(ctx context.Context) func(tls.ConnectionState, error) {
|
||||
return func(tls.ConnectionState, error) {
|
||||
m.TLSHandshakeDuration.Record(ctx, elapsed(m.tlsStart))
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) GotFirstResponseByte(ctx context.Context) func() {
|
||||
return func() {
|
||||
m.TimeToFirstByte.Record(ctx, elapsed(m.doStart))
|
||||
}
|
||||
}
|
||||
|
||||
func (m *httpMetrics) addConnAcquired(ctx context.Context, incr int64) {
|
||||
m.ConnectionUsage.Add(ctx, incr, func(o *metrics.RecordMetricOptions) {
|
||||
o.Properties.Set("state", "acquired")
|
||||
})
|
||||
}
|
||||
|
||||
// Not used: it is recommended to track acquired vs idle conn, but we can't
|
||||
// determine when something is truly idle with the current HTTP client hooks
|
||||
// available to us.
|
||||
func (m *httpMetrics) addConnIdle(ctx context.Context, incr int64) {
|
||||
m.ConnectionUsage.Add(ctx, incr, func(o *metrics.RecordMetricOptions) {
|
||||
o.Properties.Set("state", "idle")
|
||||
})
|
||||
}
|
||||
|
||||
func elapsed(start time.Time) float64 {
|
||||
end := now()
|
||||
elapsed := end.Sub(start)
|
||||
return float64(elapsed) / 1e9
|
||||
}
|
Reference in New Issue
Block a user