From f2f07387921562aa37c4dd0d658b23e20492fbb8 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Fri, 22 Mar 2024 05:17:02 +0100
Subject: [PATCH] Upgrade to prometheus 1.2.4 (#2598)

---
 bazel/repository.bzl                | 6 +++---
 exporters/prometheus/CMakeLists.txt | 6 +++++-
 third_party/prometheus-cpp          | 2 +-
 third_party_release                 | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bazel/repository.bzl b/bazel/repository.bzl
index a4c3d27b5f..b26479b015 100644
--- a/bazel/repository.bzl
+++ b/bazel/repository.bzl
@@ -122,10 +122,10 @@ def opentelemetry_cpp_deps():
     maybe(
         http_archive,
         name = "com_github_jupp0r_prometheus_cpp",
-        sha256 = "397544fe91e183029120b4eebcfab24ed9ec833d15850aae78fd5db19062d13a",
-        strip_prefix = "prometheus-cpp-1.1.0",
+        sha256 = "48dbad454d314b836cc667ec4def93ec4a6e4255fc8387c20cacb3b8b6faee30",
+        strip_prefix = "prometheus-cpp-1.2.4",
         urls = [
-            "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.1.0.tar.gz",
+            "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.2.4.tar.gz",
         ],
     )
 
diff --git a/exporters/prometheus/CMakeLists.txt b/exporters/prometheus/CMakeLists.txt
index c6387a66c8..1d66d59560 100644
--- a/exporters/prometheus/CMakeLists.txt
+++ b/exporters/prometheus/CMakeLists.txt
@@ -27,9 +27,13 @@ endif()
 if(TARGET core)
   list(APPEND PROMETHEUS_EXPORTER_TARGETS core)
 endif()
+if(TARGET util)
+  list(APPEND PROMETHEUS_EXPORTER_TARGETS util)
+endif()
 target_link_libraries(
   opentelemetry_exporter_prometheus
-  PUBLIC opentelemetry_metrics prometheus-cpp::pull prometheus-cpp::core)
+  PUBLIC opentelemetry_metrics prometheus-cpp::pull prometheus-cpp::core
+         prometheus-cpp::util)
 
 if(OPENTELEMETRY_INSTALL)
   install(
diff --git a/third_party/prometheus-cpp b/third_party/prometheus-cpp
index c9ffcdda90..ad99e21f47 160000
--- a/third_party/prometheus-cpp
+++ b/third_party/prometheus-cpp
@@ -1 +1 @@
-Subproject commit c9ffcdda9086ffd9e1283ea7a0276d831f3c8a8d
+Subproject commit ad99e21f4706193670c42b36c9824dc997f4c475
diff --git a/third_party_release b/third_party_release
index a34dbc457f..6824954519 100644
--- a/third_party_release
+++ b/third_party_release
@@ -21,5 +21,5 @@ ms-gsl=v3.1.0-67-g6f45293
 nlohmann-json=v3.11.3
 opentelemetry-proto=v1.1.0
 opentracing-cpp=v1.6.0
-prometheus-cpp=v1.1.0
+prometheus-cpp=v1.2.4
 vcpkg=2024.02.14