Merge branch 'main' into allow_construct_grpc_exporters_with_existed_…

…grpc_client

CHANGELOG.md

@@ -18,6 +18,20 @@ Increment the:
 * [EXPORTER] Allow to share gRPC clients between OTLP exporters.
   [#3041](https://github.com/open-telemetry/opentelemetry-cpp/pull/3041)
 
+* [API] Jaeger Propagator should not be deprecated
+  [#3086](https://github.com/open-telemetry/opentelemetry-cpp/pull/3086)
+
+Important changes:
+
+* [API] Jaeger Propagator should not be deprecated
+  [#3086](https://github.com/open-telemetry/opentelemetry-cpp/pull/3086)
+
+  * Deprecation of the Jaeger propagator, as announced on 2023-01-31
+    in version 1.8.2, is now reverted.
+  * This deprecation turned out to be not justified,
+    as the Jaeger propagator can be used without the (now removed)
+    Jaeger exporter.
+
 ## [1.17 2024-10-07]
 
 * [CI] Add a clang-tidy build

DEPRECATED.md

@@ -46,45 +46,7 @@ N/A
 
 ## [opentelemetry-cpp API]
 
-### Jaeger propagator
-
-#### Announcement (Jaeger)
-
-* Version: 1.8.2
-* Date: 2023-01-31
-* PR: [DEPRECATION] Deprecate the Jaeger exporter
-  [#1923](https://github.com/open-telemetry/opentelemetry-cpp/pull/1923)
-
-This PR also listed the Jaeger propagator as deprecated.
-
-#### Motivation (Jaeger)
-
-The Jaeger Exporter is now (July 2023) removed from the OpenTelemetry specification.
-
-The Jaeger Propagator remains, because changing propagation is a longer
-process compared to changing an export format.
-
-New deployments however are encouraged to use a W3C compliant propagator,
-and avoid the Jaeger propagator, which is now deprecated.
-
-#### Scope (Jaeger)
-
-The following are deprecated and planned for removal:
-
-* the API header `opentelemetry/trace/propagation/jaeger.h`, including:
-  * the C++ class `JaegerPropagator`
-
-#### Mitigation (Jaeger)
-
-Use a W3C compliant propagator instead.
-
-That is, use class HttpTraceContext and "traceparent" tags.
-
-Do not use class JaegerPropagator and "uber-trace-id" tags.
-
-#### Planned removal (Jaeger)
-
-No date set yet for the Jaeger Propagator.
+N/A
 
 ## [opentelemetry-cpp SDK]
 

api/include/opentelemetry/trace/default_span.h

@@ -66,8 +66,8 @@ class DefaultSpan : public Span
   DefaultSpan(SpanContext span_context) noexcept : span_context_(span_context) {}
 
   // movable and copiable
-  DefaultSpan(DefaultSpan &&spn) noexcept : span_context_(spn.GetContext()) {}
-  DefaultSpan(const DefaultSpan &spn) noexcept : span_context_(spn.GetContext()) {}
+  DefaultSpan(DefaultSpan &&spn) noexcept : Span(), span_context_(spn.GetContext()) {}
+  DefaultSpan(const DefaultSpan &spn) noexcept : Span(), span_context_(spn.GetContext()) {}
 
 private:
   SpanContext span_context_;

api/include/opentelemetry/trace/propagation/jaeger.h

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#ifdef OPENTELEMETRY_NO_DEPRECATED_CODE
-#  error "header <opentelemetry/trace/propagation/jaeger.h> is deprecated."
-#endif
-
 #include "detail/hex.h"
 #include "detail/string.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
@@ -21,7 +17,7 @@ namespace propagation
 
 static const nostd::string_view kJaegerTraceHeader = "uber-trace-id";
 
-class OPENTELEMETRY_DEPRECATED JaegerPropagator : public context::propagation::TextMapPropagator
+class JaegerPropagator : public context::propagation::TextMapPropagator
 {
 public:
   void Inject(context::propagation::TextMapCarrier &carrier,

api/test/trace/propagation/CMakeLists.txt

@@ -3,7 +3,8 @@
 
 add_subdirectory(detail)
 
-foreach(testname http_text_format_test b3_propagation_test)
+foreach(testname http_text_format_test b3_propagation_test
+                 jaeger_propagation_test)
   add_executable(${testname} "${testname}.cc")
   target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
                         ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
@@ -12,16 +13,3 @@ foreach(testname http_text_format_test b3_propagation_test)
     TEST_PREFIX trace.
     TEST_LIST ${testname})
 endforeach()
-
-if(NOT WITH_NO_DEPRECATED_CODE)
-  foreach(testname jaeger_propagation_test)
-
-    add_executable(${testname} "${testname}.cc")
-    target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
-                          ${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
-    gtest_add_tests(
-      TARGET ${testname}
-      TEST_PREFIX trace.
-      TEST_LIST ${testname})
-  endforeach()
-endif()