Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…

…y-cpp into maxgolov/win32_fix
open-telemetry · Jun 11, 2021 · fbb27b3 · fbb27b3
2 parents f7137bb + 865b9e7
commit fbb27b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h
@@ -39,9 +39,10 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace nostd
 {
+using gsl::dynamic_extent;
 template <class ElementType, std::size_t Extent = gsl::dynamic_extent>
 using span = gsl::span<ElementType, Extent>;
-}
+}  // namespace nostd
 OPENTELEMETRY_END_NAMESPACE
 #    define HAVE_SPAN
 #  else

diff --git a/sdk/test/common/circular_buffer_test.cc b/sdk/test/common/circular_buffer_test.cc
@@ -155,6 +155,8 @@ TEST(CircularBufferTest, Simulation)
     consumer.join();
     std::sort(producer_numbers.begin(), producer_numbers.end());
     std::sort(consumer_numbers.begin(), consumer_numbers.end());
+
+    EXPECT_EQ(producer_numbers.size(), consumer_numbers.size());
     EXPECT_EQ(producer_numbers, consumer_numbers);
   }
 }