Skip to content

Commit fb1f7a9

Browse files
ThomsonTanThomsonTan
authored
[user_events exporter] Remove ENABLE_LOGS_PREVIEW macro as it was removed in the main repo (#327)
1 parent fb746d7 commit fb1f7a9

File tree

7 files changed

+47
-75
lines changed

7 files changed

+47
-75
lines changed

‎exporters/user_events/benchmark/logger_benchmark.cc‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#ifdef ENABLE_LOGS_PREVIEW
5-
6-
# include "opentelemetry/common/timestamp.h"
7-
# include "opentelemetry/logs/logger.h"
8-
# include "opentelemetry/logs/provider.h"
9-
# include "opentelemetry/nostd/shared_ptr.h"
10-
11-
# include "opentelemetry/exporters/user_events/logs/exporter.h"
12-
# include "opentelemetry/logs/provider.h"
13-
# include "opentelemetry/sdk/logs/logger_provider_factory.h"
14-
# include "opentelemetry/sdk/logs/processor.h"
15-
# include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
16-
17-
# include <chrono>
18-
# include <condition_variable>
19-
# include <functional>
20-
# include <mutex>
21-
# include <thread>
22-
# include <vector>
23-
24-
# include <benchmark/benchmark.h>
4+
#include "opentelemetry/common/timestamp.h"
5+
#include "opentelemetry/logs/logger.h"
6+
#include "opentelemetry/logs/provider.h"
7+
#include "opentelemetry/nostd/shared_ptr.h"
8+
9+
#include "opentelemetry/exporters/user_events/logs/exporter.h"
10+
#include "opentelemetry/logs/provider.h"
11+
#include "opentelemetry/sdk/logs/logger_provider_factory.h"
12+
#include "opentelemetry/sdk/logs/processor.h"
13+
#include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
14+
15+
#include <chrono>
16+
#include <condition_variable>
17+
#include <functional>
18+
#include <mutex>
19+
#include <thread>
20+
#include <vector>
21+
22+
#include <benchmark/benchmark.h>
2523

2624
using opentelemetry::logs::EventId;
2725
using opentelemetry::logs::Logger;
@@ -167,5 +165,3 @@ int main(int argc, char **argv)
167165
benchmark::Initialize(&argc, argv);
168166
benchmark::RunSpecifiedBenchmarks();
169167
}
170-
171-
#endif

‎exporters/user_events/example/logs/foo_library.cc‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#ifdef ENABLE_LOGS_PREVIEW
5-
6-
# include "opentelemetry/logs/event_id.h"
7-
# include "opentelemetry/logs/provider.h"
8-
# include "opentelemetry/sdk/version/version.h"
4+
#include "opentelemetry/logs/event_id.h"
5+
#include "opentelemetry/logs/provider.h"
6+
#include "opentelemetry/sdk/version/version.h"
97

108
namespace logs = opentelemetry::logs;
119
namespace nostd = opentelemetry::nostd;
@@ -42,5 +40,3 @@ void sell_fruit(std::string_view fruit)
4240
{{"fruit_name", fruit.data()},
4341
{"fruit_price", static_cast<int>(fruit_inventory[fruit.data()])}}));
4442
}
45-
46-
#endif

‎exporters/user_events/include/opentelemetry/exporters/user_events/logs/exporter.h‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33

44
#pragma once
55

6-
#ifdef ENABLE_LOGS_PREVIEW
6+
#include "exporter_options.h"
7+
#include "opentelemetry/common/spin_lock_mutex.h"
8+
#include "opentelemetry/sdk/logs/exporter.h"
79

8-
# include "exporter_options.h"
9-
# include "opentelemetry/common/spin_lock_mutex.h"
10-
# include "opentelemetry/sdk/logs/exporter.h"
11-
12-
# include <eventheader/EventHeaderDynamic.h>
13-
# include <array>
14-
# include <mutex>
10+
#include <eventheader/EventHeaderDynamic.h>
11+
#include <array>
12+
#include <mutex>
1513

1614
OPENTELEMETRY_BEGIN_NAMESPACE
1715
namespace exporter
@@ -66,5 +64,3 @@ class Exporter final : public opentelemetry::sdk::logs::LogRecordExporter
6664
} // namespace user_events
6765
} // namespace exporter
6866
OPENTELEMETRY_END_NAMESPACE
69-
70-
#endif

‎exporters/user_events/include/opentelemetry/exporters/user_events/logs/exporter_options.h‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
#pragma once
55

6-
#ifdef ENABLE_LOGS_PREVIEW
7-
8-
# include <string>
9-
# include "opentelemetry/version.h"
6+
#include <string>
7+
#include "opentelemetry/version.h"
108

119
OPENTELEMETRY_BEGIN_NAMESPACE
1210
namespace exporter
@@ -22,5 +20,3 @@ struct ExporterOptions
2220
} // namespace user_events
2321
} // namespace exporter
2422
OPENTELEMETRY_END_NAMESPACE
25-
26-
#endif

‎exporters/user_events/include/opentelemetry/exporters/user_events/logs/recordable.h‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33

44
#pragma once
55

6-
#ifdef ENABLE_LOGS_PREVIEW
6+
#include "opentelemetry/nostd/string_view.h"
7+
#include "opentelemetry/logs/severity.h"
8+
#include "opentelemetry/sdk/common/attribute_utils.h"
9+
#include "opentelemetry/sdk/logs/recordable.h"
10+
#include "opentelemetry/version.h"
11+
#include "utils.h"
712

8-
# include "opentelemetry/nostd/string_view.h"
9-
# include "opentelemetry/logs/severity.h"
10-
# include "opentelemetry/sdk/common/attribute_utils.h"
11-
# include "opentelemetry/sdk/logs/recordable.h"
12-
# include "opentelemetry/version.h"
13-
# include "utils.h"
14-
15-
# include <eventheader/EventHeaderDynamic.h>
16-
# include <chrono>
13+
#include <eventheader/EventHeaderDynamic.h>
14+
#include <chrono>
1715

1816
OPENTELEMETRY_BEGIN_NAMESPACE
1917
namespace exporter
@@ -129,5 +127,3 @@ class Recordable final : public opentelemetry::sdk::logs::Recordable
129127
} // namespace user_events
130128
} // namespace exporter
131129
OPENTELEMETRY_END_NAMESPACE
132-
133-
#endif // ENABLE_LOGS_PREVIEW

‎exporters/user_events/src/logs_exporter.cc‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#ifdef ENABLE_LOGS_PREVIEW
5-
6-
# include "opentelemetry/exporters/user_events/logs/exporter.h"
7-
# include "opentelemetry/exporters/user_events/logs/recordable.h"
8-
# include "opentelemetry/sdk_config.h"
4+
#include "opentelemetry/exporters/user_events/logs/exporter.h"
5+
#include "opentelemetry/exporters/user_events/logs/recordable.h"
6+
#include "opentelemetry/sdk_config.h"
97

108
namespace nostd = opentelemetry::nostd;
119
namespace sdklogs = opentelemetry::sdk::logs;
@@ -92,5 +90,3 @@ bool Exporter::isShutdown() const noexcept
9290
} // namespace user_events
9391
} // namespace exporter
9492
OPENTELEMETRY_END_NAMESPACE
95-
96-
#endif

‎exporters/user_events/test/logs_exporter_test.cc‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#ifdef ENABLE_LOGS_PREVIEW
4+
#include <iostream>
5+
#include <map>
6+
#include <string>
7+
#include <vector>
58

6-
# include <iostream>
7-
# include <map>
8-
# include <string>
9-
# include <vector>
9+
#include "opentelemetry/exporters/user_events/logs/exporter.h"
1010

11-
# include "opentelemetry/exporters/user_events/logs/exporter.h"
12-
13-
# include <gtest/gtest.h>
11+
#include <gtest/gtest.h>
1412

1513
namespace sdk_logs = opentelemetry::sdk::logs;
1614
namespace user_events_logs = opentelemetry::exporter::user_events::logs;
@@ -31,5 +29,3 @@ TEST(UserEventsLogRecordExporter, Shutdown)
3129

3230
EXPECT_TRUE(exporter->Shutdown());
3331
}
34-
35-
#endif

0 commit comments

Comments
 (0)