try suggestion from owent

Signed-off-by: Rohit Agrawal <rohit.agrawal@databricks.com>

Author: agrawroh

bazel/io_opentelemetry_cpp.patch

@@ -1,31 +1,30 @@
-From b0825190258f28a7e72b62dfc00835cc277a059e Mon Sep 17 00:00:00 2001
+From 6c13d723cdbbc3c3034f15e26871a41811ef505a 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] Patches
+Subject: [PATCH] Patch
 
+Signed-off-by: Rohit Agrawal <rohit.agrawal@databricks.com>
 ---
- api/include/opentelemetry/nostd/type_traits.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ api/include/opentelemetry/config.h | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
 
-diff --git a/api/include/opentelemetry/nostd/type_traits.h b/api/include/opentelemetry/nostd/type_traits.h
-index 3a64b5db1a..2dcf63884e 100644
---- a/api/include/opentelemetry/nostd/type_traits.h
-+++ b/api/include/opentelemetry/nostd/type_traits.h
-@@ -142,7 +142,7 @@ using std::is_trivially_move_constructible;
- template <typename T>
- struct is_trivially_copy_constructible
- {
--  static constexpr bool value = std::is_copy_constructible<T>::value && __has_trivial_copy(T);
-+  static constexpr bool value = std::is_copy_constructible<T>::value && __is_trivially_assignable(T&, const T&);
- };
- 
- template <typename T>
-@@ -154,7 +154,7 @@ struct is_trivially_move_constructible
- template <typename T>
- struct is_trivially_copy_assignable
- {
--  static constexpr bool value = std::is_copy_assignable<T>::value && __has_trivial_assign(T);
-+  static constexpr bool value = std::is_copy_assignable<T>::value && __is_trivially_assignable(T&, const T&);
- };
- 
- template <typename T>
+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