diff --git a/CHANGELOG.md b/CHANGELOG.md index b73e3f1a7f..0b2ef9554e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ Increment the: ## [Unreleased] +* Upgrade prometheus-cpp to v1.1.0 [#1954](https://github.com/open-telemetry/opentelemetry-cpp/pull/1954) + ## [1.8.2] 2023-01-31 * Remove redundant macro check in nostd::shared_ptr [#1939](https://github.com/open-telemetry/opentelemetry-cpp/pull/1939) diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 210ee20258..a3d77026c6 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -119,10 +119,10 @@ def opentelemetry_cpp_deps(): maybe( http_archive, name = "com_github_jupp0r_prometheus_cpp", - sha256 = "07018db604ea3e61f5078583e87c80932ea10c300d979061490ee1b7dc8e3a41", - strip_prefix = "prometheus-cpp-1.0.0", + sha256 = "397544fe91e183029120b4eebcfab24ed9ec833d15850aae78fd5db19062d13a", + strip_prefix = "prometheus-cpp-1.1.0", urls = [ - "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.0.0.tar.gz", + "https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.1.0.tar.gz", ], ) diff --git a/exporters/prometheus/test/exporter_utils_test.cc b/exporters/prometheus/test/exporter_utils_test.cc index 25e7ad0fdd..8a14c2effa 100644 --- a/exporters/prometheus/test/exporter_utils_test.cc +++ b/exporters/prometheus/test/exporter_utils_test.cc @@ -48,11 +48,13 @@ void assert_basic(prometheus_client::MetricFamily &metric, } break; case prometheus_client::MetricType::Summary: - // Summary type not supported + // Summary and Info type not supported ASSERT_TRUE(false); break; case prometheus::MetricType::Untyped: break; + default: + break; } } diff --git a/third_party/prometheus-cpp b/third_party/prometheus-cpp index 4ea303fa66..c9ffcdda90 160000 --- a/third_party/prometheus-cpp +++ b/third_party/prometheus-cpp @@ -1 +1 @@ -Subproject commit 4ea303fa66e4c26dc4df67045fa0edf09c2f3077 +Subproject commit c9ffcdda9086ffd9e1283ea7a0276d831f3c8a8d diff --git a/third_party_release b/third_party_release index 3362b23db9..8ec284f2b9 100644 --- a/third_party_release +++ b/third_party_release @@ -19,5 +19,5 @@ googletest=release-1.12.1 ms-gsl=v3.1.0-67-g6f45293 nlohmann-json=v3.10.5 opentelemetry-proto=v0.19.0 -prometheus-cpp=v1.0.0 +prometheus-cpp=v1.1.0 vcpkg=2022.08.15