From 33d244a943636ff3ad67740f3a37dad3919afcad Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <lalit_fin@yahoo.com>
Date: Mon, 28 Nov 2022 23:47:21 -0800
Subject: [PATCH 1/2] Fix Prometheus target name (#1820)

---
 exporters/prometheus/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/exporters/prometheus/CMakeLists.txt b/exporters/prometheus/CMakeLists.txt
index bdafeb1588..13fb7c9de0 100644
--- a/exporters/prometheus/CMakeLists.txt
+++ b/exporters/prometheus/CMakeLists.txt
@@ -19,6 +19,9 @@ endif()
 
 add_library(opentelemetry_exporter_prometheus src/exporter.cc src/collector.cc
                                               src/exporter_utils.cc)
+
+set_target_properties(opentelemetry_exporter_prometheus
+                      PROPERTIES EXPORT_NAME prometheus_exporter)
 target_include_directories(
   opentelemetry_exporter_prometheus
   PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"

From 7e26a7e84e94a50a0b04e70ed88ac04d75afbf40 Mon Sep 17 00:00:00 2001
From: WenTao Ou <admin@owent.net>
Date: Wed, 30 Nov 2022 04:15:57 +0800
Subject: [PATCH 2/2] Fix type mismatch when move `nostd::shared_ptr` (#1815)

L
---
 api/include/opentelemetry/nostd/shared_ptr.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/api/include/opentelemetry/nostd/shared_ptr.h b/api/include/opentelemetry/nostd/shared_ptr.h
index e1eac61561..7afc30f9be 100644
--- a/api/include/opentelemetry/nostd/shared_ptr.h
+++ b/api/include/opentelemetry/nostd/shared_ptr.h
@@ -56,7 +56,8 @@ class shared_ptr
               typename std::enable_if<std::is_convertible<pointer, U *>::value>::type * = nullptr>
     void MoveTo(typename shared_ptr<U>::PlacementBuffer &buffer) noexcept
     {
-      new (buffer.data) shared_ptr_wrapper{std::move(this->ptr_)};
+      using other_shared_ptr_wrapper = typename shared_ptr<U>::shared_ptr_wrapper;
+      new (buffer.data) other_shared_ptr_wrapper{std::move(this->ptr_)};
     }
 
     virtual pointer Get() const noexcept { return ptr_.get(); }