-
Notifications
You must be signed in to change notification settings - Fork 5.4k
deps: bump up io_opentelemetry_cpp to v1.20.0 #39182
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| From b0825190258f28a7e72b62dfc00835cc277a059e Mon Sep 17 00:00:00 2001 | ||
| From: Rohit Agrawal <rohit.agrawal@databricks.com> | ||
| Date: Fri, 25 Apr 2025 19:03:41 -0700 | ||
| Subject: [PATCH] Fixes glibc++ 5 Checks | ||
|
|
||
| --- | ||
| api/include/opentelemetry/config.h | 9 +++------ | ||
| 1 file changed, 3 insertions(+), 6 deletions(-) | ||
|
|
||
| diff --git a/api/include/opentelemetry/config.h b/api/include/opentelemetry/config.h | ||
| index 21a2947e28..c41f2e7ef8 100644 | ||
| --- a/api/include/opentelemetry/config.h | ||
| +++ b/api/include/opentelemetry/config.h | ||
| @@ -3,12 +3,9 @@ | ||
|
|
||
| #pragma once | ||
|
|
||
| -#ifndef __has_include | ||
| -# define OPENTELEMETRY_HAS_INCLUDE(x) 0 | ||
| -#else | ||
| -# define OPENTELEMETRY_HAS_INCLUDE(x) __has_include(x) | ||
| -#endif | ||
| +#include <type_traits> // IWYU pragma: keep | ||
|
|
||
| -#if !defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>) // >= libstdc++-5 | ||
| +#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \ | ||
| + (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422) // >= libstdc++-5 | ||
| # define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS | ||
| #endif | ||
|
|
||
| From 2e07c15ccb5f888fcdb42a1a60e22551e46c708c Mon Sep 17 00:00:00 2001 | ||
| From: owent <admin@owent.net> | ||
| Date: Sun, 27 Apr 2025 17:29:17 +0800 | ||
| Subject: [PATCH 2/2] Always checking `OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS` | ||
| when `OPENTELEMETRY_STL_VERSION` is defined | ||
|
|
||
| --- | ||
| api/include/opentelemetry/config.h | 11 ----------- | ||
| api/include/opentelemetry/nostd/type_traits.h | 9 +++++++-- | ||
| sdk/include/opentelemetry/sdk_config.h | 1 - | ||
| 3 files changed, 7 insertions(+), 14 deletions(-) | ||
| delete mode 100644 api/include/opentelemetry/config.h | ||
|
|
||
| diff --git a/api/include/opentelemetry/config.h b/api/include/opentelemetry/config.h | ||
| deleted file mode 100644 | ||
| index c41f2e7ef8..0000000000 | ||
| --- a/api/include/opentelemetry/config.h | ||
| +++ /dev/null | ||
| @@ -1,11 +0,0 @@ | ||
| -// Copyright The OpenTelemetry Authors | ||
| -// SPDX-License-Identifier: Apache-2.0 | ||
| - | ||
| -#pragma once | ||
| - | ||
| -#include <type_traits> // IWYU pragma: keep | ||
| - | ||
| -#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \ | ||
| - (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422) // >= libstdc++-5 | ||
| -# define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS | ||
| -#endif | ||
| diff --git a/api/include/opentelemetry/nostd/type_traits.h b/api/include/opentelemetry/nostd/type_traits.h | ||
| index 3a64b5db1a..a797c1ea07 100644 | ||
| --- a/api/include/opentelemetry/nostd/type_traits.h | ||
| +++ b/api/include/opentelemetry/nostd/type_traits.h | ||
| @@ -10,15 +10,20 @@ | ||
| # endif | ||
| #endif | ||
|
|
||
| +#include <type_traits> | ||
| + | ||
| #if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS) | ||
| # include <array> | ||
| -# include <type_traits> | ||
|
|
||
| -# include "opentelemetry/config.h" | ||
| # include "opentelemetry/nostd/detail/void.h" // IWYU pragma: export | ||
| # include "opentelemetry/version.h" | ||
| #endif | ||
|
|
||
| +#if !defined(__GLIBCXX__) || (defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE >= 7) || \ | ||
| + (defined(__GLIBCXX__) && __GLIBCXX__ >= 20150422) // >= libstdc++-5 | ||
| +# define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS | ||
| +#endif | ||
| + | ||
| OPENTELEMETRY_BEGIN_NAMESPACE | ||
| namespace nostd | ||
| { | ||
| diff --git a/sdk/include/opentelemetry/sdk_config.h b/sdk/include/opentelemetry/sdk_config.h | ||
| index 280ccaa993..afe78f1d80 100644 | ||
| --- a/sdk/include/opentelemetry/sdk_config.h | ||
| +++ b/sdk/include/opentelemetry/sdk_config.h | ||
| @@ -3,5 +3,4 @@ | ||
|
|
||
| #pragma once | ||
|
|
||
| -#include "opentelemetry/config.h" | ||
| #include "opentelemetry/sdk/common/global_log_handler.h" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.