Skip to content

Commit 59326b7

Browse files
committed
Fix metric handler shadowing.
1 parent 99d2db4 commit 59326b7

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

cmd/worker/main.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ func main() {
7474
tlsCertPaths := parseCommaSeparatedEnv("TEMPORAL_TLS_CERT", len(namespaceList))
7575
tlsCaPaths := parseCommaSeparatedEnv("TEMPORAL_TLS_CA", len(namespaceList))
7676

77+
// Create shared metrics handler if Prometheus is enabled
78+
var metricsHandler client.MetricsHandler
79+
if os.Getenv("PROMETHEUS_ENDPOINT") != "" {
80+
metricsHandler = sdktally.NewMetricsHandler(newPrometheusScope(prometheus.Configuration{
81+
ListenAddress: os.Getenv("PROMETHEUS_ENDPOINT"),
82+
TimerType: "histogram",
83+
}))
84+
}
85+
7786
// Create workers for each namespace
7887
var wg sync.WaitGroup
7988
workers := make([]worker.Worker, len(namespaceList))
@@ -118,11 +127,8 @@ func main() {
118127
clientOptions.ConnectionOptions.TLS = &tlsConfig
119128
}
120129

121-
if os.Getenv("PROMETHEUS_ENDPOINT") != "" {
122-
clientOptions.MetricsHandler = sdktally.NewMetricsHandler(newPrometheusScope(prometheus.Configuration{
123-
ListenAddress: os.Getenv("PROMETHEUS_ENDPOINT"),
124-
TimerType: "histogram",
125-
}))
130+
if metricsHandler != nil {
131+
clientOptions.MetricsHandler = metricsHandler
126132
}
127133

128134
c, err := client.Dial(clientOptions)

0 commit comments

Comments
 (0)