Skip to content

Commit e846291

Browse files
committed
Whitespace cleanup in an otel-webserver-module mock
1 parent d8d7532 commit e846291

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

exporters/fluentd/test/trace/fluentd_recordable_test.cc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "opentelemetry/sdk/trace/simple_processor.h"
2828
#include "opentelemetry/sdk/trace/span_data.h"
2929
#include "opentelemetry/sdk/trace/tracer_provider.h"
30-
#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
3130
#include "opentelemetry/trace/provider.h"
3231

3332
#include "opentelemetry/sdk/trace/exporter.h"
@@ -381,15 +380,10 @@ TEST(FluentdExporter, SendTraceEvents) {
381380
auto processor = std::unique_ptr<SpanProcessor>(
382381
new sdktrace::SimpleSpanProcessor(std::move(exporter)));
383382

384-
#ifdef OPENTELEMETRY_DEPRECATED_SDK_FACTORY
385-
nostd::shared_ptr<trace::TracerProvider> provider =
386-
sdktrace::TracerProviderFactory::Create(std::move(processor));
387-
#else
388-
nostd::shared_ptr<sdktrace::TracerProvider> provider =
389-
sdktrace::TracerProviderFactory::Create(std::move(processor));
390-
#endif /* OPENTELEMETRY_DEPRECATED_SDK_FACTORY */
383+
auto provider = std::shared_ptr<sdktrace::TracerProvider>(
384+
new TracerProvider(std::move(processor)));
391385

392-
nostd::shared_ptr<trace::TracerProvider> api_provider = provider;
386+
std::shared_ptr<trace::TracerProvider> api_provider = provider;
393387
// Set the global trace provider
394388
opentelemetry::trace::Provider::SetTracerProvider(api_provider);
395389

instrumentation/otel-webserver-module/test/unit/mocks/mock_OpenTelemetry.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ class MockPropagator : public context::propagation::TextMapPropagator
102102
const context::Context &context) noexcept override {
103103
InjectImpl(carrier);
104104
}
105-
105+
106106
MOCK_METHOD(void, ExtractImpl, (const context::propagation::TextMapCarrier &carrier));
107107
MOCK_METHOD(void, InjectImpl, (context::propagation::TextMapCarrier &carrier));
108-
MOCK_METHOD(bool, Fields, (nostd::function_ref<bool(nostd::string_view)> callback),
108+
MOCK_METHOD(bool, Fields, (nostd::function_ref<bool(nostd::string_view)> callback),
109109
(const, noexcept, override));
110110
};
111111

0 commit comments

Comments
 (0)