Code cleanup

open-telemetry · Oct 27, 2023 · da23608 · da23608
1 parent f4e28a0
commit da23608
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/sdk/src/trace/span.h b/sdk/src/trace/span.h
@@ -42,16 +42,16 @@ class Span final : public opentelemetry::trace::Span
                 opentelemetry::common::SystemTimestamp timestamp,
                 const opentelemetry::common::KeyValueIterable &attributes) noexcept override;
 
-  void SetStatus(opentelemetry::trace::StatusCode code,
-                 nostd::string_view description) noexcept override;
-
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
   void AddLink(const opentelemetry::trace::SpanContext &target,
                const opentelemetry::common::KeyValueIterable &attrs) noexcept override;
 
   void AddLinks(const opentelemetry::trace::SpanContextKeyValueIterable &links) noexcept override;
 #endif
 
+  void SetStatus(opentelemetry::trace::StatusCode code,
+                 nostd::string_view description) noexcept override;
+
   void UpdateName(nostd::string_view name) noexcept override;
 
   void End(const opentelemetry::trace::EndSpanOptions &options = {}) noexcept override;

diff --git a/sdk/test/trace/tracer_test.cc b/sdk/test/trace/tracer_test.cc
@@ -624,9 +624,7 @@ TEST(Tracer, SpanAddLinkAbiv2)
     }
   }
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
 
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
 TEST(Tracer, SpanAddLinksAbiv2)
 {
   InMemorySpanExporter *exporter              = new InMemorySpanExporter();
@@ -856,9 +854,7 @@ TEST(Tracer, SpanAddLinksAbiv2)
     }
   }
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */
 
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
 TEST(Tracer, SpanMixLinksAbiv2)
 {
   InMemorySpanExporter *exporter              = new InMemorySpanExporter();