Skip to content

Commit 3dec2db

Browse files
committed
Yikes, we have way too many debug logs, making the logs useless
1 parent e61717c commit 3dec2db

1 file changed

Lines changed: 0 additions & 32 deletions

File tree

dnscrypt-proxy/monitoring_ui.go

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -273,15 +273,12 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
273273
return
274274
}
275275

276-
dlog.Debugf("Updating metrics for query: %s", pluginsState.qName)
277-
278276
mc := ui.metricsCollector
279277
now := time.Now()
280278

281279
// Update counters (total queries, cache, QPS) - separate lock
282280
mc.countersMutex.Lock()
283281
mc.totalQueries++
284-
dlog.Debugf("Total queries now: %d", mc.totalQueries)
285282

286283
// Update queries per second
287284
elapsed := now.Sub(mc.lastQueriesTime).Seconds()
@@ -296,16 +293,13 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
296293
mc.lastQueriesCount = mc.totalQueries
297294
mc.lastQueriesTime = now
298295
}
299-
dlog.Debugf("Updated QPS: %.2f", mc.queriesPerSecond)
300296
}
301297

302298
// Update cache hits/misses
303299
if pluginsState.cacheHit {
304300
mc.cacheHits++
305-
dlog.Debugf("Cache hit, total hits: %d", mc.cacheHits)
306301
} else {
307302
mc.cacheMisses++
308-
dlog.Debugf("Cache miss, total misses: %d", mc.cacheMisses)
309303
}
310304

311305
// Update blocked queries count
@@ -314,8 +308,6 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
314308
if pluginsState.returnCode == PluginsReturnCodeReject ||
315309
pluginsState.returnCode == PluginsReturnCodeDrop {
316310
mc.blockCount++
317-
dlog.Debugf("Blocked query (return code: %s), total blocks: %d",
318-
PluginsReturnCodeToString[pluginsState.returnCode], mc.blockCount)
319311
}
320312
mc.countersMutex.Unlock()
321313

@@ -331,7 +323,6 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
331323
}
332324
mc.queryTypesMutex.Lock()
333325
mc.queryTypes[qType]++
334-
dlog.Debugf("Query type %s, count: %d", qType, mc.queryTypes[qType])
335326
mc.queryTypesMutex.Unlock()
336327
} else {
337328
dlog.Debugf("No question in message or message is nil")
@@ -348,18 +339,13 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
348339
mc.countersMutex.Lock()
349340
mc.responseTimeSum += uint64(responseTime)
350341
mc.responseTimeCount++
351-
dlog.Debugf("Response time: %dms, avg: %.2fms", responseTime, float64(mc.responseTimeSum)/float64(mc.responseTimeCount))
352342
mc.countersMutex.Unlock()
353343

354344
// Update server stats - separate lock
355345
if pluginsState.serverName != "" && pluginsState.serverName != "-" {
356346
mc.serverMutex.Lock()
357347
mc.serverQueryCount[pluginsState.serverName]++
358348
mc.serverResponseTime[pluginsState.serverName] += uint64(responseTime)
359-
dlog.Debugf("Server %s, queries: %d, avg response: %.2fms",
360-
pluginsState.serverName,
361-
mc.serverQueryCount[pluginsState.serverName],
362-
float64(mc.serverResponseTime[pluginsState.serverName])/float64(mc.serverQueryCount[pluginsState.serverName]))
363349
mc.serverMutex.Unlock()
364350
} else {
365351
dlog.Debugf("No server name or server is '-'")
@@ -371,7 +357,6 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
371357
domainName := pluginsState.qName
372358
mc.domainMutex.Lock()
373359
mc.topDomains[domainName]++
374-
dlog.Debugf("Domain %s, count: %d", domainName, mc.topDomains[domainName])
375360
mc.domainMutex.Unlock()
376361
}
377362

@@ -452,8 +437,6 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
452437
mc.currentMemoryBytes -= oldEntry.EstimateMemoryUsage()
453438
}
454439

455-
dlog.Debugf("Added query log entry, total entries: %d, memory usage: %d bytes",
456-
len(mc.recentQueries), mc.currentMemoryBytes)
457440
mc.queryLogMutex.Unlock()
458441
}
459442

@@ -812,14 +795,11 @@ func (mc *MetricsCollector) invalidateCache() {
812795

813796
// GetMetrics - Returns the current metrics
814797
func (mc *MetricsCollector) GetMetrics() map[string]interface{} {
815-
dlog.Debugf("GetMetrics called")
816-
817798
// Check cache first
818799
mc.cacheMutex.RLock()
819800
if time.Since(mc.cacheLastUpdate) < mc.cacheTTL && mc.cachedMetrics != nil {
820801
cached := mc.cachedMetrics
821802
mc.cacheMutex.RUnlock()
822-
dlog.Debugf("Returning cached metrics")
823803
return cached
824804
}
825805
mc.cacheMutex.RUnlock()
@@ -836,8 +816,6 @@ func (mc *MetricsCollector) GetMetrics() map[string]interface{} {
836816
startTime := mc.startTime
837817
mc.countersMutex.RUnlock()
838818

839-
dlog.Debugf("GetMetrics - total queries: %d", totalQueries)
840-
841819
// Calculate average response time
842820
var avgResponseTime float64
843821
if responseTimeCount > 0 {
@@ -1009,7 +987,6 @@ func (mc *MetricsCollector) GetMetrics() map[string]interface{} {
1009987
mc.cacheLastUpdate = generatedAt
1010988
mc.cacheMutex.Unlock()
1011989

1012-
dlog.Debugf("Computed and cached new metrics")
1013990
return metrics
1014991
}
1015992

@@ -1035,8 +1012,6 @@ func setStaticCacheHeaders(w http.ResponseWriter, maxAge int) {
10351012

10361013
// handleTestQuery - Handles test query requests for debugging
10371014
func (ui *MonitoringUI) handleTestQuery(w http.ResponseWriter, r *http.Request) {
1038-
dlog.Debugf("Adding test query")
1039-
10401015
// Test queries modify state - no cache
10411016
setDynamicCacheHeaders(w)
10421017

@@ -1065,8 +1040,6 @@ func (ui *MonitoringUI) handleTestQuery(w http.ResponseWriter, r *http.Request)
10651040

10661041
// handleRoot - Handles the root path
10671042
func (ui *MonitoringUI) handleRoot(w http.ResponseWriter, r *http.Request) {
1068-
dlog.Debugf("Received root request from %s", r.RemoteAddr)
1069-
10701043
// Set CORS headers
10711044
setCORSHeaders(w)
10721045

@@ -1122,15 +1095,12 @@ func (ui *MonitoringUI) handleMetrics(w http.ResponseWriter, r *http.Request) {
11221095
return
11231096
}
11241097

1125-
dlog.Debugf("Sending metrics response (%d bytes)", len(jsonData))
1126-
11271098
// If it's a JSONP request, wrap the JSON in the callback function
11281099
if callback != "" {
11291100
w.Header().Set("Content-Type", "application/javascript")
11301101
w.Write([]byte(callback + "("))
11311102
w.Write(jsonData)
11321103
w.Write([]byte(");"))
1133-
dlog.Debugf("Sent JSONP response with callback: %s", callback)
11341104
} else {
11351105
// Regular JSON response
11361106
w.Write(jsonData)
@@ -1261,8 +1231,6 @@ func (ui *MonitoringUI) handlePrometheus(w http.ResponseWriter, r *http.Request)
12611231
// Write metrics
12621232
w.WriteHeader(http.StatusOK)
12631233
w.Write([]byte(metrics))
1264-
1265-
dlog.Debugf("Served Prometheus metrics (%d bytes)", len(metrics))
12661234
}
12671235

12681236
// basicAuthMiddleware - Adds basic authentication to the HTTP server

0 commit comments

Comments
 (0)