Use new gofumpt (#21613)

Update tinylib. Should fix CI.

`gofumpt -w .&&go generate ./...`
This commit is contained in:
Klaus Post
2025-09-28 22:59:21 +02:00
committed by GitHub
parent 456d9462e5
commit b8631cf531
171 changed files with 881 additions and 899 deletions

View File

@@ -1704,7 +1704,7 @@ func getMinioProcMetrics() *MetricsGroupV2 {
p, err := procfs.Self()
if err != nil {
internalLogOnceIf(ctx, err, string(nodeMetricNamespace))
return
return metrics
}
openFDs, _ := p.FileDescriptorsLen()
@@ -1819,7 +1819,7 @@ func getMinioProcMetrics() *MetricsGroupV2 {
Value: stat.CPUTime(),
})
}
return
return metrics
})
return mg
}
@@ -1833,7 +1833,7 @@ func getGoMetrics() *MetricsGroupV2 {
Description: getMinIOGORoutineCountMD(),
Value: float64(runtime.NumGoroutine()),
})
return
return metrics
})
return mg
}
@@ -2632,7 +2632,7 @@ func getMinioVersionMetrics() *MetricsGroupV2 {
Description: getMinIOVersionMD(),
VariableLabels: map[string]string{"version": Version},
})
return
return metrics
})
return mg
}
@@ -2653,7 +2653,7 @@ func getNodeHealthMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
Description: getNodeOfflineTotalMD(),
Value: float64(nodesDown),
})
return
return metrics
})
return mg
}
@@ -2666,11 +2666,11 @@ func getMinioHealingMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
mg.RegisterRead(func(_ context.Context) (metrics []MetricV2) {
bgSeq, exists := globalBackgroundHealState.getHealSequenceByToken(bgHealingUUID)
if !exists {
return
return metrics
}
if bgSeq.lastHealActivity.IsZero() {
return
return metrics
}
metrics = make([]MetricV2, 0, 5)
@@ -2681,7 +2681,7 @@ func getMinioHealingMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
metrics = append(metrics, getObjectsScanned(bgSeq)...)
metrics = append(metrics, getHealedItems(bgSeq)...)
metrics = append(metrics, getFailedItems(bgSeq)...)
return
return metrics
})
return mg
}
@@ -2696,7 +2696,7 @@ func getFailedItems(seq *healSequence) (m []MetricV2) {
Value: float64(v),
})
}
return
return m
}
func getHealedItems(seq *healSequence) (m []MetricV2) {
@@ -2709,7 +2709,7 @@ func getHealedItems(seq *healSequence) (m []MetricV2) {
Value: float64(v),
})
}
return
return m
}
func getObjectsScanned(seq *healSequence) (m []MetricV2) {
@@ -2722,7 +2722,7 @@ func getObjectsScanned(seq *healSequence) (m []MetricV2) {
Value: float64(v),
})
}
return
return m
}
func getDistLockMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
@@ -3030,7 +3030,7 @@ func getHTTPMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
VariableLabels: map[string]string{"api": api},
})
}
return
return metrics
}
// If we have too many, limit them
@@ -3099,7 +3099,7 @@ func getHTTPMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
}
}
return
return metrics
})
return mg
}
@@ -3142,7 +3142,7 @@ func getNetworkMetrics() *MetricsGroupV2 {
Description: getS3ReceivedBytesMD(),
Value: float64(connStats.s3InputBytes),
})
return
return metrics
})
return mg
}
@@ -3155,19 +3155,19 @@ func getClusterUsageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
mg.RegisterRead(func(ctx context.Context) (metrics []MetricV2) {
objLayer := newObjectLayerFn()
if objLayer == nil {
return
return metrics
}
metrics = make([]MetricV2, 0, 50)
dataUsageInfo, err := loadDataUsageFromBackend(ctx, objLayer)
if err != nil {
metricsLogIf(ctx, err)
return
return metrics
}
// data usage has not captured any data yet.
if dataUsageInfo.LastUpdate.IsZero() {
return
return metrics
}
metrics = append(metrics, MetricV2{
@@ -3248,7 +3248,7 @@ func getClusterUsageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
Value: float64(clusterBuckets),
})
return
return metrics
})
return mg
}
@@ -3265,12 +3265,12 @@ func getBucketUsageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
dataUsageInfo, err := loadDataUsageFromBackend(ctx, objLayer)
if err != nil {
metricsLogIf(ctx, err)
return
return metrics
}
// data usage has not captured any data yet.
if dataUsageInfo.LastUpdate.IsZero() {
return
return metrics
}
metrics = append(metrics, MetricV2{
@@ -3454,7 +3454,7 @@ func getBucketUsageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
VariableLabels: map[string]string{"bucket": bucket},
})
}
return
return metrics
})
return mg
}
@@ -3498,17 +3498,17 @@ func getClusterTierMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
objLayer := newObjectLayerFn()
if globalTierConfigMgr.Empty() {
return
return metrics
}
dui, err := loadDataUsageFromBackend(ctx, objLayer)
if err != nil {
metricsLogIf(ctx, err)
return
return metrics
}
// data usage has not captured any tier stats yet.
if dui.TierStats == nil {
return
return metrics
}
return dui.tierMetrics()
@@ -3614,7 +3614,7 @@ func getLocalStorageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
Value: float64(storageInfo.Backend.RRSCParity),
})
return
return metrics
})
return mg
}
@@ -3755,7 +3755,7 @@ func getClusterHealthMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
})
}
return
return metrics
})
return mg
@@ -3776,7 +3776,7 @@ func getBatchJobsMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
m.Merge(&mRemote)
if m.Aggregated.BatchJobs == nil {
return
return metrics
}
for _, mj := range m.Aggregated.BatchJobs.Jobs {
@@ -3822,7 +3822,7 @@ func getBatchJobsMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
},
)
}
return
return metrics
})
return mg
}
@@ -3875,7 +3875,7 @@ func getClusterStorageMetrics(opts MetricsGroupOpts) *MetricsGroupV2 {
Description: getClusterDrivesTotalMD(),
Value: float64(totalDrives.Sum()),
})
return
return metrics
})
return mg
}
@@ -4264,7 +4264,7 @@ func getOrderedLabelValueArrays(labelsWithValue map[string]string) (labels, valu
labels = append(labels, l)
values = append(values, v)
}
return
return labels, values
}
// newMinioCollectorNode describes the collector