Skip to content

Commit c42dcca

Browse files
marcalffmarcalff
authored
[CI] Upgrade to clang-format 18 (#2684)
1 parent 0dd64e0 commit c42dcca

Some content is hidden

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

55 files changed

+187
-187
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ jobs:
726726

727727
format:
728728
name: Format
729-
runs-on: ubuntu-20.04
729+
runs-on: ubuntu-24.04
730730
steps:
731731
- uses: actions/checkout@v4
732732
- name: setup

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Increment the:
1818
* [SDK] Update ExemplarFilter and ExemplarReservoir for spec
1919
[#2372](https://github.com/open-telemetry/opentelemetry-cpp/pull/2372)
2020

21+
* [CI] Upgrade to clang-format 18
22+
[#2684](https://github.com/open-telemetry/opentelemetry-cpp/pull/2684)
23+
2124
Notes on experimental features:
2225

2326
* [#2372](https://github.com/open-telemetry/opentelemetry-cpp/issues/2372)

‎api/include/opentelemetry/common/kv_properties.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class KeyValueProperties
158158
}
159159

160160
// Move contructor and assignment operator
161-
Entry(Entry &&other) = default;
161+
Entry(Entry &&other) = default;
162162
Entry &operator=(Entry &&other) = default;
163163

164164
// Creates an Entry for a given key-value pair.

‎api/include/opentelemetry/common/spin_lock_mutex.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class SpinLockMutex
5353
{
5454
public:
5555
SpinLockMutex() noexcept {}
56-
~SpinLockMutex() noexcept = default;
57-
SpinLockMutex(const SpinLockMutex &) = delete;
56+
~SpinLockMutex() noexcept = default;
57+
SpinLockMutex(const SpinLockMutex &) = delete;
5858
SpinLockMutex &operator=(const SpinLockMutex &) = delete;
5959

6060
static inline void fast_yield() noexcept

‎api/include/opentelemetry/logs/event_logger.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class EventLogger
5656
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
5757
*/
5858
template <class... ArgumentType>
59-
void EmitEvent(nostd::string_view event_name, ArgumentType &&... args)
59+
void EmitEvent(nostd::string_view event_name, ArgumentType &&...args)
6060
{
6161
nostd::shared_ptr<Logger> delegate_logger = GetDelegateLogger();
6262
if (!delegate_logger)

‎api/include/opentelemetry/logs/logger.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class Logger
6565
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
6666
*/
6767
template <class... ArgumentType>
68-
void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record, ArgumentType &&... args)
68+
void EmitLogRecord(nostd::unique_ptr<LogRecord> &&log_record, ArgumentType &&...args)
6969
{
7070
if (!log_record)
7171
{
@@ -97,7 +97,7 @@ class Logger
9797
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
9898
*/
9999
template <class... ArgumentType>
100-
void EmitLogRecord(ArgumentType &&... args)
100+
void EmitLogRecord(ArgumentType &&...args)
101101
{
102102
nostd::unique_ptr<LogRecord> log_record = CreateLogRecord();
103103

@@ -120,7 +120,7 @@ class Logger
120120
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
121121
*/
122122
template <class... ArgumentType>
123-
void Trace(ArgumentType &&... args) noexcept
123+
void Trace(ArgumentType &&...args) noexcept
124124
{
125125
static_assert(
126126
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
@@ -144,7 +144,7 @@ class Logger
144144
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
145145
*/
146146
template <class... ArgumentType>
147-
void Debug(ArgumentType &&... args) noexcept
147+
void Debug(ArgumentType &&...args) noexcept
148148
{
149149
static_assert(
150150
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
@@ -168,7 +168,7 @@ class Logger
168168
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
169169
*/
170170
template <class... ArgumentType>
171-
void Info(ArgumentType &&... args) noexcept
171+
void Info(ArgumentType &&...args) noexcept
172172
{
173173
static_assert(
174174
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
@@ -192,7 +192,7 @@ class Logger
192192
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
193193
*/
194194
template <class... ArgumentType>
195-
void Warn(ArgumentType &&... args) noexcept
195+
void Warn(ArgumentType &&...args) noexcept
196196
{
197197
static_assert(
198198
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
@@ -216,7 +216,7 @@ class Logger
216216
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
217217
*/
218218
template <class... ArgumentType>
219-
void Error(ArgumentType &&... args) noexcept
219+
void Error(ArgumentType &&...args) noexcept
220220
{
221221
static_assert(
222222
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,
@@ -240,7 +240,7 @@ class Logger
240240
* span<pair<string_view, AttributeValue>> -> attributes(return type of MakeAttributes)
241241
*/
242242
template <class... ArgumentType>
243-
void Fatal(ArgumentType &&... args) noexcept
243+
void Fatal(ArgumentType &&...args) noexcept
244244
{
245245
static_assert(
246246
!detail::LogRecordHasType<Severity, typename std::decay<ArgumentType>::type...>::value,

‎api/include/opentelemetry/logs/provider.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class OPENTELEMETRY_EXPORT Provider
7373
return provider;
7474
}
7575

76-
OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider>
77-
&GetEventProvider() noexcept
76+
OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<EventLoggerProvider> &
77+
GetEventProvider() noexcept
7878
{
7979
static nostd::shared_ptr<EventLoggerProvider> provider(new NoopEventLoggerProvider);
8080
return provider;

‎api/include/opentelemetry/nostd/detail/functional.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77

88
#include "opentelemetry/version.h"
99

10-
#define OPENTELEMETRY_RETURN(...) \
11-
noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) { return __VA_ARGS__; }
10+
#define OPENTELEMETRY_RETURN(...) \
11+
noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
12+
{ \
13+
return __VA_ARGS__; \
14+
}
1215

1316
OPENTELEMETRY_BEGIN_NAMESPACE
1417
namespace nostd

‎api/include/opentelemetry/nostd/detail/invoke.h‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
#include "opentelemetry/nostd/detail/void.h"
1111
#include "opentelemetry/version.h"
1212

13-
#define OPENTELEMETRY_RETURN(...) \
14-
noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) { return __VA_ARGS__; }
13+
#define OPENTELEMETRY_RETURN(...) \
14+
noexcept(noexcept(__VA_ARGS__))->decltype(__VA_ARGS__) \
15+
{ \
16+
return __VA_ARGS__; \
17+
}
1518

1619
OPENTELEMETRY_BEGIN_NAMESPACE
1720
namespace nostd
@@ -34,23 +37,23 @@ template <>
3437
struct Invoke<true /* pmf */, 0 /* is_base_of */>
3538
{
3639
template <typename R, typename T, typename Arg, typename... Args>
37-
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
40+
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
3841
OPENTELEMETRY_RETURN((std::forward<Arg>(arg).*pmf)(std::forward<Args>(args)...))
3942
};
4043

4144
template <>
4245
struct Invoke<true /* pmf */, 1 /* is_reference_wrapper */>
4346
{
4447
template <typename R, typename T, typename Arg, typename... Args>
45-
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
48+
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
4649
OPENTELEMETRY_RETURN((std::forward<Arg>(arg).get().*pmf)(std::forward<Args>(args)...))
4750
};
4851

4952
template <>
5053
struct Invoke<true /* pmf */, 2 /* otherwise */>
5154
{
5255
template <typename R, typename T, typename Arg, typename... Args>
53-
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
56+
inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&...args)
5457
OPENTELEMETRY_RETURN(((*std::forward<Arg>(arg)).*pmf)(std::forward<Args>(args)...))
5558
};
5659

@@ -79,20 +82,21 @@ struct Invoke<false /* pmo */, 2 /* otherwise */>
7982
};
8083

8184
template <typename R, typename T, typename Arg, typename... Args>
82-
inline constexpr auto invoke_impl(R T::*f, Arg &&arg, Args &&... args)
83-
OPENTELEMETRY_RETURN(Invoke<std::is_function<R>::value,
84-
(std::is_base_of<T, decay_t<Arg>>::value
85-
? 0
86-
: is_reference_wrapper<decay_t<Arg>>::value ? 1 : 2)>::
87-
invoke(f, std::forward<Arg>(arg), std::forward<Args>(args)...))
85+
inline constexpr auto invoke_impl(R T::*f, Arg &&arg, Args &&...args) OPENTELEMETRY_RETURN(
86+
Invoke<std::is_function<R>::value,
87+
(std::is_base_of<T, decay_t<Arg>>::value ? 0
88+
: is_reference_wrapper<decay_t<Arg>>::value ? 1
89+
: 2)>::invoke(f,
90+
std::forward<Arg>(arg),
91+
std::forward<Args>(args)...))
8892

8993
#ifdef _MSC_VER
9094
# pragma warning(push)
9195
# pragma warning(disable : 4100)
9296
#endif
93-
template <typename F, typename... Args>
94-
inline constexpr auto invoke_impl(F &&f, Args &&... args)
95-
OPENTELEMETRY_RETURN(std::forward<F>(f)(std::forward<Args>(args)...))
97+
template <typename F, typename... Args>
98+
inline constexpr auto invoke_impl(F &&f, Args &&...args)
99+
OPENTELEMETRY_RETURN(std::forward<F>(f)(std::forward<Args>(args)...))
96100
#ifdef _MSC_VER
97101
# pragma warning(pop)
98102
#endif

‎api/include/opentelemetry/nostd/detail/trait.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ template <typename T,
2727
class IsAvailable>
2828
inline constexpr Trait trait()
2929
{
30-
return IsTriviallyAvailable<T>::value
31-
? Trait::TriviallyAvailable
32-
: IsAvailable<T>::value ? Trait::Available : Trait::Unavailable;
30+
return IsTriviallyAvailable<T>::value ? Trait::TriviallyAvailable
31+
: IsAvailable<T>::value ? Trait::Available
32+
: Trait::Unavailable;
3333
}
3434

3535
inline constexpr Trait common_trait_impl(Trait result)

0 commit comments

Comments
 (0)