From 8cbe7271a0b5bab57a24b29e1e5302f17fc8e2e3 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sat, 27 Jan 2024 01:17:20 -0800 Subject: [PATCH 1/3] [BUILD] Remove unnecessary usage/includes of nostd/type_traits (#2509) --- .../exporters/elasticsearch/es_log_record_exporter.h | 1 - .../opentelemetry/exporters/ostream/log_record_exporter.h | 2 +- .../include/opentelemetry/exporters/ostream/span_exporter.h | 2 +- .../include/opentelemetry/opentracingshim/propagation.h | 3 ++- .../sdk/instrumentationscope/instrumentation_scope.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h index b72ff4f917..31d63af983 100644 --- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +++ b/exporters/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 index a2897a5f26..ba5b28b9de 100644 --- 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 index 03c95c23f9..139653686d 100644 --- 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 index c226d9da83..b2a9be5a80 100644 --- 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 index 35b0dc6863..4f7c9069bf 100644 --- 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 +#include #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::value> + std::enable_if_t::value> * = nullptr> static nostd::unique_ptr Create(nostd::string_view name, nostd::string_view version, From f36fc0fc79f2184d2b0d4dca80b606edcb6383d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Jan 2024 09:39:15 +0000 Subject: [PATCH 2/3] Bump peter-evans/create-or-update-comment from 3.1.0 to 4.0.0 (#2512) --- .github/workflows/project_management_comment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/project_management_comment.yml b/.github/workflows/project_management_comment.yml index feba7112af..bddf31549a 100644 --- 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: | From 23206365dce31eeae1616f91fb73534d7b76f165 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sat, 27 Jan 2024 07:42:47 -0800 Subject: [PATCH 3/3] Updated the recorded vcpkg submodule version (#2513) --- third_party_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party_release b/third_party_release index 7689cd8638..6031a829c1 100644 --- 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