resolve conflict

yxue · yxue · commit 3b7b323f2e70 · 2022-07-15T14:10:10.000-07:00
diff --git a/examples/multi_processor/main.cc b/examples/multi_processor/main.cc
@@ -1,7 +1,6 @@
 // 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"
diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_exporter_factory.h b/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_data.h"
+#include "opentelemetry/exporters/memory/in_memory_span_exporter.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
diff --git a/exporters/memory/src/in_memory_span_exporter_factory.cc b/exporters/memory/src/in_memory_span_exporter_factory.cc
@@ -2,7 +2,6 @@
 // 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"
 
