Skip to content

Commit f1148b6

Browse files
lalitblalitb
authored
Merge branch 'main' into merge_config_trace_model
2 parents 318cf7c + 016155f commit f1148b6

File tree

77 files changed

+383
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+383
-204
lines changed

‎.github/workflows/clang-tidy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
matrix:
1818
include:
1919
- cmake_options: all-options-abiv1-preview
20-
warning_limit: 215
20+
warning_limit: 172
2121
- cmake_options: all-options-abiv2-preview
22-
warning_limit: 216
22+
warning_limit: 173
2323
steps:
2424
- name: Harden the runner (Audit all outbound calls)
2525
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1

‎.github/workflows/iwyu.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
matrix:
1919
include:
2020
- cmake_options: all-options-abiv1
21-
warning_limit: 5
21+
warning_limit: 0
2222
- cmake_options: all-options-abiv1-preview
23-
warning_limit: 28
23+
warning_limit: 0
2424
- cmake_options: all-options-abiv2-preview
25-
warning_limit: 48
25+
warning_limit: 0
2626

2727
steps:
2828
- name: Harden the runner (Audit all outbound calls)

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ Increment the:
3030
* [REMOVAL] Removed deprecated semantic convention header files
3131
[#3475](https://github.com/open-telemetry/opentelemetry-cpp/pull/3475)
3232

33+
* [CodeHealth] Fix clang-tidy warnings part 1
34+
[#3493](https://github.com/open-telemetry/opentelemetry-cpp/pull/3493)
35+
3336
Important changes:
3437

3538
* [REMOVAL] Removed deprecated semantic convention header files

‎api/test/logs/logger_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "opentelemetry/common/key_value_iterable.h"
1212
#include "opentelemetry/common/key_value_iterable_view.h"
1313
#include "opentelemetry/logs/event_id.h"
14-
#include "opentelemetry/logs/event_logger.h"
15-
#include "opentelemetry/logs/event_logger_provider.h"
14+
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
15+
#include "opentelemetry/logs/event_logger_provider.h" // IWYU pragma: keep
1616
#include "opentelemetry/logs/log_record.h"
1717
#include "opentelemetry/logs/logger.h"
1818
#include "opentelemetry/logs/logger_provider.h"

‎api/test/logs/provider_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <string>
66

77
#include "opentelemetry/common/key_value_iterable.h"
8-
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
9-
#include "opentelemetry/logs/event_logger_provider.h"
10-
#include "opentelemetry/logs/logger.h" // IWYU pragma: keep
8+
#include "opentelemetry/logs/event_logger.h" // IWYU pragma: keep
9+
#include "opentelemetry/logs/event_logger_provider.h" // IWYU pragma: keep
10+
#include "opentelemetry/logs/logger.h" // IWYU pragma: keep
1111
#include "opentelemetry/logs/logger_provider.h"
1212
#include "opentelemetry/logs/provider.h"
1313
#include "opentelemetry/nostd/shared_ptr.h"

‎api/test/singleton/singleton_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
#include <gtest/gtest.h>
5-
#include <stdint.h>
5+
#include <stdint.h> // IWYU pragma: keep
66

77
#ifdef _WIN32
88
# include <windows.h>

‎api/test/trace/provider_test.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#include "opentelemetry/trace/provider.h"
99
#include "opentelemetry/trace/tracer_provider.h"
1010

11+
#if OPENTELEMETRY_ABI_VERSION_NO >= 2
12+
# include "opentelemetry/common/key_value_iterable.h"
13+
#endif
14+
1115
using opentelemetry::trace::Provider;
1216
using opentelemetry::trace::Tracer;
1317
using opentelemetry::trace::TracerProvider;

‎examples/otlp/grpc_metric_main.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ int main(int argc, char *argv[])
117117
}
118118
}
119119
}
120-
std::cout << "Using endpoint: " << exporter_options.endpoint << std::endl;
121-
std::cout << "Using example type: " << example_type << std::endl;
122-
std::cout << "Using cacert path: " << exporter_options.ssl_credentials_cacert_path << std::endl;
123-
std::cout << "Using ssl credentials: " << exporter_options.use_ssl_credentials << std::endl;
120+
std::cout << "Using endpoint: " << exporter_options.endpoint << "\n";
121+
std::cout << "Using example type: " << example_type << "\n";
122+
std::cout << "Using cacert path: " << exporter_options.ssl_credentials_cacert_path << "\n";
123+
std::cout << "Using ssl credentials: " << exporter_options.use_ssl_credentials << "\n";
124124

125125
// Removing this line will leave the default noop MetricProvider in place.
126126

‎examples/otlp/http_instrumented_main.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
# include "metrics_foo_library/foo_library.h"
5656
#endif
5757

58+
#ifdef ENABLE_THREAD_INSTRUMENTATION_PREVIEW
59+
# include <thread>
60+
# include "opentelemetry/sdk/common/thread_instrumentation.h"
61+
#endif
62+
5863
namespace
5964
{
6065

‎examples/plugin/plugin/tracer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#include <stdint.h>
6+
#include <stdint.h> // IWYU pragma: keep
77

88
#include "opentelemetry/common/key_value_iterable.h"
99
#include "opentelemetry/nostd/shared_ptr.h"

0 commit comments

Comments
 (0)