Code cleanup

marcalff · marcalff · commit da23608711ce · 2023-10-27T17:41:06.000+02:00
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();

Original file line number	Diff line number	Diff line change
`@@ -624,9 +624,7 @@ TEST(Tracer, SpanAddLinkAbiv2)`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`	`}`
`627`		`-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */`
`628`	`627`
`629`		`-#if OPENTELEMETRY_ABI_VERSION_NO >= 2`
`630`	`628`	`TEST(Tracer, SpanAddLinksAbiv2)`
`631`	`629`	`{`
`632`	`630`	`InMemorySpanExporter *exporter = new InMemorySpanExporter();`
`@@ -856,9 +854,7 @@ TEST(Tracer, SpanAddLinksAbiv2)`
`856`	`854`	`}`
`857`	`855`	`}`
`858`	`856`	`}`
`859`		`-#endif /* OPENTELEMETRY_ABI_VERSION_NO >= 2 */`
`860`	`857`
`861`		`-#if OPENTELEMETRY_ABI_VERSION_NO >= 2`
`862`	`858`	`TEST(Tracer, SpanMixLinksAbiv2)`
`863`	`859`	`{`
`864`	`860`	`InMemorySpanExporter *exporter = new InMemorySpanExporter();`