Skip to content

Commit ce87102

Browse files
erkasahidvelji
erka
and
sahidvelji
authored
fix(deps): bump open-feature/go-sdk from v1.11 to v1.15 (#686)
Signed-off-by: Roman Dmytrenko <[email protected]> Co-authored-by: Sahid Velji <[email protected]>
1 parent e3ee678 commit ce87102

File tree

17 files changed

+119
-163
lines changed

17 files changed

+119
-163
lines changed

‎hooks/open-telemetry/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/open-feature/go-sdk-contrib/hooks/open-telemetry
22

3-
go 1.21
3+
go 1.23.0
44

55
require (
6-
github.com/open-feature/go-sdk v1.11.0
6+
github.com/open-feature/go-sdk v1.15.0
77
go.opentelemetry.io/otel v1.28.0
88
go.opentelemetry.io/otel/metric v1.28.0
99
go.opentelemetry.io/otel/sdk v1.28.0
@@ -12,9 +12,9 @@ require (
1212
)
1313

1414
require (
15-
github.com/go-logr/logr v1.4.2 // indirect
15+
github.com/go-logr/logr v1.4.3 // indirect
1616
github.com/go-logr/stdr v1.2.2 // indirect
1717
github.com/google/uuid v1.6.0 // indirect
18-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
18+
go.uber.org/mock v0.5.2 // indirect
1919
golang.org/x/sys v0.21.0 // indirect
2020
)

‎hooks/open-telemetry/go.sum‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
4-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
5-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
4+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
5+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
66
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
77
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
8-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
9-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
108
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
119
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1210
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
1311
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
14-
github.com/open-feature/go-sdk v1.11.0 h1:4cp9rXl16ZvlMCef7O+I3vQSXae8DzAF0SfV9mvYInw=
15-
github.com/open-feature/go-sdk v1.11.0/go.mod h1:+rkJhLBtYsJ5PZNddAgFILhRAAxwrJ32aU7UEUm4zQI=
12+
github.com/open-feature/go-sdk v1.15.0 h1:FEZl4kCH6H2drhnQ0dheDBxLvwwzO7zvzdUl8zzZLX4=
13+
github.com/open-feature/go-sdk v1.15.0/go.mod h1:LkqPL/17XMGcRvTdk1qqwSSG1ICe/D2MQP0blDaXfh0=
1614
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1715
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1816
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
@@ -27,11 +25,11 @@ go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnC
2725
go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg=
2826
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
2927
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
30-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
31-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
28+
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
29+
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
3230
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
3331
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
34-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
35-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
32+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
33+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
3634
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
3735
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎hooks/open-telemetry/pkg/metrics.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ func NewMetricsHookForProvider(provider api.MeterProvider, opts ...MetricOptions
7676
}
7777

7878
func (h *MetricsHook) Before(ctx context.Context, hCtx openfeature.HookContext,
79-
hint openfeature.HookHints) (*openfeature.EvaluationContext, error) {
80-
79+
hint openfeature.HookHints,
80+
) (*openfeature.EvaluationContext, error) {
8181
h.activeCounter.Add(ctx, +1, api.WithAttributes(semconv.FeatureFlagKey(hCtx.FlagKey())))
8282

8383
h.requestCounter.Add(ctx, 1,
@@ -89,11 +89,12 @@ func (h *MetricsHook) Before(ctx context.Context, hCtx openfeature.HookContext,
8989
}
9090

9191
func (h *MetricsHook) After(ctx context.Context, hCtx openfeature.HookContext,
92-
details openfeature.InterfaceEvaluationDetails, hint openfeature.HookHints) error {
93-
92+
details openfeature.InterfaceEvaluationDetails, hint openfeature.HookHints,
93+
) error {
9494
attribs := []attribute.KeyValue{
9595
semconv.FeatureFlagKey(hCtx.FlagKey()),
96-
semconv.FeatureFlagProviderName(hCtx.ProviderMetadata().Name)}
96+
semconv.FeatureFlagProviderName(hCtx.ProviderMetadata().Name),
97+
}
9798

9899
if details.Variant != "" {
99100
attribs = append(attribs, semconv.FeatureFlagVariant(details.Variant))
@@ -122,7 +123,7 @@ func (h *MetricsHook) Error(ctx context.Context, hCtx openfeature.HookContext, e
122123
attribute.String(semconv.ExceptionEventName, err.Error())))
123124
}
124125

125-
func (h *MetricsHook) Finally(ctx context.Context, hCtx openfeature.HookContext, hint openfeature.HookHints) {
126+
func (h *MetricsHook) Finally(ctx context.Context, hCtx openfeature.HookContext, flagEvaluationDetails openfeature.InterfaceEvaluationDetails, hint openfeature.HookHints) {
126127
h.activeCounter.Add(ctx, -1, api.WithAttributes(semconv.FeatureFlagKey(hCtx.FlagKey())))
127128
}
128129

@@ -167,7 +168,6 @@ func WithMetricsAttributeSetter(callback func(openfeature.FlagMetadata) []attrib
167168
// descriptionsToAttributes is a helper to extract dimensions from openfeature.FlagMetadata. Missing metadata
168169
// dimensions are ignore.
169170
func descriptionsToAttributes(metadata openfeature.FlagMetadata, descriptions []DimensionDescription) []attribute.KeyValue {
170-
171171
attribs := []attribute.KeyValue{}
172172
for _, dimension := range descriptions {
173173
switch dimension.Type {

‎hooks/open-telemetry/pkg/metrics_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package otel
33
import (
44
"context"
55
"errors"
6+
"reflect"
7+
"testing"
8+
69
"github.com/open-feature/go-sdk/openfeature"
710
"go.opentelemetry.io/otel/attribute"
811
"go.opentelemetry.io/otel/sdk/metric"
912
"go.opentelemetry.io/otel/sdk/metric/metricdata"
10-
"reflect"
11-
"testing"
1213
)
1314

1415
func TestMetricsHook_BeforeStage(t *testing.T) {
@@ -180,7 +181,7 @@ func TestMetricsHook_FinallyStage(t *testing.T) {
180181
}
181182

182183
// when
183-
metricsHook.Finally(ctx, hookContext, hookHints)
184+
metricsHook.Finally(ctx, hookContext, openfeature.InterfaceEvaluationDetails{}, hookHints)
184185

185186
// then
186187
var data metricdata.ResourceMetrics
@@ -215,7 +216,7 @@ func TestMetricsHook_ActiveCounterShouldBeZero(t *testing.T) {
215216
ctx := context.Background()
216217

217218
hookContext := hookContext()
218-
hookHints := openfeature.NewHookHints(map[string]interface{}{})
219+
hookHints := openfeature.NewHookHints(map[string]any{})
219220

220221
metricsHook, err := NewMetricsHookForProvider(metric.NewMeterProvider(metric.WithReader(manualReader)))
221222
if err != nil {
@@ -230,7 +231,7 @@ func TestMetricsHook_ActiveCounterShouldBeZero(t *testing.T) {
230231
return
231232
}
232233

233-
metricsHook.Finally(ctx, hookContext, hookHints)
234+
metricsHook.Finally(ctx, hookContext, openfeature.InterfaceEvaluationDetails{}, hookHints)
234235

235236
// then
236237
var data metricdata.ResourceMetrics
@@ -428,7 +429,6 @@ func TestMetricHook_MetadataExtractionOptions(t *testing.T) {
428429
t.Errorf("attribute %s is incorrectly configured", cachedKey)
429430
}
430431
})
431-
432432
}
433433

434434
func hookContext() openfeature.HookContext {

‎hooks/validator/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/open-feature/go-sdk-contrib/hooks/validator
22

3-
go 1.21
3+
go 1.23.0
44

5-
require github.com/open-feature/go-sdk v1.11.0
5+
require github.com/open-feature/go-sdk v1.15.0
66

77
require (
8-
github.com/go-logr/logr v1.4.1 // indirect
9-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
8+
github.com/go-logr/logr v1.4.3 // indirect
9+
go.uber.org/mock v0.5.2 // indirect
1010
)

‎hooks/validator/go.sum‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
2-
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
3-
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
4-
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
5-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
6-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
7-
github.com/open-feature/go-sdk v1.9.0 h1:1Nyj+XNHfL0rRGZgGCbZ29CHDD57PQJL7Q/2ZbW/E8c=
8-
github.com/open-feature/go-sdk v1.9.0/go.mod h1:n5BM4DfvIiKaWWquZnL/yVihcGM5aLsz7rNYE3BkXAM=
9-
github.com/open-feature/go-sdk v1.10.0 h1:druQtYOrN+gyz3rMsXp0F2jW1oBXJb0V26PVQnUGLbM=
10-
github.com/open-feature/go-sdk v1.10.0/go.mod h1:+rkJhLBtYsJ5PZNddAgFILhRAAxwrJ32aU7UEUm4zQI=
11-
github.com/open-feature/go-sdk v1.11.0 h1:4cp9rXl16ZvlMCef7O+I3vQSXae8DzAF0SfV9mvYInw=
12-
github.com/open-feature/go-sdk v1.11.0/go.mod h1:+rkJhLBtYsJ5PZNddAgFILhRAAxwrJ32aU7UEUm4zQI=
13-
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA=
14-
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
15-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
16-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
17-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
18-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1+
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
2+
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
3+
github.com/open-feature/go-sdk v1.15.0 h1:FEZl4kCH6H2drhnQ0dheDBxLvwwzO7zvzdUl8zzZLX4=
4+
github.com/open-feature/go-sdk v1.15.0/go.mod h1:LkqPL/17XMGcRvTdk1qqwSSG1ICe/D2MQP0blDaXfh0=
5+
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
6+
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
7+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
8+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=

‎providers/flagd/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ require (
1111
connectrpc.com/connect v1.18.1
1212
connectrpc.com/otelconnect v0.7.2
1313
github.com/cucumber/godog v0.15.0
14-
github.com/go-logr/logr v1.4.2
14+
github.com/go-logr/logr v1.4.3
1515
github.com/google/go-cmp v0.7.0
1616
github.com/hashicorp/golang-lru/v2 v2.0.7
1717
github.com/open-feature/flagd/core v0.11.2
18-
github.com/open-feature/go-sdk v1.11.0
18+
github.com/open-feature/go-sdk v1.15.0
1919
github.com/open-feature/go-sdk-contrib/tests/flagd v1.4.1
2020
github.com/testcontainers/testcontainers-go v0.32.0
2121
go.uber.org/mock v0.5.2
@@ -48,12 +48,12 @@ require (
4848
github.com/fsnotify/fsnotify v1.8.0 // indirect
4949
github.com/go-logr/stdr v1.2.2 // indirect
5050
github.com/go-ole/go-ole v1.2.6 // indirect
51-
github.com/gofrs/uuid v4.3.1+incompatible // indirect
51+
github.com/gofrs/uuid v4.4.0+incompatible // indirect
5252
github.com/gogo/protobuf v1.3.2 // indirect
5353
github.com/google/uuid v1.6.0 // indirect
5454
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
5555
github.com/hashicorp/go-memdb v1.3.4 // indirect
56-
github.com/hashicorp/golang-lru v0.5.4 // indirect
56+
github.com/hashicorp/golang-lru v1.0.2 // indirect
5757
github.com/klauspost/compress v1.17.11 // indirect
5858
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
5959
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -90,7 +90,7 @@ require (
9090
golang.org/x/crypto v0.36.0 // indirect
9191
golang.org/x/mod v0.24.0 // indirect
9292
golang.org/x/sys v0.31.0 // indirect
93-
golang.org/x/text v0.23.0 // indirect
93+
golang.org/x/text v0.25.0 // indirect
9494
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect
9696
)

0 commit comments

Comments
 (0)