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

Commit 55a31a3

Browse files
lalitblalitb
authored
Merge branch 'main' into add_bytes_support_for_otlp
2 parents aab88aa + 7059f73 commit 55a31a3

File tree

77 files changed

+1917
-83
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

+1917
-83
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

‎.github/workflows/cmake_install.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
run: ./ci/do_ci.sh cmake.install.test
179179

180180
ubuntu_2404_conan_stable:
181-
name: Ubuntu 24.04 conan stable versions cxx17 (static libs - shared libs - opentracing shim)
181+
name: Ubuntu 24.04 conan stable versions cxx17 (static libs - opentracing shim)
182182
runs-on: ubuntu-24.04
183183
env:
184184
INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -207,10 +207,6 @@ jobs:
207207
env:
208208
BUILD_SHARED_LIBS: 'OFF'
209209
run: ./ci/do_ci.sh cmake.install.test
210-
- name: Run Tests (shared libs)
211-
env:
212-
BUILD_SHARED_LIBS: 'ON'
213-
run: ./ci/do_ci.sh cmake.install.test
214210
- name: verify pkgconfig packages
215211
run: |
216212
export PKG_CONFIG_PATH=$INSTALL_TEST_DIR/lib/pkgconfig:$PKG_CONFIG_PATH

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
sudo -E ./ci/setup_googletest.sh
4040
sudo -E ./ci/setup_ci_environment.sh
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
42+
uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
4343
with:
4444
languages: cpp
4545
- name: Autobuild
46-
uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
46+
uses: github/codeql-action/autobuild@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
48+
uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747
# Upload the results to GitHub's code scanning dashboard (optional).
4848
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
50+
uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
5151
with:
5252
sarif_file: results.sarif

‎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 &operator=(const DestroyCounter &) = default;
19+
DestroyCounter(DestroyCounter &&) = default;
20+
DestroyCounter &operator=(DestroyCounter &&) = default;
21+
1722
private:
1823
int *count_;
1924
};

0 commit comments

Comments
 (0)
0