Merge branch 'main' into go-1.23.0

VihasMakwana · web-flow · commit 66d577ee6525 · 2025-03-30T19:18:41.000+05:30
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.6
+1.23.6
diff --git a/report/setup.go b/report/setup.go
@@ -94,7 +94,7 @@ func SetupMetrics(logger *logp.Logger, name, version string, opts ...OptionFunc)
 	monitoring.NewFunc(opt.processMetrics, "runtime", ReportRuntime, monitoring.Report)
 	monitoring.NewFunc(opt.processMetrics, "info", infoReporter(name, version), monitoring.Report)
 
-	setupPlatformSpecificMetrics(logger, processStats, systemMetrics, processMetrics)
+	setupPlatformSpecificMetrics(logger, processStats, opt.systemMetrics, opt.processMetrics)
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func SetupMetrics(logger *logp.Logger, name, version string, opts ...OptionFunc)`
`94`	`94`	`monitoring.NewFunc(opt.processMetrics, "runtime", ReportRuntime, monitoring.Report)`
`95`	`95`	`monitoring.NewFunc(opt.processMetrics, "info", infoReporter(name, version), monitoring.Report)`
`96`	`96`
`97`		`- setupPlatformSpecificMetrics(logger, processStats, systemMetrics, processMetrics)`
	`97`	`+ setupPlatformSpecificMetrics(logger, processStats, opt.systemMetrics, opt.processMetrics)`
`98`	`98`
`99`	`99`	`return nil`
`100`	`100`	`}`