Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 4a60079

Browse files
authored
Build fix: PrometheusExporter::Collect was made const. (#428)
jupp0r/prometheus-cpp#323 Also format with newer version of cmake-format.
1 parent 3c0ff4e commit 4a60079

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

opencensus/common/internal/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ opencensus_lib(
2626
opencensus_lib(common_stats_object DEPS absl::time)
2727

2828
# Define NOMINMAX to fix build errors when compiling with MSVC.
29-
target_compile_definitions(opencensus_common_stats_object INTERFACE
30-
$<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
29+
target_compile_definitions(opencensus_common_stats_object
30+
INTERFACE $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
3131

3232
opencensus_lib(common_string_vector_hash DEPS absl::hash)
3333

opencensus/exporters/stats/prometheus/internal/prometheus_exporter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace opencensus {
2525
namespace exporters {
2626
namespace stats {
2727

28-
std::vector<prometheus::MetricFamily> PrometheusExporter::Collect() {
28+
std::vector<prometheus::MetricFamily> PrometheusExporter::Collect() const {
2929
const auto data = opencensus::stats::StatsExporter::GetViewData();
3030
std::vector<prometheus::MetricFamily> output(data.size());
3131
for (int i = 0; i < data.size(); ++i) {

opencensus/exporters/stats/prometheus/prometheus_exporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace stats {
4141
// PrometheusExporter is thread-safe.
4242
class PrometheusExporter final : public ::prometheus::Collectable {
4343
public:
44-
std::vector<prometheus::MetricFamily> Collect() override;
44+
std::vector<prometheus::MetricFamily> Collect() const override;
4545
};
4646

4747
} // namespace stats

opencensus/stats/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ opencensus_lib(
5757
absl::span)
5858

5959
# Define NOMINMAX to fix build errors when compiling with MSVC.
60-
target_compile_definitions(opencensus_stats_core PUBLIC
61-
$<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
60+
target_compile_definitions(opencensus_stats_core
61+
PUBLIC $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
6262

6363
opencensus_lib(
6464
stats_recording

opencensus/trace/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ opencensus_lib(
5050
absl::span)
5151

5252
# Define NOMINMAX to fix build errors when compiling with MSVC.
53-
target_compile_definitions(opencensus_trace PUBLIC
54-
$<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
53+
target_compile_definitions(opencensus_trace
54+
PUBLIC $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
5555

5656
opencensus_lib(
5757
trace_b3

0 commit comments

Comments
 (0)