From 0373abdf349e55c73a1ae61613f6de713452a7cc Mon Sep 17 00:00:00 2001 From: S-H1129 Date: Tue, 20 Apr 2021 16:48:59 +0900 Subject: [PATCH] feat: add opencensus metrics --- go.mod | 1 + go.sum | 16 ++++++++ pkg/bucketeer/metrics.go | 72 +++++++++++++++++++++++++++++++++++ pkg/bucketeer/sdk.go | 17 ++++++++- pkg/bucketeer/sdk_test.go | 80 ++++++++++++++++++++++++++++++--------- 5 files changed, 168 insertions(+), 18 deletions(-) create mode 100644 pkg/bucketeer/metrics.go diff --git a/go.mod b/go.mod index fa30e01..4267cd0 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/golang/mock v1.5.0 github.com/golang/protobuf v1.4.3 github.com/stretchr/testify v1.7.0 + go.opencensus.io v0.23.0 google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb google.golang.org/grpc v1.36.0 ) diff --git a/go.sum b/go.sum index fb6c64b..3431496 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,17 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= @@ -30,16 +33,21 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -52,6 +60,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -60,8 +70,13 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -82,6 +97,7 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/pkg/bucketeer/metrics.go b/pkg/bucketeer/metrics.go new file mode 100644 index 0000000..a2665f9 --- /dev/null +++ b/pkg/bucketeer/metrics.go @@ -0,0 +1,72 @@ +package bucketeer + +import ( + "context" + "sync" + "time" + + "go.opencensus.io/stats" + "go.opencensus.io/stats/view" + "go.opencensus.io/tag" +) + + +var ( + registerOnce sync.Once + latencyMs = stats.Int64("bucketeer_latency_distribution", "bucketeer api latency in milliseconds", stats.UnitMilliseconds) + counter = stats.Int64("bucketeer_call_count", "bucketeer api call count", stats.UnitDimensionless) +) + +var ( + KeyFeatureID = tag.MustNewKey("featureID") + KeyStatus = tag.MustNewKey("status") +) + +func RegisterMetrics() error { + views := []*view.View{ + { + Name: latencyMs.Name(), + Measure: latencyMs, + Description: latencyMs.Description(), + TagKeys: []tag.Key{KeyFeatureID, KeyStatus}, + Aggregation: newLatencyDistribution(), + }, + { + Name: counter.Name(), + Measure: counter, + Description: counter.Description(), + TagKeys: []tag.Key{KeyFeatureID, KeyStatus}, + Aggregation: view.Count(), + }, + } + var err error + registerOnce.Do(func() { + err = view.Register(views...) + }) + return err +} + +func measure(ctx context.Context, v time.Duration) { + stats.Record(ctx, latencyMs.M(v.Milliseconds())) +} + +func count(ctx context.Context) { + stats.Record(ctx, counter.M(1)) +} + +func NewContext(ctx context.Context, featureID string) (context.Context, error) { + return tag.New( + ctx, + tag.Insert(KeyFeatureID, featureID), + ) +} + +func newLatencyDistribution() *view.Aggregation { + const begin, count, exp = 25.0, 9, 2 + dist := make([]float64, count) + dist[0] = begin + for i := 1; i < count; i++ { + dist[i] = dist[i-1] * exp + } + return view.Distribution(dist...) +} diff --git a/pkg/bucketeer/sdk.go b/pkg/bucketeer/sdk.go index 8eaaa6c..8390f3c 100644 --- a/pkg/bucketeer/sdk.go +++ b/pkg/bucketeer/sdk.go @@ -5,6 +5,7 @@ import ( "encoding/json" "errors" "fmt" + "go.opencensus.io/tag" "strconv" "time" @@ -218,6 +219,21 @@ func (s *sdk) JSONVariation(ctx context.Context, user *User, featureID string, d } func (s *sdk) getEvaluation(ctx context.Context, user *User, featureID string) (*protofeature.Evaluation, error) { + ctx, err := NewContext(ctx, featureID) + if err != nil { + return nil, fmt.Errorf("failed to generate new context: %w", err) + } + reqStart := time.Now() + defer func() { + state := status.Code(err).String() + ctx, err := tag.New(ctx, tag.Insert(KeyStatus, state)) + if err != nil { + return + } + + count(ctx) + measure(ctx, time.Since(reqStart)) + }() if !user.Valid() { return nil, fmt.Errorf("invalid user: %v", user) } @@ -226,7 +242,6 @@ func (s *sdk) getEvaluation(ctx context.Context, user *User, featureID string) ( User: user.User, FeatureId: featureID, } - reqStart := time.Now() res, err := s.apiClient.GetEvaluation(ctx, req) if err != nil || res == nil { if status.Code(err) == codes.DeadlineExceeded { diff --git a/pkg/bucketeer/sdk_test.go b/pkg/bucketeer/sdk_test.go index 6877a44..b549d16 100644 --- a/pkg/bucketeer/sdk_test.go +++ b/pkg/bucketeer/sdk_test.go @@ -40,6 +40,8 @@ func TestBoolVariation(t *testing.T) { { desc: "return default value when failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -47,7 +49,7 @@ func TestBoolVariation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -60,6 +62,8 @@ func TestBoolVariation(t *testing.T) { { desc: "return default value when faled to parse variation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "invalid") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -74,7 +78,7 @@ func TestBoolVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -87,6 +91,8 @@ func TestBoolVariation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "true") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -101,7 +107,7 @@ func TestBoolVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -140,6 +146,8 @@ func TestIntVariation(t *testing.T) { { desc: "return default value when failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -147,7 +155,7 @@ func TestIntVariation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -160,6 +168,8 @@ func TestIntVariation(t *testing.T) { { desc: "return default value when faled to parse variation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "invalid") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -174,7 +184,7 @@ func TestIntVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -187,6 +197,8 @@ func TestIntVariation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "2") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -201,7 +213,7 @@ func TestIntVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -240,6 +252,8 @@ func TestInt64Variation(t *testing.T) { { desc: "return default value when failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -247,7 +261,7 @@ func TestInt64Variation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -260,6 +274,8 @@ func TestInt64Variation(t *testing.T) { { desc: "return default value when faled to parse variation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "invalid") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -274,7 +290,7 @@ func TestInt64Variation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -287,6 +303,8 @@ func TestInt64Variation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "2") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -301,7 +319,7 @@ func TestInt64Variation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -340,6 +358,8 @@ func TestFloat64Variation(t *testing.T) { { desc: "return default value when failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -347,7 +367,7 @@ func TestFloat64Variation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -360,6 +380,8 @@ func TestFloat64Variation(t *testing.T) { { desc: "return default value when faled to parse variation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "invalid") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -374,7 +396,7 @@ func TestFloat64Variation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -387,6 +409,8 @@ func TestFloat64Variation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "2.2") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -401,7 +425,7 @@ func TestFloat64Variation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -440,6 +464,8 @@ func TestStringVariation(t *testing.T) { { desc: "return default value when failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -447,7 +473,7 @@ func TestStringVariation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -460,6 +486,8 @@ func TestStringVariation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "value") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -474,7 +502,7 @@ func TestStringVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -517,6 +545,8 @@ func TestJSONVariation(t *testing.T) { { desc: "failed to get evaluation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -524,7 +554,7 @@ func TestJSONVariation(t *testing.T) { ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushInternalErrorCountMetricsEvent(ctx, sdkTag) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -537,6 +567,8 @@ func TestJSONVariation(t *testing.T) { { desc: "faled to unmarshal variation", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, `invalid`) s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -551,7 +583,7 @@ func TestJSONVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushDefaultEvaluationEvent( - ctx, + context.Background(), user.User, featureID, ) @@ -564,6 +596,8 @@ func TestJSONVariation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, `{"str": "str2", "int": "int2"}`) s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -578,7 +612,7 @@ func TestJSONVariation(t *testing.T) { sdkTag, ) s.eventProcessor.(*mockevent.MockProcessor).EXPECT().PushEvaluationEvent( - ctx, + context.Background(), user.User, res.Evaluation, ) @@ -625,6 +659,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "get evaluations returns timeout error", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -640,6 +676,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "get evaluations returns internal error", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return( nil, @@ -655,6 +693,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "invalid get evaluation res: evaluation is nil", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "value") res.Evaluation = nil @@ -678,6 +718,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "invalid get evaluation res: feature id doesn't match", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, "invalid-feature-id", "value") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(res, nil) @@ -700,6 +742,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "invalid get evaluation res: variation is nil", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "value") res.Evaluation.Variation = nil @@ -723,6 +767,8 @@ func TestGetEvaluation(t *testing.T) { { desc: "success", setup: func(ctx context.Context, s *sdk, user *User, featureID string) { + ctx, err := NewContext(ctx, featureID) + assert.NoError(t, err) req := &protogateway.GetEvaluationRequest{Tag: sdkTag, User: user.User, FeatureId: featureID} res := newGetEvaluationResponse(t, featureID, "value") s.apiClient.(*mockapi.MockClient).EXPECT().GetEvaluation(ctx, req).Return(