Skip to content

Commit 93bfdb0

Browse files
lalitbmichaelvanstraten
authored andcommitted
Merge branch 'main' into make-get_span-return-static-invalid
2 parents 61bea77 + a920898 commit 93bfdb0

File tree

89 files changed

+558
-300
lines changed

Some content is hidden

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

89 files changed

+558
-300
lines changed

.clang-tidy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@ Checks: >
3131
-misc-unused-alias-decls,
3232
-misc-use-anonymous-namespace,
3333
cppcoreguidelines-*,
34+
-cppcoreguidelines-owning-memory,
35+
-cppcoreguidelines-avoid-do-while,
3436
-cppcoreguidelines-avoid-c-arrays,
3537
-cppcoreguidelines-avoid-magic-numbers,
3638
-cppcoreguidelines-init-variables,
3739
-cppcoreguidelines-macro-usage,
3840
-cppcoreguidelines-non-private-member-variables-in-classes,
41+
-cppcoreguidelines-avoid-non-const-global-variables,
3942
-cppcoreguidelines-pro-*

.github/workflows/clang-tidy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Run clang-tidy
6969
run: |
7070
cd build
71-
make -j$(nproc) 2>&1 | tee -a clang-tidy.log || exit 1
71+
make 2>&1 | tee -a clang-tidy.log || exit 1
7272
7373
- uses: actions/upload-artifact@v4
7474
with:

.iwyu.imp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99

1010
# Local opentelemetry-cpp
1111

12+
{ "include": ["<gtest/gtest-message.h>", "private", "<gtest/gtest.h>", "public"] },
13+
{ "include": ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public"] },
14+
{ "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
1215
]
1316

api/include/opentelemetry/baggage/propagation/baggage_propagator.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33

44
#pragma once
55

6+
#include <memory>
7+
#include <string>
8+
69
#include "opentelemetry/baggage/baggage.h"
710
#include "opentelemetry/baggage/baggage_context.h"
11+
#include "opentelemetry/context/context.h"
812
#include "opentelemetry/context/propagation/text_map_propagator.h"
13+
#include "opentelemetry/nostd/function_ref.h"
14+
#include "opentelemetry/nostd/string_view.h"
915
#include "opentelemetry/version.h"
1016

1117
OPENTELEMETRY_BEGIN_NAMESPACE

api/include/opentelemetry/common/key_value_iterable_view.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33

44
#pragma once
55

6+
#include <stddef.h>
7+
#include <initializer_list>
68
#include <iterator>
9+
#include <type_traits>
710
#include <utility>
11+
#include <vector>
812

13+
#include "opentelemetry/common/attribute_value.h"
914
#include "opentelemetry/common/key_value_iterable.h"
1015
#include "opentelemetry/nostd/function_ref.h"
1116
#include "opentelemetry/nostd/span.h"

api/include/opentelemetry/context/context.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
#pragma once
55

66
#include <cstring>
7+
#include <utility>
8+
79
#include "opentelemetry/context/context_value.h"
810
#include "opentelemetry/nostd/shared_ptr.h"
911
#include "opentelemetry/nostd/string_view.h"
12+
#include "opentelemetry/nostd/variant.h"
1013
#include "opentelemetry/version.h"
1114

1215
OPENTELEMETRY_BEGIN_NAMESPACE

api/include/opentelemetry/context/runtime_context.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33

44
#pragma once
55

6+
#include <stddef.h>
7+
#include <algorithm>
8+
69
#include "opentelemetry/common/macros.h"
710
#include "opentelemetry/context/context.h"
11+
#include "opentelemetry/context/context_value.h"
812
#include "opentelemetry/nostd/shared_ptr.h"
913
#include "opentelemetry/nostd/string_view.h"
1014
#include "opentelemetry/nostd/unique_ptr.h"

api/include/opentelemetry/nostd/function_ref.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
#pragma once
55

6-
#include <memory>
6+
#include <iosfwd>
7+
#include <memory> // IWYU pragma: keep
78
#include <type_traits>
9+
#include <utility>
810

911
#include "opentelemetry/version.h"
1012

1113
OPENTELEMETRY_BEGIN_NAMESPACE
1214
namespace nostd
1315
{
1416
template <class Sig>
15-
class function_ref;
17+
class function_ref; // IWYU pragma: keep
1618

1719
/**
1820
* Non-owning function reference that can be used as a more performant

api/include/opentelemetry/nostd/string_view.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212

1313
#if !defined(OPENTELEMETRY_HAVE_STD_STRING_VIEW)
1414
# include <algorithm>
15-
# include <cstddef>
1615
# include <cstring>
16+
# include <functional>
1717
# include <ostream>
1818
# include <stdexcept>
1919
# include <string>
20+
# include <type_traits>
21+
# include <utility>
2022

21-
# include "opentelemetry/common/macros.h"
2223
# include "opentelemetry/version.h"
2324

2425
OPENTELEMETRY_BEGIN_NAMESPACE

api/include/opentelemetry/nostd/variant.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPENTELEMETRY_END_NAMESPACE
5454
# ifdef HAVE_ABSEIL
5555
# include "absl/types/variant.h"
5656
# else
57-
# include "./internal/absl/types/variant.h"
57+
# include "opentelemetry/nostd/internal/absl/types/variant.h"
5858
# endif
5959

6060
# ifdef _MSC_VER

0 commit comments

Comments
 (0)