Skip to content

Commit 425df52

Browse files
3vilhamster3vilhamster
authored
[common][dynamicconfig] Revamp dynamicconfig package to provide a cleanier boundaries of functionality (#6788)
1 parent 5d4f85c commit 425df52

File tree

234 files changed

+3482
-3357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+3482
-3357
lines changed

‎client/clientfactory.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
"github.com/uber/cadence/client/wrappers/thrift"
4747
timeoutwrapper "github.com/uber/cadence/client/wrappers/timeout"
4848
"github.com/uber/cadence/common/dynamicconfig"
49+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
4950
"github.com/uber/cadence/common/log"
5051
"github.com/uber/cadence/common/membership"
5152
"github.com/uber/cadence/common/metrics"
@@ -133,7 +134,7 @@ func (cf *rpcClientFactory) NewHistoryClientWithTimeout(timeout time.Duration) (
133134
peerResolver,
134135
cf.logger,
135136
)
136-
if errorRate := cf.dynConfig.GetFloat64Property(dynamicconfig.HistoryErrorInjectionRate)(); errorRate != 0 {
137+
if errorRate := cf.dynConfig.GetFloat64Property(dynamicproperties.HistoryErrorInjectionRate)(); errorRate != 0 {
137138
client = errorinjectors.NewHistoryClient(client, errorRate, cf.logger)
138139
}
139140
if cf.metricsClient != nil {
@@ -178,7 +179,7 @@ func (cf *rpcClientFactory) NewMatchingClientWithTimeout(
178179
partitionConfigProvider,
179180
)
180181
client = timeoutwrapper.NewMatchingClient(client, longPollTimeout, timeout)
181-
if errorRate := cf.dynConfig.GetFloat64Property(dynamicconfig.MatchingErrorInjectionRate)(); errorRate != 0 {
182+
if errorRate := cf.dynConfig.GetFloat64Property(dynamicproperties.MatchingErrorInjectionRate)(); errorRate != 0 {
182183
client = errorinjectors.NewMatchingClient(client, errorRate, cf.logger)
183184
}
184185
if cf.metricsClient != nil {
@@ -200,7 +201,7 @@ func (cf *rpcClientFactory) NewAdminClientWithTimeoutAndConfig(
200201
}
201202

202203
client = timeoutwrapper.NewAdminClient(client, largeTimeout, timeout)
203-
if errorRate := cf.dynConfig.GetFloat64Property(dynamicconfig.AdminErrorInjectionRate)(); errorRate != 0 {
204+
if errorRate := cf.dynConfig.GetFloat64Property(dynamicproperties.AdminErrorInjectionRate)(); errorRate != 0 {
204205
client = errorinjectors.NewAdminClient(client, errorRate, cf.logger)
205206
}
206207
if cf.metricsClient != nil {
@@ -227,7 +228,7 @@ func (cf *rpcClientFactory) NewFrontendClientWithTimeoutAndConfig(
227228
}
228229

229230
client = timeoutwrapper.NewFrontendClient(client, longPollTimeout, timeout)
230-
if errorRate := cf.dynConfig.GetFloat64Property(dynamicconfig.FrontendErrorInjectionRate)(); errorRate != 0 {
231+
if errorRate := cf.dynConfig.GetFloat64Property(dynamicproperties.FrontendErrorInjectionRate)(); errorRate != 0 {
231232
client = errorinjectors.NewFrontendClient(client, errorRate, cf.logger)
232233
}
233234
if cf.metricsClient != nil {
@@ -259,7 +260,7 @@ func (cf *rpcClientFactory) NewShardDistributorClientWithTimeout(
259260
)
260261

261262
client = timeoutwrapper.NewShardDistributorClient(client, timeout)
262-
if errorRate := cf.dynConfig.GetFloat64Property(dynamicconfig.ShardDistributorErrorInjectionRate)(); errorRate != 0 {
263+
if errorRate := cf.dynConfig.GetFloat64Property(dynamicproperties.ShardDistributorErrorInjectionRate)(); errorRate != 0 {
263264
client = errorinjectors.NewShardDistributorClient(client, errorRate, cf.logger)
264265
}
265266
if cf.metricsClient != nil {

‎client/matching/isolation_loadbalancer.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"math/rand"
2727

2828
"github.com/uber/cadence/common/dynamicconfig"
29+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
2930
"github.com/uber/cadence/common/isolationgroup"
3031
"github.com/uber/cadence/common/types"
3132
)
@@ -38,7 +39,7 @@ type isolationLoadBalancer struct {
3839
}
3940

4041
func NewIsolationLoadBalancer(fallback LoadBalancer, provider PartitionConfigProvider, domainIDToName func(string) (string, error), config *dynamicconfig.Collection) LoadBalancer {
41-
isolationEnabled := config.GetBoolPropertyFilteredByDomain(dynamicconfig.EnableTasklistIsolation)
42+
isolationEnabled := config.GetBoolPropertyFilteredByDomain(dynamicproperties.EnableTasklistIsolation)
4243
return &isolationLoadBalancer{
4344
provider: provider,
4445
fallback: fallback,

‎client/matching/multi_loadbalancer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
"github.com/uber/cadence/common/constants"
2929
"github.com/uber/cadence/common/dynamicconfig"
30+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3031
"github.com/uber/cadence/common/log"
3132
"github.com/uber/cadence/common/log/tag"
3233
"github.com/uber/cadence/common/types"
@@ -37,7 +38,7 @@ type (
3738
defaultLoadBalancer LoadBalancer
3839
loadBalancers map[string]LoadBalancer
3940
domainIDToName func(string) (string, error)
40-
loadbalancerStrategy dynamicconfig.StringPropertyFnWithTaskListInfoFilters
41+
loadbalancerStrategy dynamicproperties.StringPropertyFnWithTaskListInfoFilters
4142
logger log.Logger
4243
}
4344
)
@@ -53,7 +54,7 @@ func NewMultiLoadBalancer(
5354
defaultLoadBalancer: defaultLoadBalancer,
5455
loadBalancers: loadBalancers,
5556
domainIDToName: domainIDToName,
56-
loadbalancerStrategy: dc.GetStringPropertyFilteredByTaskListInfo(dynamicconfig.TasklistLoadBalancerStrategy),
57+
loadbalancerStrategy: dc.GetStringPropertyFilteredByTaskListInfo(dynamicproperties.TasklistLoadBalancerStrategy),
5758
logger: logger,
5859
}
5960
}

‎client/matching/partition_config_provider.go

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

3030
"github.com/uber/cadence/common/cache"
3131
"github.com/uber/cadence/common/dynamicconfig"
32+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3233
"github.com/uber/cadence/common/log"
3334
"github.com/uber/cadence/common/log/tag"
3435
"github.com/uber/cadence/common/metrics"
@@ -61,9 +62,9 @@ type (
6162
logger log.Logger
6263
metricsClient metrics.Client
6364
domainIDToName func(string) (string, error)
64-
enableReadFromCache dynamicconfig.BoolPropertyFnWithTaskListInfoFilters
65-
nReadPartitions dynamicconfig.IntPropertyFnWithTaskListInfoFilters
66-
nWritePartitions dynamicconfig.IntPropertyFnWithTaskListInfoFilters
65+
enableReadFromCache dynamicproperties.BoolPropertyFnWithTaskListInfoFilters
66+
nReadPartitions dynamicproperties.IntPropertyFnWithTaskListInfoFilters
67+
nWritePartitions dynamicproperties.IntPropertyFnWithTaskListInfoFilters
6768
}
6869
)
6970

@@ -89,9 +90,9 @@ func NewPartitionConfigProvider(
8990
logger: logger,
9091
metricsClient: metricsClient,
9192
domainIDToName: domainIDToName,
92-
enableReadFromCache: dc.GetBoolPropertyFilteredByTaskListInfo(dynamicconfig.MatchingEnableGetNumberOfPartitionsFromCache),
93-
nReadPartitions: dc.GetIntPropertyFilteredByTaskListInfo(dynamicconfig.MatchingNumTasklistReadPartitions),
94-
nWritePartitions: dc.GetIntPropertyFilteredByTaskListInfo(dynamicconfig.MatchingNumTasklistWritePartitions),
93+
enableReadFromCache: dc.GetBoolPropertyFilteredByTaskListInfo(dynamicproperties.MatchingEnableGetNumberOfPartitionsFromCache),
94+
nReadPartitions: dc.GetIntPropertyFilteredByTaskListInfo(dynamicproperties.MatchingNumTasklistReadPartitions),
95+
nWritePartitions: dc.GetIntPropertyFilteredByTaskListInfo(dynamicproperties.MatchingNumTasklistWritePartitions),
9596
configCache: cache.New(&cache.Options{
9697
TTL: 0,
9798
InitialCapacity: 100,

‎client/matching/partition_config_provider_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232

3333
"github.com/uber/cadence/common/cache"
3434
"github.com/uber/cadence/common/dynamicconfig"
35+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3536
"github.com/uber/cadence/common/log"
3637
"github.com/uber/cadence/common/log/testlogger"
3738
"github.com/uber/cadence/common/metrics"
@@ -68,9 +69,9 @@ func setUpMocksForPartitionConfigProvider(t *testing.T, enableReadFromCache bool
6869
logger: logger,
6970
metricsClient: metrics.NewNoopMetricsClient(),
7071
domainIDToName: domainIDToName,
71-
enableReadFromCache: dynamicconfig.GetBoolPropertyFilteredByTaskListInfo(enableReadFromCache),
72-
nReadPartitions: dynamicconfig.GetIntPropertyFilteredByTaskListInfo(3),
73-
nWritePartitions: dynamicconfig.GetIntPropertyFilteredByTaskListInfo(5),
72+
enableReadFromCache: dynamicproperties.GetBoolPropertyFilteredByTaskListInfo(enableReadFromCache),
73+
nReadPartitions: dynamicproperties.GetIntPropertyFilteredByTaskListInfo(3),
74+
nWritePartitions: dynamicproperties.GetIntPropertyFilteredByTaskListInfo(5),
7475
}, mockCache
7576
}
7677

‎cmd/server/cadence/server.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
"github.com/uber/cadence/common/constants"
4747
"github.com/uber/cadence/common/dynamicconfig"
4848
"github.com/uber/cadence/common/dynamicconfig/configstore"
49+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
4950
"github.com/uber/cadence/common/elasticsearch"
5051
"github.com/uber/cadence/common/isolationgroup/isolationgroupapi"
5152
cadencelog "github.com/uber/cadence/common/log"
@@ -164,7 +165,7 @@ func (s *server) startService() common.Daemon {
164165
dc := dynamicconfig.NewCollection(
165166
params.DynamicConfig,
166167
params.Logger,
167-
dynamicconfig.ClusterNameFilter(clusterGroupMetadata.CurrentClusterName),
168+
dynamicproperties.ClusterNameFilter(clusterGroupMetadata.CurrentClusterName),
168169
)
169170

170171
params.MetricScope = svcCfg.Metrics.NewScope(params.Logger, params.Name)
@@ -225,13 +226,13 @@ func (s *server) startService() common.Daemon {
225226
clusterGroupMetadata.PrimaryClusterName,
226227
clusterGroupMetadata.CurrentClusterName,
227228
clusterGroupMetadata.ClusterGroup,
228-
dc.GetBoolPropertyFilteredByDomain(dynamicconfig.UseNewInitialFailoverVersion),
229+
dc.GetBoolPropertyFilteredByDomain(dynamicproperties.UseNewInitialFailoverVersion),
229230
params.MetricsClient,
230231
params.Logger,
231232
)
232233

233234
advancedVisMode := dc.GetStringProperty(
234-
dynamicconfig.WriteVisibilityStoreName,
235+
dynamicproperties.WriteVisibilityStoreName,
235236
)()
236237
isAdvancedVisEnabled := common.IsAdvancedVisibilityWritingEnabled(advancedVisMode, params.PersistenceConfig.IsAdvancedVisibilityConfigExist())
237238
if isAdvancedVisEnabled {
@@ -266,8 +267,8 @@ func (s *server) startService() common.Daemon {
266267
)
267268

268269
params.ArchiverProvider = provider.NewArchiverProvider(s.cfg.Archival.History.Provider, s.cfg.Archival.Visibility.Provider)
269-
params.PersistenceConfig.TransactionSizeLimit = dc.GetIntProperty(dynamicconfig.TransactionSizeLimit)
270-
params.PersistenceConfig.ErrorInjectionRate = dc.GetFloat64Property(dynamicconfig.PersistenceErrorInjectionRate)
270+
params.PersistenceConfig.TransactionSizeLimit = dc.GetIntProperty(dynamicproperties.TransactionSizeLimit)
271+
params.PersistenceConfig.ErrorInjectionRate = dc.GetFloat64Property(dynamicproperties.PersistenceErrorInjectionRate)
271272
params.AuthorizationConfig = s.cfg.Authorization
272273
params.BlobstoreClient, err = filestore.NewFilestoreClient(s.cfg.Blobstore.Filestore)
273274
if err != nil {
@@ -320,7 +321,7 @@ func (*server) newMethod(
320321
wrappedRings[k] = membership.NewShardDistributorResolver(
321322
sharddistributorconstants.MatchingNamespace,
322323
shardDistributorClient,
323-
dc.GetStringProperty(dynamicconfig.MatchingShardDistributionMode),
324+
dc.GetStringProperty(dynamicproperties.MatchingShardDistributionMode),
324325
v,
325326
logger,
326327
)
@@ -344,7 +345,7 @@ func (*server) createShardDistributorClient(params resource.Params, dc *dynamicc
344345
)
345346

346347
shardDistributorClient = timeoutwrapper.NewShardDistributorClient(shardDistributorClient, timeoutwrapper.ShardDistributorDefaultTimeout)
347-
if errorRate := dc.GetFloat64Property(dynamicconfig.ShardDistributorErrorInjectionRate)(); errorRate != 0 {
348+
if errorRate := dc.GetFloat64Property(dynamicproperties.ShardDistributorErrorInjectionRate)(); errorRate != 0 {
348349
shardDistributorClient = errorinjectors.NewShardDistributorClient(shardDistributorClient, errorRate, params.Logger)
349350
}
350351
if params.MetricsClient != nil {
@@ -448,7 +449,7 @@ func validateIndex(config *config.ElasticSearchConfig) {
448449

449450
func getFromDynamicConfig(params resource.Params, dc *dynamicconfig.Collection) func() []string {
450451
return func() []string {
451-
res, err := isolationgroupapi.MapAllIsolationGroupsResponse(dc.GetListProperty(dynamicconfig.AllIsolationGroups)())
452+
res, err := isolationgroupapi.MapAllIsolationGroupsResponse(dc.GetListProperty(dynamicproperties.AllIsolationGroups)())
452453
if err != nil {
453454
params.Logger.Error("failed to get isolation groups from config", tag.Error(err))
454455
return nil

‎cmd/server/cadence/server_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"github.com/uber/cadence/common"
3737
"github.com/uber/cadence/common/config"
3838
"github.com/uber/cadence/common/dynamicconfig"
39+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3940
"github.com/uber/cadence/common/log"
4041
"github.com/uber/cadence/common/log/tag"
4142
"github.com/uber/cadence/common/log/testlogger"
@@ -128,7 +129,7 @@ func TestSettingGettingZonalIsolationGroupsFromIG(t *testing.T) {
128129

129130
ctrl := gomock.NewController(t)
130131
client := dynamicconfig.NewMockClient(ctrl)
131-
client.EXPECT().GetListValue(dynamicconfig.AllIsolationGroups, gomock.Any()).Return([]interface{}{
132+
client.EXPECT().GetListValue(dynamicproperties.AllIsolationGroups, gomock.Any()).Return([]interface{}{
132133
"zone-1", "zone-2",
133134
}, nil)
134135

@@ -146,7 +147,7 @@ func TestSettingGettingZonalIsolationGroupsFromIG(t *testing.T) {
146147
func TestSettingGettingZonalIsolationGroupsFromIGError(t *testing.T) {
147148
ctrl := gomock.NewController(t)
148149
client := dynamicconfig.NewMockClient(ctrl)
149-
client.EXPECT().GetListValue(dynamicconfig.AllIsolationGroups, gomock.Any()).Return(nil, assert.AnError)
150+
client.EXPECT().GetListValue(dynamicproperties.AllIsolationGroups, gomock.Any()).Return(nil, assert.AnError)
150151
dc := dynamicconfig.NewCollection(client, log.NewNoop())
151152

152153
assert.NotPanics(t, func() {

‎common/archiver/archivalMetadata.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/uber/cadence/common/config"
2828
"github.com/uber/cadence/common/constants"
2929
"github.com/uber/cadence/common/dynamicconfig"
30+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3031
"github.com/uber/cadence/common/types"
3132
)
3233

@@ -54,9 +55,9 @@ type (
5455

5556
archivalConfig struct {
5657
staticClusterStatus ArchivalStatus
57-
dynamicClusterStatus dynamicconfig.StringPropertyFn
58+
dynamicClusterStatus dynamicproperties.StringPropertyFn
5859
staticEnableRead bool
59-
dynamicEnableRead dynamicconfig.BoolPropertyFn
60+
dynamicEnableRead dynamicproperties.BoolPropertyFn
6061
domainDefaultStatus types.ArchivalStatus
6162
domainDefaultURI string
6263
}
@@ -86,18 +87,18 @@ func NewArchivalMetadata(
8687
) ArchivalMetadata {
8788
historyConfig := NewArchivalConfig(
8889
historyStatus,
89-
dc.GetStringProperty(dynamicconfig.HistoryArchivalStatus),
90+
dc.GetStringProperty(dynamicproperties.HistoryArchivalStatus),
9091
historyReadEnabled,
91-
dc.GetBoolProperty(dynamicconfig.EnableReadFromHistoryArchival),
92+
dc.GetBoolProperty(dynamicproperties.EnableReadFromHistoryArchival),
9293
domainDefaults.History.Status,
9394
domainDefaults.History.URI,
9495
)
9596

9697
visibilityConfig := NewArchivalConfig(
9798
visibilityStatus,
98-
dc.GetStringProperty(dynamicconfig.VisibilityArchivalStatus),
99+
dc.GetStringProperty(dynamicproperties.VisibilityArchivalStatus),
99100
visibilityReadEnabled,
100-
dc.GetBoolProperty(dynamicconfig.EnableReadFromVisibilityArchival),
101+
dc.GetBoolProperty(dynamicproperties.EnableReadFromVisibilityArchival),
101102
domainDefaults.Visibility.Status,
102103
domainDefaults.Visibility.URI,
103104
)
@@ -119,9 +120,9 @@ func (metadata *archivalMetadata) GetVisibilityConfig() ArchivalConfig {
119120
// NewArchivalConfig constructs a new valid ArchivalConfig
120121
func NewArchivalConfig(
121122
staticClusterStatusStr string,
122-
dynamicClusterStatus dynamicconfig.StringPropertyFn,
123+
dynamicClusterStatus dynamicproperties.StringPropertyFn,
123124
staticEnableRead bool,
124-
dynamicEnableRead dynamicconfig.BoolPropertyFn,
125+
dynamicEnableRead dynamicproperties.BoolPropertyFn,
125126
domainDefaultStatusStr string,
126127
domainDefaultURI string,
127128
) ArchivalConfig {

‎common/archiver/options.go

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

2727
"go.uber.org/cadence/activity"
2828

29-
"github.com/uber/cadence/common/dynamicconfig"
29+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3030
)
3131

3232
type (
@@ -39,7 +39,7 @@ type (
3939
ArchiveFeatureCatalog struct {
4040
ProgressManager ProgressManager
4141
NonRetriableError NonRetriableError
42-
ArchiveIncompleteHistory dynamicconfig.BoolPropertyFn
42+
ArchiveIncompleteHistory dynamicproperties.BoolPropertyFn
4343
}
4444

4545
// NonRetriableError returns an error indicating archiver has encountered an non-retriable error
@@ -57,7 +57,7 @@ type (
5757
// It should be called inside the Archive method.
5858
func GetFeatureCatalog(opts ...ArchiveOption) *ArchiveFeatureCatalog {
5959
catalog := &ArchiveFeatureCatalog{
60-
ArchiveIncompleteHistory: dynamicconfig.GetBoolPropertyFn(false),
60+
ArchiveIncompleteHistory: dynamicproperties.GetBoolPropertyFn(false),
6161
}
6262
for _, opt := range opts {
6363
opt(catalog)
@@ -102,7 +102,7 @@ func GetNonRetriableErrorOption(nonRetryableErr error) ArchiveOption {
102102
}
103103

104104
// GetArchivingIncompleteHistoryOption returns an ArchiveOption so that archiver would archive incomplete history
105-
func GetArchivingIncompleteHistoryOption(allow dynamicconfig.BoolPropertyFn) ArchiveOption {
105+
func GetArchivingIncompleteHistoryOption(allow dynamicproperties.BoolPropertyFn) ArchiveOption {
106106
return func(catalog *ArchiveFeatureCatalog) {
107107
catalog.ArchiveIncompleteHistory = allow
108108
}

‎common/cache/cache.go

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

2828
"github.com/uber/cadence/common"
2929
"github.com/uber/cadence/common/clock"
30-
"github.com/uber/cadence/common/dynamicconfig"
30+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3131
"github.com/uber/cadence/common/metrics"
3232
)
3333

@@ -81,7 +81,7 @@ type Options struct {
8181
// MaxSize is an optional flag, but it has to be used along with a value that implements Sizeable() interface
8282
// to control the max size in bytes of the cache
8383
// It is required option if MaxCount is not provided
84-
MaxSize dynamicconfig.IntPropertyFn
84+
MaxSize dynamicproperties.IntPropertyFn
8585

8686
// ActivelyEvict will evict items that has expired TTL at every operation in the cache
8787
// This can be expensive if a lot of items expire at the same time

‎common/cache/lru.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"time"
2929

3030
"github.com/uber/cadence/common/clock"
31-
"github.com/uber/cadence/common/dynamicconfig"
31+
"github.com/uber/cadence/common/dynamicconfig/dynamicproperties"
3232
"github.com/uber/cadence/common/log"
3333
"github.com/uber/cadence/common/log/tag"
3434
)
@@ -55,7 +55,7 @@ type (
5555
pin bool
5656
rmFunc RemovedFunc
5757
sizeFunc GetCacheItemSizeFunc
58-
maxSize dynamicconfig.IntPropertyFn
58+
maxSize dynamicproperties.IntPropertyFn
5959
currSize uint64
6060
sizeByKey map[interface{}]uint64
6161
isSizeBased bool
@@ -178,13 +178,13 @@ func New(opts *Options, logger log.Logger) Cache {
178178
cache.maxSize = opts.MaxSize
179179
if cache.maxSize == nil {
180180
// If maxSize is not defined for size-based cache, set default to cacheCountLimit
181-
cache.maxSize = dynamicconfig.GetIntPropertyFn(cacheDefaultSizeLimit)
181+
cache.maxSize = dynamicproperties.GetIntPropertyFn(cacheDefaultSizeLimit)
182182
}
183183
cache.sizeByKey = make(map[interface{}]uint64, opts.InitialCapacity)
184184
} else {
185185
// cache is count based if max size and sizeFunc are not provided
186186
cache.maxCount = opts.MaxCount
187-
cache.maxSize = dynamicconfig.GetIntPropertyFn(0)
187+
cache.maxSize = dynamicproperties.GetIntPropertyFn(0)
188188
cache.sizeFunc = func(interface{}) uint64 {
189189
return 0
190190
}

0 commit comments

Comments
 (0)