mirrors
/
blocky
mirror of https://github.com/0xERR0R/blocky.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: wrong prefetch metrics if bootstrap is enabled (#891) (#915)

This commit is contained in:
Dimitri Herzog 2023-03-07 16:04:27 +01:00 committed by GitHub
parent bcea1a93db
commit f2e488678b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resolver/bootstrap.go
View File

@ -81,9 +81,13 @@ func NewBootstrap(cfg *config.Config) (b *Bootstrap, err error) {
b.bootstraped = bootstraped
cachingResolver := NewCachingResolver(cachingCfg, nil)
// don't emit any metrics
cachingResolver.emitMetricEvents = false
b.resolver = Chain(
NewFilteringResolver(cfg.Filtering),
NewCachingResolver(cachingCfg, nil),
cachingResolver,
parallelResolver,
)

20
resolver/caching_resolver.go
View File

@ -33,6 +33,7 @@ type CachingResolver struct {
prefetchingNameCache expirationcache.ExpiringCache
redisClient *redis.Client
redisEnabled bool
emitMetricEvents bool
}
// cacheValue includes query answer and prefetch flag
@ -49,6 +50,7 @@ func NewCachingResolver(cfg config.CachingConfig, redis *redis.Client) *CachingR
cacheTimeNegative: time.Duration(cfg.CacheTimeNegative),
redisClient: redis,
redisEnabled: (redis != nil),
emitMetricEvents: true,
}
configureCaches(c, &cfg)
@ -122,7 +124,7 @@ func (r *CachingResolver) onExpired(cacheKey string) (val interface{}, ttl time.
if err == nil {
if response.Res.Rcode == dns.RcodeSuccess {
evt.Bus().Publish(evt.CachingDomainPrefetched, domainName)
r.publishMetricsIfEnabled(evt.CachingDomainPrefetched, domainName)
return cacheValue{response.Res, true}, r.adjustTTLs(response.Res.Answer)
}
@ -182,12 +184,12 @@ func (r *CachingResolver) Resolve(request *model.Request) (response *model.Respo
if val != nil {
logger.Debug("domain is cached")
evt.Bus().Publish(evt.CachingResultCacheHit, domain)
r.publishMetricsIfEnabled(evt.CachingResultCacheHit, domain)
v := val.(cacheValue)
if v.prefetch {
// Hit from prefetch cache
evt.Bus().Publish(evt.CachingPrefetchCacheHit, domain)
r.publishMetricsIfEnabled(evt.CachingPrefetchCacheHit, domain)
}
resp := v.resultMsg.Copy()
@ -206,7 +208,7 @@ func (r *CachingResolver) Resolve(request *model.Request) (response *model.Respo
return &model.Response{Res: resp, RType: model.ResponseTypeCACHED, Reason: "CACHED NEGATIVE"}, nil
}
evt.Bus().Publish(evt.CachingResultCacheMiss, domain)
r.publishMetricsIfEnabled(evt.CachingResultCacheMiss, domain)
logger.WithField("next_resolver", Name(r.next)).Debug("not in cache: go to next resolver")
response, err = r.next.Resolve(request)
@ -231,7 +233,7 @@ func (r *CachingResolver) trackQueryDomainNameCount(domain, cacheKey string, log
logger.Debugf("domain '%s' was requested %d times, "+
"total cache size: %d", util.Obfuscate(domain), domainCount, totalCount)
evt.Bus().Publish(evt.CachingDomainsToPrefetchCountChanged, totalCount)
r.publishMetricsIfEnabled(evt.CachingDomainsToPrefetchCountChanged, totalCount)
}
}
@ -246,7 +248,7 @@ func (r *CachingResolver) putInCache(cacheKey string, response *model.Response,
}
}
evt.Bus().Publish(evt.CachingResultCacheChanged, r.resultCache.TotalCount())
r.publishMetricsIfEnabled(evt.CachingResultCacheChanged, r.resultCache.TotalCount())
if publish && r.redisClient != nil {
res := *response.Res
@ -287,3 +289,9 @@ func (r *CachingResolver) adjustTTLs(answer []dns.RR) (maxTTL time.Duration) {
return time.Duration(max) * time.Second
}
func (r *CachingResolver) publishMetricsIfEnabled(event string, val interface{}) {
if r.emitMetricEvents {
evt.Bus().Publish(event, val)
}
}