Skip to content

Commit e4e9b04

Browse files
z4kn4feinz4kn4fein
authored
Update dependencies due to security vulnerability reports (#52)
* Update dependencies due to security vulnerability reports * Update reporter.go
1 parent 8d9d5b9 commit e4e9b04

6 files changed

Lines changed: 244 additions & 235 deletions

File tree

‎cache/redis_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (s *redisTestSuite) SetupSuite() {
3333
}
3434
s.db = redisContainer
3535
p, _ := nat.NewPort("tcp", "6379")
36-
dbPort, _ := s.db.MappedPort(s.T().Context(), p)
36+
dbPort, _ := s.db.MappedPort(s.T().Context(), p.Port())
3737
s.dbPort = dbPort.Port()
3838
}
3939

@@ -91,7 +91,7 @@ func TestRedisStorage_TLS(t *testing.T) {
9191
}
9292

9393
p, _ := nat.NewPort("tcp", "6379")
94-
dbPort, _ := redisContainer.MappedPort(t.Context(), p)
94+
dbPort, _ := redisContainer.MappedPort(t.Context(), p.Port())
9595

9696
tls := redisContainer.TLSConfig()
9797

‎cache/valkey_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (s *valkeyTestSuite) SetupSuite() {
3434
}
3535
s.db = valkeyContainer
3636
p, _ := nat.NewPort("tcp", "6379")
37-
dbPort, _ := s.db.MappedPort(s.T().Context(), p)
37+
dbPort, _ := s.db.MappedPort(s.T().Context(), p.Port())
3838
s.dbPort = dbPort.Port()
3939
}
4040

@@ -92,7 +92,7 @@ func TestValkeyStorage_TLS(t *testing.T) {
9292
}
9393

9494
p, _ := nat.NewPort("tcp", "6379")
95-
dbPort, _ := valkeyContainer.MappedPort(t.Context(), p)
95+
dbPort, _ := valkeyContainer.MappedPort(t.Context(), p.Port())
9696

9797
tls := valkeyContainer.TLSConfig()
9898

‎diag/telemetry/reporter.go‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@ func (r *reporter) StartSpan(ctx context.Context, name string, attributes ...KV)
152152
func (r *reporter) InstrumentHttp(operation string, method string, handler http.HandlerFunc) http.HandlerFunc {
153153
var otelOpts []otelhttp.Option
154154
if r.metricsHandler != nil {
155-
otelOpts = append(otelOpts, otelhttp.WithMeterProvider(r.metricsHandler.provider), otelhttp.WithMetricAttributesFn(func(r *http.Request) []attribute.KeyValue {
156-
return []attribute.KeyValue{semconv.HTTPRoute(r.URL.Path)}
157-
}))
155+
otelOpts = append(otelOpts, otelhttp.WithMeterProvider(r.metricsHandler.provider))
158156
}
159157
if r.traceHandler != nil {
160158
otelOpts = append(otelOpts, otelhttp.WithTracerProvider(r.traceHandler.provider))
@@ -170,10 +168,7 @@ func (r *reporter) InstrumentHttpClient(handler http.RoundTripper, attributes ..
170168
if r.metricsHandler != nil {
171169
otelOpts = append(otelOpts, otelhttp.WithMeterProvider(r.metricsHandler.provider))
172170
if len(attributes) > 0 {
173-
arr := toAttributeArray(attributes...)
174-
otelOpts = append(otelOpts, otelhttp.WithMetricAttributesFn(func(r *http.Request) []attribute.KeyValue {
175-
return append(arr, semconv.HTTPRoute(r.URL.Path))
176-
}))
171+
handler = newClientMetricsLabelerInterceptor(toAttributeArray(attributes...), handler)
177172
}
178173
}
179174
if r.traceHandler != nil {
@@ -253,3 +248,24 @@ func toAttributeArray(attributes ...KV) []attribute.KeyValue {
253248
}
254249
return result
255250
}
251+
252+
type httpClientMetricsLabelerInterceptor struct {
253+
http.RoundTripper
254+
attr []attribute.KeyValue
255+
}
256+
257+
func newClientMetricsLabelerInterceptor(attr []attribute.KeyValue, base http.RoundTripper) *httpClientMetricsLabelerInterceptor {
258+
return &httpClientMetricsLabelerInterceptor{
259+
RoundTripper: base,
260+
attr: attr,
261+
}
262+
}
263+
264+
func (i *httpClientMetricsLabelerInterceptor) RoundTrip(r *http.Request) (*http.Response, error) {
265+
labeler, ok := otelhttp.LabelerFromContext(r.Context())
266+
if ok {
267+
labeler.Add(i.attr...)
268+
labeler.Add(semconv.HTTPRoute(r.URL.Path))
269+
}
270+
return i.RoundTripper.RoundTrip(r)
271+
}

‎diag/telemetry/reporter_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestHandler_Metrics_Prometheus_Export(t *testing.T) {
5050
body, _ := io.ReadAll(resp.Body)
5151
_ = resp.Body.Close()
5252

53-
assert.Contains(t, string(body), "configcat_http_server_request_duration_seconds_bucket{http_request_method=\"GET\",http_response_status_code=\"200\",http_route=\"/\",network_protocol_name=\"http\",network_protocol_version=\"1.1\"")
53+
assert.Contains(t, string(body), "configcat_http_server_request_duration_seconds_bucket{http_request_method=\"GET\",http_response_status_code=\"200\",network_protocol_name=\"http\",network_protocol_version=\"1.1\"")
5454
})
5555
t.Run("http bad", func(t *testing.T) {
5656
h := handler.InstrumentHttp("t", http.MethodGet, func(writer http.ResponseWriter, request *http.Request) {
@@ -66,7 +66,7 @@ func TestHandler_Metrics_Prometheus_Export(t *testing.T) {
6666
body, _ := io.ReadAll(resp.Body)
6767
_ = resp.Body.Close()
6868

69-
assert.Contains(t, string(body), "configcat_http_server_request_duration_seconds_bucket{http_request_method=\"GET\",http_response_status_code=\"400\",http_route=\"/\",network_protocol_name=\"http\",network_protocol_version=\"1.1\"")
69+
assert.Contains(t, string(body), "configcat_http_server_request_duration_seconds_bucket{http_request_method=\"GET\",http_response_status_code=\"400\",network_protocol_name=\"http\",network_protocol_version=\"1.1\"")
7070
})
7171
t.Run("http client", func(t *testing.T) {
7272
h := http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
@@ -218,7 +218,7 @@ func TestHandler_Traces_Otlp_Export(t *testing.T) {
218218

219219
handler.ForceFlush(t.Context())
220220

221-
assert.True(t, collector.hasTrace("HTTP GET test"))
221+
assert.True(t, collector.hasTrace("GET"))
222222
})
223223
t.Run("http client", func(t *testing.T) {
224224
h := http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {

‎go.mod‎

Lines changed: 66 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@ module github.com/configcat/configcat-proxy
33
go 1.25.0
44

55
require (
6-
github.com/alicebob/miniredis/v2 v2.37.0
7-
github.com/aws/aws-sdk-go-v2 v1.41.5
8-
github.com/aws/aws-sdk-go-v2/config v1.32.14
9-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.57.1
6+
github.com/alicebob/miniredis/v2 v2.38.0
7+
github.com/aws/aws-sdk-go-v2 v1.42.0
8+
github.com/aws/aws-sdk-go-v2/config v1.32.25
9+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.59.0
1010
github.com/cespare/xxhash/v2 v2.3.0
1111
github.com/configcat/go-sdk/v9 v9.1.0
12-
github.com/docker/go-connections v0.6.0
13-
github.com/fsnotify/fsnotify v1.9.0
12+
github.com/docker/go-connections v0.7.0
13+
github.com/fsnotify/fsnotify v1.10.1
1414
github.com/open-feature/go-sdk v1.17.2
1515
github.com/open-feature/go-sdk-contrib/providers/ofrep v0.1.7
1616
github.com/prometheus/client_golang v1.23.2
1717
github.com/prometheus/otlptranslator v1.0.0
1818
github.com/puzpuzpuz/xsync/v3 v3.5.1
19-
github.com/redis/go-redis/extra/redisotel/v9 v9.18.0
20-
github.com/redis/go-redis/v9 v9.18.0
19+
github.com/redis/go-redis/extra/redisotel/v9 v9.21.0
20+
github.com/redis/go-redis/v9 v9.21.0
2121
github.com/stretchr/testify v1.11.1
22-
github.com/testcontainers/testcontainers-go v0.41.0
23-
github.com/testcontainers/testcontainers-go/modules/dynamodb v0.41.0
24-
github.com/testcontainers/testcontainers-go/modules/mongodb v0.41.0
25-
github.com/testcontainers/testcontainers-go/modules/redis v0.41.0
26-
github.com/testcontainers/testcontainers-go/modules/valkey v0.41.0
27-
go.mongodb.org/mongo-driver/v2 v2.5.0
28-
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.68.0
29-
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/v2/mongo/otelmongo v0.0.0-20260408192003-682414f7a83a
30-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0
31-
go.opentelemetry.io/contrib/instrumentation/host v0.68.0
32-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
33-
go.opentelemetry.io/contrib/instrumentation/runtime v0.68.0
34-
go.opentelemetry.io/otel v1.43.0
35-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0
36-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0
37-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0
38-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
39-
go.opentelemetry.io/otel/exporters/prometheus v0.65.0
40-
go.opentelemetry.io/otel/metric v1.43.0
41-
go.opentelemetry.io/otel/sdk v1.43.0
42-
go.opentelemetry.io/otel/sdk/metric v1.43.0
43-
go.opentelemetry.io/otel/trace v1.43.0
22+
github.com/testcontainers/testcontainers-go v0.43.0
23+
github.com/testcontainers/testcontainers-go/modules/dynamodb v0.43.0
24+
github.com/testcontainers/testcontainers-go/modules/mongodb v0.43.0
25+
github.com/testcontainers/testcontainers-go/modules/redis v0.43.0
26+
github.com/testcontainers/testcontainers-go/modules/valkey v0.43.0
27+
go.mongodb.org/mongo-driver/v2 v2.7.0
28+
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.69.0
29+
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/v2/mongo/otelmongo v0.0.0-20260620202110-a30d9ca071ed
30+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0
31+
go.opentelemetry.io/contrib/instrumentation/host v0.69.0
32+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0
33+
go.opentelemetry.io/contrib/instrumentation/runtime v0.69.0
34+
go.opentelemetry.io/otel v1.44.0
35+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.44.0
36+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.44.0
37+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0
38+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.44.0
39+
go.opentelemetry.io/otel/exporters/prometheus v0.66.0
40+
go.opentelemetry.io/otel/metric v1.44.0
41+
go.opentelemetry.io/otel/sdk v1.44.0
42+
go.opentelemetry.io/otel/sdk/metric v1.44.0
43+
go.opentelemetry.io/otel/trace v1.44.0
4444
go.opentelemetry.io/proto/otlp v1.10.0
45-
google.golang.org/grpc v1.80.0
45+
google.golang.org/grpc v1.81.1
4646
google.golang.org/protobuf v1.36.11
4747
gopkg.in/yaml.v3 v3.0.1
4848
)
@@ -51,21 +51,21 @@ require (
5151
dario.cat/mergo v1.0.2 // indirect
5252
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5353
github.com/Microsoft/go-winio v0.6.2 // indirect
54-
github.com/aws/aws-sdk-go-v2/credentials v1.19.14 // indirect
55-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
56-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
57-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
58-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.21 // indirect
61-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
62-
github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 // indirect
63-
github.com/aws/aws-sdk-go-v2/service/sns v1.39.15 // indirect
64-
github.com/aws/aws-sdk-go-v2/service/sqs v1.42.25 // indirect
65-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 // indirect
66-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 // indirect
67-
github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 // indirect
68-
github.com/aws/smithy-go v1.24.3 // indirect
54+
github.com/aws/aws-sdk-go-v2/credentials v1.19.24 // indirect
55+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.29 // indirect
56+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.29 // indirect
57+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.29 // indirect
58+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.30 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.12 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.12.6 // indirect
61+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.29 // indirect
62+
github.com/aws/aws-sdk-go-v2/service/signin v1.2.0 // indirect
63+
github.com/aws/aws-sdk-go-v2/service/sns v1.40.1 // indirect
64+
github.com/aws/aws-sdk-go-v2/service/sqs v1.44.0 // indirect
65+
github.com/aws/aws-sdk-go-v2/service/sso v1.31.3 // indirect
66+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.6 // indirect
67+
github.com/aws/aws-sdk-go-v2/service/sts v1.43.3 // indirect
68+
github.com/aws/smithy-go v1.27.2 // indirect
6969
github.com/beorn7/perks v1.0.1 // indirect
7070
github.com/blang/semver/v4 v4.0.0 // indirect
7171
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -76,59 +76,56 @@ require (
7676
github.com/containerd/platforms v0.2.1 // indirect
7777
github.com/cpuguy83/dockercfg v0.3.2 // indirect
7878
github.com/davecgh/go-spew v1.1.1 // indirect
79-
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
8079
github.com/distribution/reference v0.6.0 // indirect
81-
github.com/docker/docker v28.5.2+incompatible // indirect
8280
github.com/docker/go-units v0.5.0 // indirect
83-
github.com/ebitengine/purego v0.10.0 // indirect
84-
github.com/felixge/httpsnoop v1.0.4 // indirect
81+
github.com/ebitengine/purego v0.10.1 // indirect
82+
github.com/felixge/httpsnoop v1.1.0 // indirect
8583
github.com/go-logr/logr v1.4.3 // indirect
8684
github.com/go-logr/stdr v1.2.2 // indirect
8785
github.com/go-ole/go-ole v1.3.0 // indirect
8886
github.com/google/uuid v1.6.0 // indirect
89-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
90-
github.com/klauspost/compress v1.18.5 // indirect
87+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
88+
github.com/klauspost/compress v1.18.6 // indirect
9189
github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect
9290
github.com/magiconair/properties v1.8.10 // indirect
9391
github.com/mdelapenya/tlscert v0.2.0 // indirect
9492
github.com/moby/docker-image-spec v1.3.1 // indirect
9593
github.com/moby/go-archive v0.2.0 // indirect
94+
github.com/moby/moby/api v1.55.0 // indirect
95+
github.com/moby/moby/client v0.5.0 // indirect
9696
github.com/moby/patternmatcher v0.6.1 // indirect
97-
github.com/moby/sys/sequential v0.6.0 // indirect
97+
github.com/moby/sys/sequential v0.7.0 // indirect
9898
github.com/moby/sys/user v0.4.0 // indirect
9999
github.com/moby/sys/userns v0.1.0 // indirect
100100
github.com/moby/term v0.5.2 // indirect
101-
github.com/morikuni/aec v1.1.0 // indirect
102101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103102
github.com/opencontainers/go-digest v1.0.0 // indirect
104103
github.com/opencontainers/image-spec v1.1.1 // indirect
105-
github.com/pkg/errors v0.9.1 // indirect
106104
github.com/pmezard/go-difflib v1.0.0 // indirect
107105
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
108106
github.com/prometheus/client_model v0.6.2 // indirect
109-
github.com/prometheus/common v0.67.5 // indirect
107+
github.com/prometheus/common v0.69.0 // indirect
110108
github.com/prometheus/procfs v0.20.1 // indirect
111-
github.com/redis/go-redis/extra/rediscmd/v9 v9.18.0 // indirect
112-
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
109+
github.com/redis/go-redis/extra/rediscmd/v9 v9.21.0 // indirect
110+
github.com/shirou/gopsutil/v4 v4.26.5 // indirect
113111
github.com/sirupsen/logrus v1.9.4 // indirect
114-
github.com/tklauser/go-sysconf v0.3.16 // indirect
115-
github.com/tklauser/numcpus v0.11.0 // indirect
112+
github.com/tklauser/go-sysconf v0.4.0 // indirect
113+
github.com/tklauser/numcpus v0.12.0 // indirect
116114
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
117115
github.com/xdg-go/scram v1.2.0 // indirect
118116
github.com/xdg-go/stringprep v1.0.4 // indirect
119117
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
120118
github.com/yuin/gopher-lua v1.1.2 // indirect
121119
github.com/yusufpapurcu/wmi v1.2.4 // indirect
122120
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
123-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect
124122
go.uber.org/atomic v1.11.0 // indirect
125123
go.uber.org/mock v0.6.0 // indirect
126-
go.yaml.in/yaml/v2 v2.4.4 // indirect
127-
golang.org/x/crypto v0.49.0 // indirect
128-
golang.org/x/net v0.52.0 // indirect
129-
golang.org/x/sync v0.20.0 // indirect
130-
golang.org/x/sys v0.43.0 // indirect
131-
golang.org/x/text v0.35.0 // indirect
132-
google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
133-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
124+
golang.org/x/crypto v0.53.0 // indirect
125+
golang.org/x/net v0.56.0 // indirect
126+
golang.org/x/sync v0.21.0 // indirect
127+
golang.org/x/sys v0.46.0 // indirect
128+
golang.org/x/text v0.38.0 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20260618152121-87f3d3e198d3 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260618152121-87f3d3e198d3 // indirect
134131
)

0 commit comments

Comments
 (0)