Resolve comments

examples/multi_processor/main.cc

@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/exporters/memory/in_memory_span_data.h"
 #include "opentelemetry/exporters/memory/in_memory_span_exporter_factory.h"
 #include "opentelemetry/exporters/ostream/span_exporter_factory.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"

exporters/memory/BUILD

@@ -1,27 +1,29 @@
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
- name = "in_memory_data",
+ name = "in_memory_span_data",
  hdrs = [
  "include/opentelemetry/exporters/memory/in_memory_data.h",
+ "include/opentelemetry/exporters/memory/in_memory_span_data.h",
  ],
  strip_include_prefix = "include",
  tags = ["memory"],
  deps = [
  "//api",
  "//sdk/src/resource",
+ "//sdk/src/trace",
  ],
 )
 
 cc_test(
- name = "in_memory_data_test",
- srcs = ["test/in_memory_data_test.cc"],
+ name = "in_memory_span_data_test",
+ srcs = ["test/in_memory_span_data_test.cc"],
  tags = [
  "memory",
  "test",
  ],
  deps = [
- ":in_memory_data",
+ ":in_memory_span_data",
  "@com_google_googletest//:gtest_main",
  ],
 )
@@ -32,6 +34,7 @@ cc_library(
  "src/in_memory_span_exporter_factory.cc",
  ],
  hdrs = [
+ "include/opentelemetry/exporters/memory/in_memory_span_data.h",
  "include/opentelemetry/exporters/memory/in_memory_span_exporter.h",
  "include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h",
  ],
@@ -41,7 +44,7 @@ cc_library(
  "test",
  ],
  deps = [
- ":in_memory_data",
+ ":in_memory_span_data",
  "//sdk/src/trace",
  ],
 )

exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h

@@ -0,0 +1,32 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "opentelemetry/exporters/memory/in_memory_data.h"
+#include "opentelemetry/sdk/common/circular_buffer.h"
+#include "opentelemetry/sdk/trace/recordable.h"
+#include "opentelemetry/sdk/trace/span_data.h"
+
+#include <vector>
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+namespace exporter
+{
+namespace memory
+{
+class InMemorySpanData final : public exporter::memory::InMemoryData<sdk::trace::SpanData>
+{
+public:
+ /**
+ * @param buffer_size a required value that sets the size of the CircularBuffer
+ */
+ explicit InMemorySpanData(size_t buffer_size)
+ : exporter::memory::InMemoryData<sdk::trace::SpanData>(buffer_size)
+ {}
+
+ std::vector<std::unique_ptr<sdk::trace::SpanData>> GetSpans() noexcept { return Get(); }
+};
+} // namespace memory
+} // namespace exporter
+OPENTELEMETRY_END_NAMESPACE

exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter.h

@@ -4,7 +4,7 @@
 #pragma once
 #include <mutex>
 #include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/exporters/memory/in_memory_data.h"
+#include "opentelemetry/exporters/memory/in_memory_span_data.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/sdk/trace/recordable.h"
 #include "opentelemetry/sdk/trace/span_data.h"
@@ -17,19 +17,6 @@ namespace memory
 {
 const size_t MAX_BUFFER_SIZE = 100;
 
-class InMemorySpanData final : public exporter::memory::InMemoryData<sdk::trace::SpanData>
-{
-public:
- /**
- * @param buffer_size a required value that sets the size of the CircularBuffer
- */
- explicit InMemorySpanData(size_t buffer_size)
- : exporter::memory::InMemoryData<sdk::trace::SpanData>(buffer_size)
- {}
-
- std::vector<std::unique_ptr<sdk::trace::SpanData>> GetSpans() noexcept { return Get(); }
-};
-
 /**
  * A in memory exporter that switches a flag once a valid recordable was received
  * and keeps track of all received spans in memory.

exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
+#include "opentelemetry/exporters/memory/in_memory_span_data.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

exporters/memory/src/in_memory_span_exporter_factory.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "opentelemetry/exporters/memory/in_memory_span_exporter_factory.h"
+#include "opentelemetry/exporters/memory/in_memory_span_data.h"
 #include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 

exporters/memory/test/in_memory_data_test.cc → exporters/memory/test/in_memory_span_data_test.cc

@@ -1,28 +1,28 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/memory/in_memory_data.h"
+#include "opentelemetry/exporters/memory/in_memory_span_data.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/sdk/trace/span_data.h"
 
 #include <gtest/gtest.h>
 
-using opentelemetry::exporter::memory::InMemoryData;
+using opentelemetry::exporter::memory::InMemorySpanData;
 using opentelemetry::sdk::trace::Recordable;
 using opentelemetry::sdk::trace::SpanData;
 
-TEST(InMemoryData, AddRecordable)
+TEST(InMemorySpanData, AddRecordable)
 {
- InMemoryData<SpanData> data(100);
+ InMemorySpanData data(100);
 
- ASSERT_EQ(0, data.Get().size());
+ ASSERT_EQ(0, data.GetSpans().size());
 
  std::unique_ptr<SpanData> spandata(new SpanData());
 
  data.Add(std::move(spandata));
 
  // Consumes all spans in exporter
- ASSERT_EQ(1, data.Get().size());
+ ASSERT_EQ(1, data.GetSpans().size());
 
- ASSERT_EQ(0, data.Get().size());
+ ASSERT_EQ(0, data.GetSpans().size());
 }