Merge branch 'main' into fixCompositePropagator

open-telemetry · Jan 27, 2024 · cf7a4fd · cf7a4fd
2 parents 5b7fa3c + 2320636
commit cf7a4fd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/project_management_comment.yml b/.github/workflows/project_management_comment.yml
@@ -12,7 +12,7 @@ jobs:
       issues: write
     steps:
       - name: Add comment
-        uses: peter-evans/create-or-update-comment@23ff15729ef2fc348714a3bb66d2f655ca9066f2
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
         with:
           issue-number: ${{ github.event.issue.number }}
           body: |

diff --git a/...ters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/...ters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h
@@ -7,7 +7,6 @@
 #include "opentelemetry/common/spin_lock_mutex.h"
 #include "opentelemetry/ext/http/client/http_client_factory.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/type_traits.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 #include "opentelemetry/sdk/logs/recordable.h"
 

diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/log_record_exporter.h
@@ -5,7 +5,7 @@
 
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
 #include "opentelemetry/sdk/logs/exporter.h"
 

diff --git a/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h b/exporters/ostream/include/opentelemetry/exporters/ostream/span_exporter.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/sdk/trace/span_data.h"
 #include "opentelemetry/version.h"

diff --git a/opentracing-shim/include/opentelemetry/opentracingshim/propagation.h b/opentracing-shim/include/opentelemetry/opentracingshim/propagation.h
@@ -8,7 +8,8 @@
 #include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
-#include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentracing/propagation.h"
 #include "opentracing/value.h"
 

diff --git a/sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h b/sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include <string>
+#include <type_traits>
 
 #include "opentelemetry/common/key_value_iterable_view.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/type_traits.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
@@ -73,7 +73,7 @@ class InstrumentationScope
    */
   template <
       class ArgumentType,
-      nostd::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
+      std::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
           * = nullptr>
   static nostd::unique_ptr<InstrumentationScope> Create(nostd::string_view name,
                                                         nostd::string_view version,

diff --git a/third_party_release b/third_party_release
@@ -22,4 +22,4 @@ nlohmann-json=v3.11.2
 opentelemetry-proto=v1.1.0
 opentracing-cpp=v1.6.0
 prometheus-cpp=v1.1.0
-vcpkg=2022.08.15
+vcpkg=2023.10.19