From 66be1fb3243fcdb62d8f74eea6caf145864e3f41 Mon Sep 17 00:00:00 2001
From: David Goffredo <david.goffredo@datadoghq.com>
Date: Fri, 17 Mar 2023 13:47:12 -0400
Subject: [PATCH] add missing overloads to TraceID's operator== and operator!=
 (#23)

---
 src/datadog/trace_id.cpp |  4 ++++
 src/datadog/trace_id.h   |  2 ++
 test/test_trace_id.cpp   | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/src/datadog/trace_id.cpp b/src/datadog/trace_id.cpp
index 7f0ead9d..a51414f7 100644
--- a/src/datadog/trace_id.cpp
+++ b/src/datadog/trace_id.cpp
@@ -84,5 +84,9 @@ bool operator!=(TraceID left, std::uint64_t right) {
   return left != TraceID{right};
 }
 
+bool operator==(std::uint64_t left, TraceID right) { return right == left; }
+
+bool operator!=(std::uint64_t left, TraceID right) { return right != left; }
+
 }  // namespace tracing
 }  // namespace datadog
diff --git a/src/datadog/trace_id.h b/src/datadog/trace_id.h
index d0e39a5c..334ba08c 100644
--- a/src/datadog/trace_id.h
+++ b/src/datadog/trace_id.h
@@ -43,6 +43,8 @@ bool operator==(TraceID, TraceID);
 bool operator!=(TraceID, TraceID);
 bool operator==(TraceID, std::uint64_t);
 bool operator!=(TraceID, std::uint64_t);
+bool operator==(std::uint64_t, TraceID);
+bool operator!=(std::uint64_t, TraceID);
 
 }  // namespace tracing
 }  // namespace datadog
diff --git a/test/test_trace_id.cpp b/test/test_trace_id.cpp
index 5c2e2bb6..5995cf02 100644
--- a/test/test_trace_id.cpp
+++ b/test/test_trace_id.cpp
@@ -57,11 +57,23 @@ TEST_CASE("TraceID comparisons") {
   // First, comparing integers with the `TraceID.low`.
   REQUIRE(TraceID{12345} == 12345);
   REQUIRE_FALSE(TraceID{12345} != 12345);
+
   REQUIRE(TraceID{12345} != 54321);
   REQUIRE_FALSE(TraceID{12345} == 54321);
+
   REQUIRE(TraceID{6789, 12345} != 12345);
   REQUIRE_FALSE(TraceID{6789, 12345} == 12345);
 
+  // And the opposite argument order.
+  REQUIRE(12345 == TraceID{12345});
+  REQUIRE_FALSE(12345 != TraceID{12345});
+
+  REQUIRE(54321 != TraceID{12345});
+  REQUIRE_FALSE(54321 == TraceID{12345});
+
+  REQUIRE(12345 != TraceID{6789, 12345});
+  REQUIRE_FALSE(12345 == TraceID{6789, 12345});
+
   // Second, comparing trace IDs with other trace IDs.
   struct TestCase {
     int line;