Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CMake OTELCPP_MAINTAINER_MODE #1650

Merged
merged 33 commits into from
Oct 15, 2022
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5871e92
Fixes #1648
marcalff Oct 3, 2022
7ec5536
Format, versions used in github.
marcalff Oct 3, 2022
37f0d2c
Fixed format.
marcalff Oct 3, 2022
9ad340c
Added MSVC MAINTAINER_MODE
marcalff Oct 3, 2022
52e47df
Add a MSVC build in maintainer mode, in CI.
marcalff Oct 3, 2022
d900a42
Fix review comments.
marcalff Oct 3, 2022
3c562b9
Fix review comments.
marcalff Oct 4, 2022
4c412a4
Renamed to OTELCPP_MAINTAINER_MODE, to avoid collisions with other code.
marcalff Oct 5, 2022
62aef50
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 5, 2022
ea6e74f
Upgrade CI to gcc 11, clang 14.
marcalff Oct 5, 2022
57e8919
Revert:
marcalff Oct 5, 2022
ee7f15e
Upgrade CI to gcc 10, clang 12.
marcalff Oct 5, 2022
d1a158a
clang fixup
marcalff Oct 5, 2022
c5b9595
Enforce OTELCPP_MAINTAINER_MODE
marcalff Oct 5, 2022
50793c2
Move warning cleanup (work in progress)
marcalff Oct 5, 2022
4e81f46
More warning cleanup (thrift, logs)
marcalff Oct 5, 2022
33754e8
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 6, 2022
f4c80ed
Merge branch 'main' into fix_wall_werr_1648
esigo Oct 6, 2022
67cb8c0
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 10, 2022
01834ac
Warning cleanup for Thrift-gen
marcalff Oct 10, 2022
8f5c762
Move maintainer mode later in CMakeList.txt,
marcalff Oct 10, 2022
a79f13d
More warning cleanup
marcalff Oct 11, 2022
6b1c23a
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 11, 2022
e422bd1
More cleanup
marcalff Oct 11, 2022
525b5de
Merge branch 'main' into fix_wall_werr_1648
marcalff Oct 13, 2022
18ed349
Fix last 4 warnings known.
marcalff Oct 13, 2022
e7310b2
Cleanup
marcalff Oct 13, 2022
cd3b8f8
Relax MSVC warning
marcalff Oct 13, 2022
895b871
Cleanup, variable hides parameter.
marcalff Oct 13, 2022
7555a07
Cleanup, data parameter hides function param.
marcalff Oct 13, 2022
3c4f273
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 14, 2022
531104b
Merge branch 'open-telemetry:main' into fix_wall_werr_1648
marcalff Oct 14, 2022
97ad7ae
Fixed code review comments.
marcalff Oct 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleanup, variable hides parameter.
marcalff committed Oct 13, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 895b87185d1a0289ab2b8c2788bc5d3d03f15503
4 changes: 2 additions & 2 deletions sdk/test/metrics/async_metric_storage_test.cc
Original file line number Diff line number Diff line change
@@ -78,8 +78,8 @@ TEST_P(WritableMetricStorageTestFixture, TestAggregation)
opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()));

storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
[&](const MetricData data) {
for (auto data_attr : data.point_data_attr_)
[&](const MetricData metric_data) {
for (auto data_attr : metric_data.point_data_attr_)
{
auto data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
if (opentelemetry::nostd::get<std::string>(
4 changes: 2 additions & 2 deletions sdk/test/metrics/sync_metric_storage_counter_test.cc
Original file line number Diff line number Diff line change
@@ -80,8 +80,8 @@ TEST_P(WritableMetricStorageTestFixture, LongSumAggregation)
auto collection_ts = std::chrono::system_clock::now();
size_t count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData data) {
for (auto data_attr : data.point_data_attr_)
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData metric_data) {
for (auto data_attr : metric_data.point_data_attr_)
{
auto data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
if (opentelemetry::nostd::get<std::string>(
4 changes: 2 additions & 2 deletions sdk/test/metrics/sync_metric_storage_histogram_test.cc
Original file line number Diff line number Diff line change
@@ -81,8 +81,8 @@ TEST_P(WritableMetricStorageHistogramTestFixture, LongHistogram)
auto collection_ts = std::chrono::system_clock::now();
size_t count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData data) {
for (auto data_attr : data.point_data_attr_)
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData metric_data) {
for (auto data_attr : metric_data.point_data_attr_)
{
auto data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
if (opentelemetry::nostd::get<std::string>(