Skip to content

Commit 7634edf

Browse files
owentesigo
owent
and
esigo
authored
[Logs SDK] LogProcessor, LogExporter changes (#1727)
* + Rename `LogProcessor` to `LogRecordProcessor` + Rename `LogExporter` to `LogRecordExporter` + Move `*log_processor*` to `*log_record_processor*` + Move `*log_exporter*` to `*log_record_exporter*` Signed-off-by: owent <admin@owent.net> * Add changelog Signed-off-by: owent <admin@owent.net> Signed-off-by: owent <admin@owent.net> Co-authored-by: Ehsan Saei <71217171+esigo@users.noreply.github.com>
1 parent 7812651 commit 7634edf

66 files changed

Lines changed: 387 additions & 372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Increment the:
1515

1616
## [Unreleased]
1717

18+
* [LOGS SDK] Rename LogProcessor and LogExporter to LogRecordProcessor and LogRecordExporter
19+
[#1727](https://github.com/open-telemetry/opentelemetry-cpp/pull/1727)
20+
1821
## [1.7.0] 2022-10-28
1922

2023
* [METRICS SDK] Validate Instrument meta data (name, unit, description) [#1713](https://github.com/open-telemetry/opentelemetry-cpp/pull/1713)

‎cmake/opentelemetry-cpp-config.cmake.in‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,33 @@
2020
# OPENTELEMETRY_VERSION - Version of opentelemetry-cpp.
2121
#
2222
# ::
23-
# opentelemetry-cpp::api - Imported target of opentelemetry-cpp::api
24-
# opentelemetry-cpp::sdk - Imported target of opentelemetry-cpp::sdk
25-
# opentelemetry-cpp::ext - Imported target of opentelemetry-cpp::ext
26-
# opentelemetry-cpp::version - Imported target of opentelemetry-cpp::version
27-
# opentelemetry-cpp::common - Imported target of opentelemetry-cpp::common
28-
# opentelemetry-cpp::trace - Imported target of opentelemetry-cpp::trace
29-
# opentelemetry-cpp::metrics - Imported target of opentelemetry-cpp::metrics
30-
# opentelemetry-cpp::logs - Imported target of opentelemetry-cpp::logs
31-
# opentelemetry-cpp::in_memory_span_exporter - Imported target of opentelemetry-cpp::in_memory_span_exporter
32-
# opentelemetry-cpp::otlp_grpc_client - Imported target of opentelemetry-cpp::otlp_grpc_client
33-
# opentelemetry-cpp::otlp_recordable - Imported target of opentelemetry-cpp::otlp_recordable
34-
# opentelemetry-cpp::otlp_grpc_exporter - Imported target of opentelemetry-cpp::otlp_grpc_exporter
35-
# opentelemetry-cpp::otlp_grpc_log_exporter - Imported target of opentelemetry-cpp::otlp_grpc_log_exporter
36-
# opentelemetry-cpp::otlp_grpc_metrics_exporter - Imported target of opentelemetry-cpp::otlp_grpc_metrics_exporter
37-
# opentelemetry-cpp::otlp_http_client - Imported target of opentelemetry-cpp::otlp_http_client
38-
# opentelemetry-cpp::otlp_http_exporter - Imported target of opentelemetry-cpp::otlp_http_exporter
39-
# opentelemetry-cpp::otlp_http_log_exporter - Imported target of opentelemetry-cpp::otlp_http_log_exporter
40-
# opentelemetry-cpp::otlp_http_metric_exporter - Imported target of opentelemetry-cpp::otlp_http_metric_exporter
41-
# opentelemetry-cpp::ostream_log_exporter - Imported target of opentelemetry-cpp::ostream_log_exporter
42-
# opentelemetry-cpp::ostream_metrics_exporter - Imported target of opentelemetry-cpp::ostream_metrics_exporter
43-
# opentelemetry-cpp::ostream_span_exporter - Imported target of opentelemetry-cpp::ostream_span_exporter
44-
# opentelemetry-cpp::prometheus_exporter_deprecated - Imported target of opentelemetry-cpp::prometheus_exporter_deprecated
45-
# opentelemetry-cpp::elasticsearch_log_exporter - Imported target of opentelemetry-cpp::elasticsearch_log_exporter
46-
# opentelemetry-cpp::etw_exporter - Imported target of opentelemetry-cpp::etw_exporter
47-
# opentelemetry-cpp::jaeger_trace_exporter - Imported target of opentelemetry-cpp::jaeger_trace_exporter
48-
# opentelemetry-cpp::zpages - Imported target of opentelemetry-cpp::zpages
49-
# opentelemetry-cpp::http_client_curl - Imported target of opentelemetry-cpp::http_client_curl
23+
# opentelemetry-cpp::api - Imported target of opentelemetry-cpp::api
24+
# opentelemetry-cpp::sdk - Imported target of opentelemetry-cpp::sdk
25+
# opentelemetry-cpp::ext - Imported target of opentelemetry-cpp::ext
26+
# opentelemetry-cpp::version - Imported target of opentelemetry-cpp::version
27+
# opentelemetry-cpp::common - Imported target of opentelemetry-cpp::common
28+
# opentelemetry-cpp::trace - Imported target of opentelemetry-cpp::trace
29+
# opentelemetry-cpp::metrics - Imported target of opentelemetry-cpp::metrics
30+
# opentelemetry-cpp::logs - Imported target of opentelemetry-cpp::logs
31+
# opentelemetry-cpp::in_memory_span_exporter - Imported target of opentelemetry-cpp::in_memory_span_exporter
32+
# opentelemetry-cpp::otlp_grpc_client - Imported target of opentelemetry-cpp::otlp_grpc_client
33+
# opentelemetry-cpp::otlp_recordable - Imported target of opentelemetry-cpp::otlp_recordable
34+
# opentelemetry-cpp::otlp_grpc_exporter - Imported target of opentelemetry-cpp::otlp_grpc_exporter
35+
# opentelemetry-cpp::otlp_grpc_log_record_exporter - Imported target of opentelemetry-cpp::otlp_grpc_log_record_exporter
36+
# opentelemetry-cpp::otlp_grpc_metrics_exporter - Imported target of opentelemetry-cpp::otlp_grpc_metrics_exporter
37+
# opentelemetry-cpp::otlp_http_client - Imported target of opentelemetry-cpp::otlp_http_client
38+
# opentelemetry-cpp::otlp_http_exporter - Imported target of opentelemetry-cpp::otlp_http_exporter
39+
# opentelemetry-cpp::otlp_http_log_record_exporter - Imported target of opentelemetry-cpp::otlp_http_log_record_exporter
40+
# opentelemetry-cpp::otlp_http_metric_exporter - Imported target of opentelemetry-cpp::otlp_http_metric_exporter
41+
# opentelemetry-cpp::ostream_log_record_exporter - Imported target of opentelemetry-cpp::ostream_log_record_exporter
42+
# opentelemetry-cpp::ostream_metrics_exporter - Imported target of opentelemetry-cpp::ostream_metrics_exporter
43+
# opentelemetry-cpp::ostream_span_exporter - Imported target of opentelemetry-cpp::ostream_span_exporter
44+
# opentelemetry-cpp::prometheus_exporter_deprecated - Imported target of opentelemetry-cpp::prometheus_exporter_deprecated
45+
# opentelemetry-cpp::elasticsearch_log_record_exporter - Imported target of opentelemetry-cpp::elasticsearch_log_record_exporter
46+
# opentelemetry-cpp::etw_exporter - Imported target of opentelemetry-cpp::etw_exporter
47+
# opentelemetry-cpp::jaeger_trace_exporter - Imported target of opentelemetry-cpp::jaeger_trace_exporter
48+
# opentelemetry-cpp::zpages - Imported target of opentelemetry-cpp::zpages
49+
# opentelemetry-cpp::http_client_curl - Imported target of opentelemetry-cpp::http_client_curl
5050
#
5151

5252
# =============================================================================
@@ -88,17 +88,17 @@ set(_OPENTELEMETRY_CPP_LIBRARIES_TEST_TARGETS
8888
otlp_recordable
8989
otlp_grpc_client
9090
otlp_grpc_exporter
91-
otlp_grpc_log_exporter
91+
otlp_grpc_log_record_exporter
9292
otlp_grpc_metrics_exporter
9393
otlp_http_client
9494
otlp_http_exporter
95-
otlp_http_log_exporter
95+
otlp_http_log_record_exporter
9696
otlp_http_metric_exporter
97-
ostream_log_exporter
97+
ostream_log_record_exporter
9898
ostream_metrics_exporter
9999
ostream_span_exporter
100100
prometheus_exporter
101-
elasticsearch_log_exporter
101+
elasticsearch_log_record_exporter
102102
etw_exporter
103103
jaeger_trace_exporter
104104
zpages

‎examples/otlp/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ cc_binary(
4848
"//api",
4949
"//examples/common/logs_foo_library:common_logs_foo_library",
5050
"//exporters/otlp:otlp_http_exporter",
51-
"//exporters/otlp:otlp_http_log_exporter",
51+
"//exporters/otlp:otlp_http_log_record_exporter",
5252
"//sdk/src/trace",
5353
],
5454
)
@@ -67,7 +67,7 @@ cc_binary(
6767
"//api",
6868
"//examples/common/logs_foo_library:common_logs_foo_library",
6969
"//exporters/otlp:otlp_grpc_exporter",
70-
"//exporters/otlp:otlp_grpc_log_exporter",
70+
"//exporters/otlp:otlp_grpc_log_record_exporter",
7171
"//sdk/src/trace",
7272
],
7373
)

‎examples/otlp/grpc_log_main.cc‎

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

44
#ifdef ENABLE_LOGS_PREVIEW
55
# include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
6-
# include "opentelemetry/exporters/otlp/otlp_grpc_log_exporter_factory.h"
6+
# include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
77
# include "opentelemetry/logs/provider.h"
88
# include "opentelemetry/sdk/logs/logger_provider_factory.h"
9-
# include "opentelemetry/sdk/logs/simple_log_processor_factory.h"
9+
# include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
1010
# include "opentelemetry/sdk/trace/simple_processor_factory.h"
1111
# include "opentelemetry/sdk/trace/tracer_provider_factory.h"
1212
# include "opentelemetry/trace/provider.h"

‎examples/otlp/http_log_main.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#ifdef ENABLE_LOGS_PREVIEW
55
# include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
6-
# include "opentelemetry/exporters/otlp/otlp_http_log_exporter_factory.h"
7-
# include "opentelemetry/exporters/otlp/otlp_http_log_exporter_options.h"
6+
# include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
7+
# include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
88
# include "opentelemetry/logs/provider.h"
99
# include "opentelemetry/sdk/logs/logger_provider_factory.h"
10-
# include "opentelemetry/sdk/logs/simple_log_processor_factory.h"
10+
# include "opentelemetry/sdk/logs/simple_log_record_processor_factory.h"
1111
# include "opentelemetry/sdk/trace/simple_processor_factory.h"
1212
# include "opentelemetry/sdk/trace/tracer_provider_factory.h"
1313
# include "opentelemetry/trace/provider.h"

‎exporters/elasticsearch/BUILD‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package(default_visibility = ["//visibility:public"])
22

33
cc_library(
4-
name = "es_log_exporter",
4+
name = "es_log_record_exporter",
55
srcs = [
6-
"src/es_log_exporter.cc",
6+
"src/es_log_record_exporter.cc",
77
],
88
hdrs = [
9-
"include/opentelemetry/exporters/elasticsearch/es_log_exporter.h",
9+
"include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h",
1010
"include/opentelemetry/exporters/elasticsearch/es_log_recordable.h",
1111
],
1212
linkopts = select({
@@ -29,14 +29,14 @@ cc_library(
2929
)
3030

3131
cc_test(
32-
name = "es_log_exporter_test",
33-
srcs = ["test/es_log_exporter_test.cc"],
32+
name = "es_log_record_exporter_test",
33+
srcs = ["test/es_log_record_exporter_test.cc"],
3434
tags = [
3535
"es",
3636
"test",
3737
],
3838
deps = [
39-
":es_log_exporter",
39+
":es_log_record_exporter",
4040
"@com_google_googletest//:gtest_main",
4141
"@curl",
4242
],

‎exporters/elasticsearch/CMakeLists.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
add_library(opentelemetry_exporter_elasticsearch_logs src/es_log_exporter.cc)
1+
add_library(opentelemetry_exporter_elasticsearch_logs
2+
src/es_log_record_exporter.cc)
23

34
set_target_properties(opentelemetry_exporter_elasticsearch_logs
4-
PROPERTIES EXPORT_NAME elasticsearch_log_exporter)
5+
PROPERTIES EXPORT_NAME elasticsearch_log_record_exporter)
56

67
target_include_directories(
78
opentelemetry_exporter_elasticsearch_logs
@@ -28,14 +29,15 @@ install(
2829
PATTERN "es_log_recordable.h" EXCLUDE)
2930

3031
if(BUILD_TESTING)
31-
add_executable(es_log_exporter_test test/es_log_exporter_test.cc)
32+
add_executable(es_log_record_exporter_test
33+
test/es_log_record_exporter_test.cc)
3234

3335
target_link_libraries(
34-
es_log_exporter_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
35-
opentelemetry_exporter_elasticsearch_logs)
36+
es_log_record_exporter_test ${GTEST_BOTH_LIBRARIES}
37+
${CMAKE_THREAD_LIBS_INIT} opentelemetry_exporter_elasticsearch_logs)
3638

3739
gtest_add_tests(
38-
TARGET es_log_exporter_test
40+
TARGET es_log_record_exporter_test
3941
TEST_PREFIX exporter.
40-
TEST_LIST es_log_exporter_test)
42+
TEST_LIST es_log_record_exporter_test)
4143
endif() # BUILD_TESTING

exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_exporter.h renamed to exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct ElasticsearchExporterOptions
6161
/**
6262
* The ElasticsearchLogExporter exports logs to Elasticsearch in JSON format
6363
*/
64-
class ElasticsearchLogExporter final : public opentelemetry::sdk::logs::LogExporter
64+
class ElasticsearchLogExporter final : public opentelemetry::sdk::logs::LogRecordExporter
6565
{
6666
public:
6767
/**

exporters/elasticsearch/src/es_log_exporter.cc renamed to exporters/elasticsearch/src/es_log_record_exporter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# include <condition_variable>
99
# include <mutex>
10-
# include "opentelemetry/exporters/elasticsearch/es_log_exporter.h"
10+
# include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
1111
# include "opentelemetry/exporters/elasticsearch/es_log_recordable.h"
1212
# include "opentelemetry/sdk_config.h"
1313

exporters/elasticsearch/test/es_log_exporter_test.cc renamed to exporters/elasticsearch/test/es_log_record_exporter_test.cc

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

44
#ifdef ENABLE_LOGS_PREVIEW
55

6-
# include "opentelemetry/exporters/elasticsearch/es_log_exporter.h"
6+
# include "opentelemetry/exporters/elasticsearch/es_log_record_exporter.h"
77
# include "opentelemetry/ext/http/server/http_server.h"
88
# include "opentelemetry/logs/provider.h"
99
# include "opentelemetry/sdk/logs/exporter.h"
1010
# include "opentelemetry/sdk/logs/log_record.h"
1111
# include "opentelemetry/sdk/logs/logger_provider.h"
12-
# include "opentelemetry/sdk/logs/simple_log_processor.h"
12+
# include "opentelemetry/sdk/logs/simple_log_record_processor.h"
1313

1414
# include <gtest/gtest.h>
1515
# include <iostream>
@@ -33,7 +33,7 @@ TEST(ElasticsearchLogsExporterTests, InvalidEndpoint)
3333

3434
// Create an elasticsearch exporter
3535
auto exporter =
36-
std::unique_ptr<sdklogs::LogExporter>(new logs_exporter::ElasticsearchLogExporter(options));
36+
std::unique_ptr<sdklogs::LogRecordExporter>(new logs_exporter::ElasticsearchLogExporter(options));
3737

3838
// Create a log record and send to the exporter
3939
auto record = exporter->MakeRecordable();
@@ -48,7 +48,7 @@ TEST(ElasticsearchLogsExporterTests, Shutdown)
4848
{
4949
// Create an elasticsearch exporter and immediately shut it down
5050
auto exporter =
51-
std::unique_ptr<sdklogs::LogExporter>(new logs_exporter::ElasticsearchLogExporter);
51+
std::unique_ptr<sdklogs::LogRecordExporter>(new logs_exporter::ElasticsearchLogExporter);
5252
bool shutdownResult = exporter->Shutdown();
5353
ASSERT_TRUE(shutdownResult);
5454

@@ -65,7 +65,7 @@ TEST(ElasticsearchLogsExporterTests, RecordableCreation)
6565
{
6666
// Create an elasticsearch exporter
6767
auto exporter =
68-
std::unique_ptr<sdklogs::LogExporter>(new logs_exporter::ElasticsearchLogExporter);
68+
std::unique_ptr<sdklogs::LogRecordExporter>(new logs_exporter::ElasticsearchLogExporter);
6969

7070
// Create a recordable
7171
auto record = exporter->MakeRecordable();

0 commit comments

Comments
 (0)