Skip to content

Commit 57c4650

Browse files
3vilhamster3vilhamster
committed
review comments
1 parent da9d124 commit 57c4650

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

‎cmd/server/cadence/server_test.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
package cadence
2525

2626
import (
27-
"log"
2827
"os"
2928
"testing"
3029
"time"
@@ -37,7 +36,9 @@ import (
3736
"github.com/uber/cadence/common"
3837
"github.com/uber/cadence/common/config"
3938
"github.com/uber/cadence/common/dynamicconfig"
40-
log2 "github.com/uber/cadence/common/log"
39+
"github.com/uber/cadence/common/log"
40+
"github.com/uber/cadence/common/log/tag"
41+
"github.com/uber/cadence/common/log/testlogger"
4142
"github.com/uber/cadence/common/persistence/nosql/nosqlplugin/cassandra/gocql"
4243
"github.com/uber/cadence/common/resource"
4344
"github.com/uber/cadence/common/service"
@@ -51,6 +52,8 @@ import (
5152
type ServerSuite struct {
5253
*require.Assertions
5354
suite.Suite
55+
56+
logger log.Logger
5457
}
5558

5659
func TestServerSuite(t *testing.T) {
@@ -60,6 +63,7 @@ func TestServerSuite(t *testing.T) {
6063

6164
func (s *ServerSuite) SetupTest() {
6265
s.Assertions = require.New(s.T())
66+
s.logger = testlogger.New(s.T())
6367
}
6468

6569
/*
@@ -77,7 +81,7 @@ func (s *ServerSuite) TestServerStartup() {
7781
var cfg config.Config
7882
err := config.Load(env, configDir, zone, &cfg)
7983
if err != nil {
80-
log.Fatal("Config file corrupted.", err)
84+
s.logger.Fatal("Config file corrupted.", tag.Error(err))
8185
}
8286

8387
if os.Getenv("CASSANDRA_SEEDS") == "cassandra" {
@@ -97,11 +101,11 @@ func (s *ServerSuite) TestServerStartup() {
97101
cfg.DynamicConfig.FileBased.Filepath = constructPathIfNeed(rootDir, cfg.DynamicConfig.FileBased.Filepath)
98102

99103
if err := cfg.ValidateAndFillDefaults(); err != nil {
100-
log.Fatalf("config validation failed: %v", err)
104+
s.logger.Fatal("config validation failed", tag.Error(err))
101105
}
102106
// cassandra schema version validation
103107
if err := cassandra.VerifyCompatibleVersion(cfg.Persistence, gocql.All); err != nil {
104-
log.Fatal("cassandra schema version compatibility check failed: ", err)
108+
s.logger.Fatal("cassandra schema version compatibility check failed", tag.Error(err))
105109
}
106110

107111
var daemons []common.Daemon
@@ -128,11 +132,11 @@ func TestSettingGettingZonalIsolationGroupsFromIG(t *testing.T) {
128132
"zone-1", "zone-2",
129133
}, nil)
130134

131-
dc := dynamicconfig.NewCollection(client, log2.NewNoop())
135+
dc := dynamicconfig.NewCollection(client, log.NewNoop())
132136

133137
assert.NotPanics(t, func() {
134138
fn := getFromDynamicConfig(resource.Params{
135-
Logger: log2.NewNoop(),
139+
Logger: log.NewNoop(),
136140
}, dc)
137141
out := fn()
138142
assert.Equal(t, []string{"zone-1", "zone-2"}, out)
@@ -143,11 +147,11 @@ func TestSettingGettingZonalIsolationGroupsFromIGError(t *testing.T) {
143147
ctrl := gomock.NewController(t)
144148
client := dynamicconfig.NewMockClient(ctrl)
145149
client.EXPECT().GetListValue(dynamicconfig.AllIsolationGroups, gomock.Any()).Return(nil, assert.AnError)
146-
dc := dynamicconfig.NewCollection(client, log2.NewNoop())
150+
dc := dynamicconfig.NewCollection(client, log.NewNoop())
147151

148152
assert.NotPanics(t, func() {
149153
getFromDynamicConfig(resource.Params{
150-
Logger: log2.NewNoop(),
154+
Logger: log.NewNoop(),
151155
}, dc)()
152156
})
153157
}

‎common/quotas/global/collection/collection_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838

3939
"github.com/uber/cadence/common/clock"
4040
"github.com/uber/cadence/common/dynamicconfig"
41-
dynamicQuotas "github.com/uber/cadence/common/dynamicconfig/quotas"
41+
dynamicquotas "github.com/uber/cadence/common/dynamicconfig/quotas"
4242
"github.com/uber/cadence/common/log/testlogger"
4343
"github.com/uber/cadence/common/metrics"
4444
"github.com/uber/cadence/common/quotas"
@@ -121,10 +121,10 @@ func TestCollectionLimitersCollectMetrics(t *testing.T) {
121121
t.Parallel()
122122

123123
// anything non-zero
124-
localLimiters := dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
124+
localLimiters := dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
125125
return 1
126126
})
127-
globalLimiters := dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
127+
globalLimiters := dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
128128
return 10
129129
})
130130

@@ -184,7 +184,7 @@ func TestCollectionSubmitsDataAndUpdates(t *testing.T) {
184184

185185
ctrl := gomock.NewController(t)
186186
// anything non-zero
187-
limiters := dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
187+
limiters := dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int {
188188
return 1
189189
})
190190
logger, observed := testlogger.NewObserved(t)
@@ -280,8 +280,8 @@ func TestTogglingMode(t *testing.T) {
280280
mode.Store(modeDisabled)
281281
c, err := New(
282282
"test",
283-
quotas.NewCollection(dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 1 })),
284-
quotas.NewCollection(dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 1 })),
283+
quotas.NewCollection(dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 1 })),
284+
quotas.NewCollection(dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 1 })),
285285
func(opts ...dynamicconfig.FilterOption) time.Duration { return time.Second }, // update every second
286286
func(domain string) int { return 1 },
287287
func(globalRatelimitKey string) string { return string(mode.Load().(keyMode)) },

‎service/history/task/priority_assigner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/uber/cadence/common"
2727
"github.com/uber/cadence/common/cache"
2828
"github.com/uber/cadence/common/constants"
29-
dynamicQuotas "github.com/uber/cadence/common/dynamicconfig/quotas"
29+
dynamicquotas "github.com/uber/cadence/common/dynamicconfig/quotas"
3030
"github.com/uber/cadence/common/log"
3131
"github.com/uber/cadence/common/log/tag"
3232
"github.com/uber/cadence/common/metrics"
@@ -66,7 +66,7 @@ func NewPriorityAssigner(
6666
config: config,
6767
logger: logger,
6868
scope: metricClient.Scope(metrics.TaskPriorityAssignerScope),
69-
rateLimiters: quotas.NewCollection(dynamicQuotas.NewSimpleDynamicRateLimiterFactory(
69+
rateLimiters: quotas.NewCollection(dynamicquotas.NewSimpleDynamicRateLimiterFactory(
7070
config.TaskProcessRPS,
7171
)),
7272
}

‎service/history/task/task_rate_limiter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/uber/cadence/common/cache"
3131
"github.com/uber/cadence/common/dynamicconfig"
32-
dynamicQuotas "github.com/uber/cadence/common/dynamicconfig/quotas"
32+
dynamicquotas "github.com/uber/cadence/common/dynamicconfig/quotas"
3333
"github.com/uber/cadence/common/log"
3434
"github.com/uber/cadence/common/log/tag"
3535
"github.com/uber/cadence/common/metrics"
@@ -67,7 +67,7 @@ func NewRateLimiter(
6767
numShards := float64(controller.NumShards())
6868
return int(totalRPS * numShards / totalShards)
6969
}
70-
limiterFactory := dynamicQuotas.NewSimpleDynamicRateLimiterFactory(rps)
70+
limiterFactory := dynamicquotas.NewSimpleDynamicRateLimiterFactory(rps)
7171
return &taskRateLimiterImpl{
7272
logger: logger,
7373
metricsScope: metricsClient.Scope(metrics.TaskSchedulerRateLimiterScope),

‎service/matching/handler/handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/uber/cadence/common"
2828
"github.com/uber/cadence/common/cache"
29-
dynamicQuotas "github.com/uber/cadence/common/dynamicconfig/quotas"
29+
dynamicquotas "github.com/uber/cadence/common/dynamicconfig/quotas"
3030
"github.com/uber/cadence/common/log"
3131
"github.com/uber/cadence/common/metrics"
3232
"github.com/uber/cadence/common/quotas"
@@ -65,14 +65,14 @@ func NewHandler(
6565
metricsClient: metricsClient,
6666
userRateLimiter: quotas.NewMultiStageRateLimiter(
6767
quotas.NewDynamicRateLimiter(config.UserRPS.AsFloat64()),
68-
quotas.NewCollection(dynamicQuotas.NewFallbackDynamicRateLimiterFactory(
68+
quotas.NewCollection(dynamicquotas.NewFallbackDynamicRateLimiterFactory(
6969
config.DomainUserRPS,
7070
config.UserRPS,
7171
)),
7272
),
7373
workerRateLimiter: quotas.NewMultiStageRateLimiter(
7474
quotas.NewDynamicRateLimiter(config.WorkerRPS.AsFloat64()),
75-
quotas.NewCollection(dynamicQuotas.NewFallbackDynamicRateLimiterFactory(
75+
quotas.NewCollection(dynamicquotas.NewFallbackDynamicRateLimiterFactory(
7676
config.DomainWorkerRPS,
7777
config.WorkerRPS,
7878
)),

‎service/matching/handler/handler_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/uber/cadence/common"
3636
"github.com/uber/cadence/common/cache"
3737
"github.com/uber/cadence/common/dynamicconfig"
38-
dynamicQuotas "github.com/uber/cadence/common/dynamicconfig/quotas"
38+
dynamicquotas "github.com/uber/cadence/common/dynamicconfig/quotas"
3939
"github.com/uber/cadence/common/metrics"
4040
"github.com/uber/cadence/common/quotas"
4141
"github.com/uber/cadence/common/resource"
@@ -88,11 +88,11 @@ func (s *handlerSuite) SetupTest() {
8888
startWG: sync.WaitGroup{},
8989
userRateLimiter: quotas.NewMultiStageRateLimiter(
9090
s.mockLimiter,
91-
quotas.NewCollection(dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 10 })),
91+
quotas.NewCollection(dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 10 })),
9292
),
9393
workerRateLimiter: quotas.NewMultiStageRateLimiter(
9494
s.mockLimiter,
95-
quotas.NewCollection(dynamicQuotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 10 })),
95+
quotas.NewCollection(dynamicquotas.NewSimpleDynamicRateLimiterFactory(func(domain string) int { return 10 })),
9696
),
9797
logger: s.mockResource.GetLogger(),
9898
throttledLogger: s.mockResource.GetThrottledLogger(),

0 commit comments

Comments
 (0)