upgrade prometheus-cpp to v1.1.0 (#1954)

open-telemetry · Feb 5, 2023 · 9200d0c · 9200d0c
1 parent 32af352
commit 9200d0c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
+2 −0		.bazelrc
+1 −0		.clang-format
+20 −6		.github/workflows/bazel-ci.yml
+9 −11		.github/workflows/cmake-ci.yml
+2 −2		.github/workflows/coverage.yml
+1 −1		.github/workflows/doxygen.yml
+14 −17		.github/workflows/linting.yml
+4 −8		.github/workflows/release.yml
+20 −3		CMakeLists.txt
+2 −2		LICENSE
+4 −5		README.md
+36 −17		bazel/civetweb.BUILD
+28 −14		bazel/repositories.bzl
+1 −0		cmake/googletest.imp
+0 −2		cmake/project-import-cmake/CMakeLists.txt
+1 −1		cmake/project-import-pkgconfig/CMakeLists.txt
+2 −2		cmake/prometheus-cpp-core.pc.in
+2 −2		cmake/prometheus-cpp-pull.pc.in
+2 −2		cmake/prometheus-cpp-push.pc.in
+9 −0		core/CMakeLists.txt
+1 −0		core/benchmarks/CMakeLists.txt
+20 −0		core/benchmarks/info_bench.cc
+3 −1		core/include/prometheus/check_names.h
+7 −0		core/include/prometheus/client_metric.h
+0 −16		core/include/prometheus/detail/future_std.h
+4 −4		core/include/prometheus/family.h
+2 −2		core/include/prometheus/gauge.h
+7 −4		core/include/prometheus/histogram.h
+68 −0		core/include/prometheus/info.h
+1 −0		core/include/prometheus/metric_type.h
+3 −1		core/include/prometheus/registry.h
+11 −6		core/include/prometheus/summary.h
+7 −1		core/src/check_names.cc
+3 −0		core/src/detail/builder.cc
+5 −16		core/src/detail/hash.h
+2 −1		core/src/detail/utils.cc
+5 −3		core/src/family.cc
+28 −10		core/src/histogram.cc
+11 −0		core/src/info.cc
+25 −6		core/src/registry.cc
+1 −1		core/src/serializer.cc
+5 −2		core/src/summary.cc
+15 −0		core/src/text_serializer.cc
+2 −1		core/tests/CMakeLists.txt
+10 −1		core/tests/builder_test.cc
+50 −0		core/tests/check_label_name_test.cc
+22 −0		core/tests/check_metric_name_test.cc
+0 −34		core/tests/check_names_test.cc
+30 −7		core/tests/family_test.cc
+8 −0		core/tests/histogram_test.cc
+2 −2		core/tests/raii_locale.h
+16 −0		core/tests/registry_test.cc
+1 −2		core/tests/serializer_test.cc
+3 −2		core/tests/summary_test.cc
+9 −0		core/tests/text_serializer_test.cc
+1 −1		core/tests/utils_test.cc
+8 −0		pull/CMakeLists.txt
+1 −2		pull/include/prometheus/exposer.h
+3 −4		pull/src/endpoint.cc
+3 −4		pull/src/exposer.cc
+9 −10		pull/tests/integration/integration_test.cc
+7 −1		pull/tests/integration/sample_server.cc
+3 −5		pull/tests/internal/base64_test.cc
+8 −0		push/CMakeLists.txt
+6 −0		push/include/prometheus/gateway.h
+20 −5		push/src/curl_wrapper.cc
+2 −0		push/src/curl_wrapper.h
+6 −3		push/src/gateway.cc
+3 −0		push/tests/integration/sample_client.cc