From 932a4d8a5f2536645618d7aee8e5da6b8e3b6751 Mon Sep 17 00:00:00 2001 From: Sam Xie Date: Sun, 1 Sep 2024 11:02:31 -0700 Subject: [PATCH] Fix panic instruments creation when setting meter provider (#5758) Related #5757. This is a quick fix. --- CHANGELOG.md | 1 + internal/global/meter.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4969347e7..c8c720345 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Fixed - Fix memory leak in the global `MeterProvider` when identical instruments are repeatedly created. (#5754) +- Fix panic instruments creation when setting meter provider. (#5758) ### Removed diff --git a/internal/global/meter.go b/internal/global/meter.go index 897e8b12b..c45248e64 100644 --- a/internal/global/meter.go +++ b/internal/global/meter.go @@ -141,7 +141,7 @@ func (m *meter) setDelegate(provider metric.MeterProvider) { m.registry.Remove(e) } - m.instruments = nil + clear(m.instruments) m.registry.Init() }