Merge 3a38da2d9f into 534f4a9fb1

fix: timeN function return final closure not be called (#21615 )
Merge branch 'master' into fixsvcmonitor
2025-10-02 08:42:06 +08:00 · 2025-09-30 23:06:01 -07:00 · 2025-09-21 09:18:43 +08:00 · 2025-09-18 09:29:09 +08:00 · 2025-09-17 17:27:40 +08:00
2 changed files with 17 additions and 19 deletions
--- a/cmd/data-scanner-metric.go
+++ b/cmd/data-scanner-metric.go
@ -106,10 +106,9 @@ func (p *scannerMetrics) log(s scannerMetric, paths ...string) func(custom map[s

 // time n scanner actions.
 // Use for s < scannerMetricLastRealtime
-func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
+func (p *scannerMetrics) timeN(s scannerMetric) func(n int) {
 	startTime := time.Now()
-	return func(n int) func() {
-		return func() {
+	return func(n int) {
 		duration := time.Since(startTime)

 		atomic.AddUint64(&p.operations[s], uint64(n))
@ -117,7 +116,6 @@ func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
 			p.latency[s].add(duration)
 		}
 	}
-	}
 }

 // time a scanner action.
--- a/helm/minio/templates/servicemonitor.yaml
+++ b/helm/minio/templates/servicemonitor.yaml
@ -75,6 +75,12 @@ metadata:
    {{- end }}
 spec:
  jobName: {{ template "minio.fullname" . }}
+  {{- if .Values.metrics.serviceMonitor.interval }}
+  interval: {{ .Values.metrics.serviceMonitor.interval }}
+  {{- end }}
+  {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
+  scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
+  {{- end }}
  {{- if .Values.tls.enabled }}
  tlsConfig:
    ca:
@ -94,19 +100,13 @@ spec:
  {{- if .Values.metrics.serviceMonitor.relabelConfigsCluster }}
    {{- toYaml .Values.metrics.serviceMonitor.relabelConfigsCluster | nindent 2 }}
  {{- end }}
-  targets:
-    staticConfig:
-      static:
-      - {{ template "minio.fullname" . }}.{{ .Release.Namespace }}
  {{- if not .Values.metrics.serviceMonitor.public }}
-      {{- if .Values.metrics.serviceMonitor.interval }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      {{- end }}
-      {{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end }}
  bearerTokenSecret:
    name: {{ template "minio.fullname" . }}-prometheus
    key: token
  {{- end }}
+  targets:
+    staticConfig:
+      static:
+      - {{ template "minio.fullname" . }}.{{ .Release.Namespace }}
 {{- end }}
Author	SHA1	Message	Date
yangw	bc2adf08a5	Merge `3a38da2d9f` into `534f4a9fb1`	2025-10-02 08:42:06 +08:00
yangw	534f4a9fb1	fix: timeN function return final closure not be called (#21615 ) VulnCheck / Analysis (push) Has been cancelled Details	2025-09-30 23:06:01 -07:00
jiuker	3a38da2d9f	Merge branch 'master' into fixsvcmonitor	2025-09-21 09:18:43 +08:00
yangw	3ce09d42a3	add interval and scrapeTimeout to Probe Signed-off-by: yangw <wuyangmuc@gmail.com>	2025-09-18 09:29:09 +08:00
yangw	f42f84686c	fix(helm): move bearerTokenSecret to correct level in Probe spec The bearerTokenSecret was incorrectly placed inside the staticConfig section of the Probe targets, which caused invalid manifest generation when serviceMonitor was enabled. According to Prometheus Operator CRD specification, bearerTokenSecret should be at the spec level alongside jobName, prober, and targets. Also removes redundant interval and scrapeTimeout configurations from staticConfig as they don't belong there. Fixes #21029 Signed-off-by: yangw <wuyangmuc@gmail.com>	2025-09-17 17:27:40 +08:00