From 36f0dc4c6eddfcc2c7f2a97c3d9866efe2ae53ad Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Mon, 7 Oct 2024 23:16:35 +0200
Subject: [PATCH] Fixes #3077

---
 DEPRECATED.md                                 | 40 +------------------
 .../opentelemetry/trace/propagation/jaeger.h  |  6 +--
 api/test/trace/propagation/CMakeLists.txt     | 15 +------
 3 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/DEPRECATED.md b/DEPRECATED.md
index 0632f50503..eea861ffe6 100644
--- a/DEPRECATED.md
+++ b/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]
 
diff --git a/api/include/opentelemetry/trace/propagation/jaeger.h b/api/include/opentelemetry/trace/propagation/jaeger.h
index 1f0195a248..45a9370919 100644
--- a/api/include/opentelemetry/trace/propagation/jaeger.h
+++ b/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,
diff --git a/api/test/trace/propagation/CMakeLists.txt b/api/test/trace/propagation/CMakeLists.txt
index a1cfcf83ee..1d8ead92cd 100644
--- a/api/test/trace/propagation/CMakeLists.txt
+++ b/api/test/trace/propagation/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 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 +12,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()