From 26c6dcfa7850318b90820286fccaf0ebfde6f906 Mon Sep 17 00:00:00 2001 From: hainenber Date: Tue, 16 Jan 2024 00:35:14 +0700 Subject: [PATCH 1/2] fix(otelcol): fix Prom exporter not collecting metrics after reload Signed-off-by: hainenber --- CHANGELOG.md | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7c4c7020881..417824f402d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ Main (unreleased) - Fix a duplicate metrics registration panic when sending metrics to an static mode metric instance's write handler. (@tpaschalis) +- Fix OTEL metrics not exported after reload. (@hainenber) + ### Other changes - Removed support for Windows 2012 in line with Microsoft end of life. (@mattdurham) diff --git a/go.mod b/go.mod index 8da98c5aad41..88c7e0690e49 100644 --- a/go.mod +++ b/go.mod @@ -204,7 +204,7 @@ require ( go.opentelemetry.io/otel/exporters/prometheus v0.42.0 go.opentelemetry.io/otel/metric v1.21.0 go.opentelemetry.io/otel/sdk v1.21.0 - go.opentelemetry.io/otel/sdk/metric v1.19.0 + go.opentelemetry.io/otel/sdk/metric v1.20.0 go.opentelemetry.io/otel/trace v1.21.0 go.opentelemetry.io/proto/otlp v1.0.0 go.uber.org/atomic v1.11.0 diff --git a/go.sum b/go.sum index 3223f47d7f2b..245506eb4bce 100644 --- a/go.sum +++ b/go.sum @@ -2420,8 +2420,8 @@ go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ3 go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= -go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= -go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= +go.opentelemetry.io/otel/sdk/metric v1.20.0 h1:5eD40l/H2CqdKmbSV7iht2KMK0faAIL2pVYzJOWobGk= +go.opentelemetry.io/otel/sdk/metric v1.20.0/go.mod h1:AGvpC+YF/jblITiafMTYgvRBUiwi9hZf0EYE2E5XlS8= go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= From 275d92ae530e78b22455702a44b26d1266bf9bdc Mon Sep 17 00:00:00 2001 From: hainenber Date: Tue, 16 Jan 2024 00:38:18 +0700 Subject: [PATCH 2/2] chore(doc): rewording CHANGELOG entry Signed-off-by: hainenber --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 417824f402d3..41a27ccd19fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ Main (unreleased) - Fix a duplicate metrics registration panic when sending metrics to an static mode metric instance's write handler. (@tpaschalis) -- Fix OTEL metrics not exported after reload. (@hainenber) +- Fix OTEL metrics not getting collected after reload. (@hainenber) ### Other changes