Merge branch 'VcpkgOpenTelemetry' into combined3

Author: Rafał Hibner

cpp/src/arrow/util/align_util.cc

@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// clang-format off
+// (prevent include reordering)
+#include "arrow/util/windows_compatibility.h"
+// clang-format on
+
 #include "arrow/util/align_util.h"
 
 #include "arrow/array.h"

cpp/src/arrow/util/future.cc

@@ -14,8 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-
 #include "arrow/util/future.h"
+#include "arrow/util/windows_compatibility.h"
 
 #include <algorithm>
 #include <atomic>

cpp/src/arrow/util/thread_pool.cc

@@ -14,8 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-
 #include "arrow/util/thread_pool.h"
+#include "arrow/util/windows_compatibility.h"
 
 #include <algorithm>
 #include <condition_variable>

cpp/src/arrow/util/tracing.cc

@@ -14,8 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-
 #include "arrow/util/tracing.h"
+#include "arrow/util/windows_compatibility.h"
 
 #include "arrow/util/config.h"
 #include "arrow/util/tracing_internal.h"

cpp/src/arrow/util/tracing_internal.h

@@ -123,13 +123,13 @@ struct Scope {
   opentelemetry::trace::Scope scope_impl;
 };
 
-opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>& UnwrapSpan(
+ARROW_EXPORT opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>& UnwrapSpan(
     ::arrow::util::tracing::SpanDetails* span);
 
-const opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>& UnwrapSpan(
-    const ::arrow::util::tracing::SpanDetails* span);
+ARROW_EXPORT const opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>&
+UnwrapSpan(const ::arrow::util::tracing::SpanDetails* span);
 
-opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>& RewrapSpan(
+ARROW_EXPORT opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span>& RewrapSpan(
     ::arrow::util::tracing::SpanDetails* span,
     opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> ot_span);