8000 Merge branch 'main' into link_problems_of_grpc · open-telemetry/opentelemetry-cpp@991561b · GitHub
[go: up one dir, main page]
Skip to content

Commit 991561b

Browse files
marcalffmarcalff
autho 8000 red
Merge branch 'main' into link_problems_of_grpc
2 parents ddf8cb0 + 82bddef commit 991561b

File tree

44 files changed

+862
-42
lines changed

Some content is hidden

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

44 files changed

+862
-42
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: 109
20+
warning_limit: 86
2121
- cmake_options: all-options-abiv2-preview
22-
warning_limit: 109
22+
warning_limit: 86
2323
steps:
2424
- name: Harden the runner (Audit all outbound calls)
2525
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ Increment the:
3636
* [CodeHealth] Fix clang-tidy warnings part 2
3737
[#3496](https://github.com/open-telemetry/opentelemetry-cpp/pull/3496)
3838

39+
* [CodeHealth] Fix clang-tidy warnings part 3
40+
[#3496](https://github.com/open-telemetry/opentelemetry-cpp/pull/3498)
41+
3942
Important changes:
4043

4144
* [REMOVAL] Removed deprecated semantic convention header files

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ For edit access, get in touch on
9191
* [Marc Alff](https://github.com/marcalff), Oracle
9292
* [Tom Tan](https://github.com/ThomsonTan), Microsoft
9393

94-
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
94+
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
9595

9696
### Approvers
9797

@@ -100,7 +100,7 @@ For more information about the maintainer role, see the [community repository](h
100100
* [Pranav Sharma](https://github.com/psx95), Google
101101
* [WenTao Ou](https://github.com/owent), Tencent
102102

103-
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).
103+
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
104104

105105
### Emeritus Maintainer/Approver/Triager
106106

‎api/test/context/propagation/composite_propagator_test.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,11 @@ class CompositePropagatorTest : public ::testing::Test
7373
propogator_list.push_back(std::move(b3_propogator));
7474

7575
composite_propagator_ =
76-
new context::propagation::CompositePropagator(std::move(propogator_list));
76+
std::make_shared<context::propagation::CompositePropagator>(std::move(propogator_list));
7777
}
7878

79-
~CompositePropagatorTest() override { delete composite_propagator_; }
80-
8179
protected:
82-
context::propagation::CompositePropagator *composite_propagator_;
80+
std::shared_ptr<context::propagation::CompositePropagator> composite_propagator_;
8381
};
8482

8583
TEST_F(CompositePropagatorTest, Extract)

‎api/test/nostd/shared_ptr_test.cc‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ class A
1919

2020
~A() { destructed_ = true; }
2121

22+
A(const A &) = delete;
23+
A(A &&) = delete;
24+
A &operator=(const A &) = delete;
25+
A &operator=(A &&) = delete;
26+
2227
private:
2328
bool &destructed_;
2429
};
@@ -33,13 +38,16 @@ class C
3338
{
3439
public:
3540
virtual ~C() {}
41+
C() = default;
42+
43+
C(const C &) = delete;
44+
C(C &&) = delete;
45+
C &operator=(const C &) = delete;
46+
C &operator=(C &&) = delete;
3647
};
3748

3849
class D : public C
39-
{
40-
public:
41-
~D() override {}
42-
};
50+
{};
4351

4452
TEST(SharedPtrTest, DefaultConstruction)
4553
{

‎api/test/nostd/unique_ptr_test.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ class A
1717

1818
~A() { destructed_ = true; }
1919

20+
A(const A &) = delete;
21+
A(A &&) = delete;
22+
A &operator=(const A &) = delete;
23+
A &operator=(A &&) = delete;
24+
2025
private:
2126
bool &destructed_;
2227
};

‎api/test/nostd/variant_test.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ class DestroyCounter
1414
explicit DestroyCounter(int *count) : count_{count} {}
1515
~DestroyCounter() { ++*count_; }
1616

17+
DestroyCounter(const DestroyCounter &) = default;
18+
DestroyCounter &ope D306 rator=(const DestroyCounter &) = default;
19+
DestroyCounter(DestroyCounter &&) = default;
20+
DestroyCounter &operator=(DestroyCounter &&) = default;
21+
1722
private:
1823
int *count_;
1924
};

‎examples/otlp/http_instrumented_main.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ class MyThreadInstrumentation : public opentelemetry::sdk::common::ThreadInstrum
8989
const std::string &priority)
9090
: thread_name_(thread_name), network_name_(network_name), priority_(priority)
9191
{}
92-
~MyThreadInstrumentation() override = default;
9392

9493
void OnStart() override
9594
{

‎examples/plugin/plugin/tracer.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ class Span final : public trace::Span
3535

3636
~Span() override { std::cout << "~Span\n"; }
3737

38+
Span(const Span &) = delete;
39+
Span &operator=(const Span &) = delete;
40+
Span(Span &&) = delete;
41+
Span &operator=(Span &&) = delete;
42+
3843
// opentelemetry::trace::Span
3944
void SetAttribute(nostd::string_view /*name*/,
4045
const common::AttributeValue & /*value*/) noexcept override

‎exporters/elasticsearch/src/es_log_record_exporter.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ class AsyncResponseHandler : public http_client::EventHandler
223223
console_debug_{console_debug}
224224
{}
225225

226+
AsyncResponseHandler(const AsyncResponseHandler &) = delete;
227+
AsyncResponseHandler &operator=(const AsyncResponseHandler &) = delete;
228+
AsyncResponseHandler(AsyncResponseHandler &&) = delete;
229+
AsyncResponseHandler &operator=(AsyncResponseHandler &&) = delete;
230+
226231
/**
227232
* Cleans up the session in the destructor.
228233
*/

0 commit comments

Comments
 (0)
0