Skip to content

Commit 9e9c98f

Browse files
committed
renaming 'cache' to be 'metricCache' so its more meaningful
1 parent 488362a commit 9e9c98f

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

receiver/sqlserverreceiver/factory.go

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

2525
var errConfigNotSQLServer = errors.New("config was not a sqlserver receiver config")
2626

27-
// newCache creates a new cache with the given size.
27+
// newCache creates a new metricCache with the given size.
2828
// If the size is less or equal to 0, it will be set to 1.
2929
// It will never return an error.
3030
func newCache(size int) *lru.Cache[string, int64] {
@@ -131,7 +131,7 @@ func setupSQLServerScrapers(params receiver.Settings, cfg *Config) []*sqlServerS
131131
id := component.NewIDWithName(metadata.Type, fmt.Sprintf("query-%d: %s", i, query))
132132

133133
// lru only returns error when the size is less than 0
134-
cache := newCache(1)
134+
metricCache := newCache(1)
135135
planCache, _ := lru.New[string, string](1)
136136

137137
sqlServerScraper := newSQLServerScraper(id, query,
@@ -140,7 +140,7 @@ func setupSQLServerScrapers(params receiver.Settings, cfg *Config) []*sqlServerS
140140
sqlquery.NewDbClient,
141141
params,
142142
cfg,
143-
cache,
143+
metricCache,
144144
planCache)
145145

146146
scrapers = append(scrapers, sqlServerScraper)

receiver/sqlserverreceiver/scraper.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type sqlServerScraperHelper struct {
6161
db *sql.DB
6262
mb *metadata.MetricsBuilder
6363
lb *metadata.LogsBuilder
64-
cache *lru.Cache[string, int64]
64+
metricCache *lru.Cache[string, int64]
6565
planCache *lru.Cache[string, string]
6666
lastExecutionTimestamp time.Time
6767
obfuscator *obfuscator
@@ -80,7 +80,7 @@ func newSQLServerScraper(id component.ID,
8080
clientProviderFunc sqlquery.ClientProviderFunc,
8181
params receiver.Settings,
8282
cfg *Config,
83-
cache *lru.Cache[string, int64],
83+
metricCache *lru.Cache[string, int64],
8484
planCache *lru.Cache[string, string],
8585
) *sqlServerScraperHelper {
8686
// Compute service instance ID
@@ -100,7 +100,7 @@ func newSQLServerScraper(id component.ID,
100100
clientProviderFunc: clientProviderFunc,
101101
mb: metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, params),
102102
lb: metadata.NewLogsBuilder(cfg.LogsBuilderConfig, params),
103-
cache: cache,
103+
metricCache: metricCache,
104104
planCache: planCache,
105105
lastExecutionTimestamp: time.Unix(0, 0),
106106
obfuscator: newObfuscator(),
@@ -830,14 +830,14 @@ func (s *sqlServerScraperHelper) cacheAndDiff(queryHash, queryPlanHash, column s
830830

831831
key := queryHash + "-" + queryPlanHash + "-" + column
832832

833-
cached, ok := s.cache.Get(key)
833+
cached, ok := s.metricCache.Get(key)
834834
if !ok {
835-
s.cache.Add(key, val)
835+
s.metricCache.Add(key, val)
836836
return false, val
837837
}
838838

839839
if val > cached {
840-
s.cache.Add(key, val)
840+
s.metricCache.Add(key, val)
841841
return true, val - cached
842842
}
843843

receiver/sqlserverreceiver/scraper_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func TestQueryTextAndPlanQuery(t *testing.T) {
388388
assert.NotNil(t, scrapers)
389389

390390
scraper := scrapers[0]
391-
assert.NotNil(t, scraper.cache)
391+
assert.NotNil(t, scraper.metricCache)
392392

393393
const totalElapsedTime = "total_elapsed_time"
394394
const rowsReturned = "total_rows"
@@ -447,7 +447,7 @@ func TestInvalidQueryTextAndPlanQuery(t *testing.T) {
447447
assert.NotNil(t, scrapers)
448448

449449
scraper := scrapers[0]
450-
assert.NotNil(t, scraper.cache)
450+
assert.NotNil(t, scraper.metricCache)
451451

452452
const totalElapsedTime = "total_elapsed_time"
453453
const rowsReturned = "total_rows"
@@ -543,7 +543,7 @@ func TestRecordDatabaseSampleQuery(t *testing.T) {
543543
assert.NotNil(t, scrapers)
544544

545545
scraper := scrapers[0]
546-
assert.NotNil(t, scraper.cache)
546+
assert.NotNil(t, scraper.metricCache)
547547

548548
scraper.client = tc.mockClient(scraper.instanceName, scraper.sqlQuery)
549549

0 commit comments

Comments
 (0)