Implementation of OtlpHttpLogExporter (gabime#1030)

bachittle · Oct 31, 2021 · 4110b56 · 4110b56
1 parent af75379
commit 4110b56
Show file tree

Hide file tree

Showing 26 changed files with 2,550 additions and 979 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ Increment the:
 
 ## [Unreleased]
 
+* [EXPORTER] Add OTLP/HTTP Log Exporter ([#1030](https://github.com/open-telemetry/opentelemetry-cpp/pull/1030))
+
 ## [1.0.1] 2021-10-21
 
 * [EXPORTER] Exports span attributes to ETW ([#1021](https://github.com/open-telemetry/opentelemetry-cpp/pull/1021))

diff --git a/api/test/common/spinlock_benchmark.cc b/api/test/common/spinlock_benchmark.cc
@@ -69,6 +69,7 @@ static void BM_NaiveSpinLockThrashing(benchmark::State &s)
       [](SpinLockMutex &m) {
         while (!m.try_lock())
         {
+          // Left this comment to keep the same format on old and new versions of clang-format
         }
       },
       [](SpinLockMutex &m) { m.unlock(); });
@@ -106,16 +107,21 @@ static void BM_ThreadYieldSpinLockThrashing(benchmark::State &s)
   SpinThrash<std::atomic<bool>>(
       s, mutex,
       [](std::atomic<bool> &l) {
-        if (!l.exchange(true, std::memory_order_acquire))
+        if (!l.exchange(true, std::memory_order_acq_rel))
         {
           return;
         }
-        for (std::size_t i = 0; i < 100; ++i)
+        for (std::size_t i = 0; i < 128; ++i)
         {
-          if (!l.load(std::memory_order_acquire) && !l.exchange(true, std::memory_order_acquire))
+          if (!l.load(std::memory_order_acquire) && !l.exchange(true, std::memory_order_acq_rel))
           {
             return;
           }
+
+          if (i % 32 == 0)
+          {
+            std::this_thread::yield();
+          }
         }
         std::this_thread::yield();
       },

diff --git a/bazel/opentelemetry_proto.BUILD b/bazel/opentelemetry_proto.BUILD
@@ -20,7 +20,7 @@ load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 proto_library(
     name = "common_proto",
     srcs = [
-      "opentelemetry/proto/common/v1/common.proto",
+        "opentelemetry/proto/common/v1/common.proto",
     ],
 )
 
@@ -32,10 +32,10 @@ cc_proto_library(
 proto_library(
     name = "resource_proto",
     srcs = [
-      "opentelemetry/proto/resource/v1/resource.proto",
+        "opentelemetry/proto/resource/v1/resource.proto",
     ],
     deps = [
-      ":common_proto",
+        ":common_proto",
     ],
 )
 
@@ -47,11 +47,11 @@ cc_proto_library(
 proto_library(
     name = "trace_proto",
     srcs = [
-      "opentelemetry/proto/trace/v1/trace.proto",
+        "opentelemetry/proto/trace/v1/trace.proto",
     ],
     deps = [
-      ":common_proto",
-      ":resource_proto",
+        ":common_proto",
+        ":resource_proto",
     ],
 )
 
@@ -63,10 +63,10 @@ cc_proto_library(
 proto_library(
     name = "trace_service_proto",
     srcs = [
-      "opentelemetry/proto/collector/trace/v1/trace_service.proto",
+        "opentelemetry/proto/collector/trace/v1/trace_service.proto",
     ],
     deps = [
-      ":trace_proto",
+        ":trace_proto",
     ],
 )
 
@@ -78,7 +78,46 @@ cc_proto_library(
 cc_grpc_library(
     name = "trace_service_grpc_cc",
     srcs = [":trace_service_proto"],
+    generate_mocks = True,
     grpc_only = True,
     deps = [":trace_service_proto_cc"],
+)
+
+proto_library(
+    name = "logs_proto",
+    srcs = [
+        "opentelemetry/proto/logs/v1/logs.proto",
+    ],
+    deps = [
+        ":common_proto",
+        ":resource_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "logs_proto_cc",
+    deps = [":logs_proto"],
+)
+
+proto_library(
+    name = "logs_service_proto",
+    srcs = [
+        "opentelemetry/proto/collector/logs/v1/logs_service.proto",
+    ],
+    deps = [
+        ":logs_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "logs_service_proto_cc",
+    deps = [":logs_service_proto"],
+)
+
+cc_grpc_library(
+    name = "logs_service_grpc_cc",
+    srcs = [":logs_service_proto"],
     generate_mocks = True,
+    grpc_only = True,
+    deps = [":logs_service_proto_cc"],
 )
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
@@ -54,10 +54,10 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "com_github_opentelemetry_proto",
         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "9ec38ab51eedbd7601979b0eda962cf37bc8a4dc35fcef604801e463f01dcc00",
-        strip_prefix = "opentelemetry-proto-0.9.0",
+        sha256 = "985367f8905e91018e636cbf0d83ab3f834b665c4f5899a27d10cae9657710e2",
+        strip_prefix = "opentelemetry-proto-0.11.0",
         urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v0.9.0.tar.gz",
+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v0.11.0.tar.gz",
         ],
     )
 

diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in
@@ -29,8 +29,11 @@
 #   opentelemetry-cpp::metrics                    - Imported target of opentelemetry-cpp::metrics
 #   opentelemetry-cpp::logs                       - Imported target of opentelemetry-cpp::logs
 #   opentelemetry-cpp::in_memory_span_exporter    - Imported target of opentelemetry-cpp::in_memory_span_exporter
+#   opentelemetry-cpp::otlp_recordable            - Imported target of opentelemetry-cpp::otlp_recordable
 #   opentelemetry-cpp::otlp_grpc_exporter         - Imported target of opentelemetry-cpp::otlp_grpc_exporter
+#   opentelemetry-cpp::otlp_http_client           - Imported target of opentelemetry-cpp::otlp_http_client
 #   opentelemetry-cpp::otlp_http_exporter         - Imported target of opentelemetry-cpp::otlp_http_exporter
+#   opentelemetry-cpp::otlp_http_log_exporter     - Imported target of opentelemetry-cpp::otlp_http_log_exporter
 #   opentelemetry-cpp::ostream_log_exporter       - Imported target of opentelemetry-cpp::ostream_log_exporter
 #   opentelemetry-cpp::ostream_metrics_exporter   - Imported target of opentelemetry-cpp::ostream_metrics_exporter
 #   opentelemetry-cpp::ostream_span_exporter      - Imported target of opentelemetry-cpp::ostream_span_exporter
@@ -78,8 +81,11 @@ set(_OPENTELEMETRY_CPP_LIBRARIES_TEST_TARGETS
     metrics
     logs
     in_memory_span_exporter
+    otlp_recordable
     otlp_grpc_exporter
+    otlp_http_client
     otlp_http_exporter
+    otlp_http_log_exporter
     ostream_log_exporter
     ostream_metrics_exporter
     ostream_span_exporter

diff --git a/exporters/otlp/BUILD b/exporters/otlp/BUILD
@@ -19,18 +19,24 @@ load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 cc_library(
     name = "otlp_recordable",
     srcs = [
+        "src/otlp_log_recordable.cc",
         "src/otlp_recordable.cc",
+        "src/otlp_recordable_utils.cc",
     ],
     hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_log_recordable.h",
         "include/opentelemetry/exporters/otlp/otlp_recordable.h",
+        "include/opentelemetry/exporters/otlp/otlp_recordable_utils.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
     ],
     strip_include_prefix = "include",
     deps = [
+        "//sdk/src/logs",
         "//sdk/src/resource",
         "//sdk/src/trace",
-        "@com_github_opentelemetry_proto//:trace_proto_cc",
+        "@com_github_opentelemetry_proto//:logs_service_proto_cc",
+        "@com_github_opentelemetry_proto//:trace_service_proto_cc",
     ],
 )
 
@@ -58,13 +64,13 @@ cc_library(
 )
 
 cc_library(
-    name = "otlp_http_exporter",
+    name = "otlp_http_client",
     srcs = [
-        "src/otlp_http_exporter.cc",
+        "src/otlp_http_client.cc",
     ],
     hdrs = [
         "include/opentelemetry/exporters/otlp/otlp_environment.h",
-        "include/opentelemetry/exporters/otlp/otlp_http_exporter.h",
+        "include/opentelemetry/exporters/otlp/otlp_http_client.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
     ],
@@ -80,11 +86,51 @@ cc_library(
     }),
     strip_include_prefix = "include",
     deps = [
-        ":otlp_recordable",
+        "//api",
         "//ext/src/http/client/curl:http_client_curl",
+        "//sdk:headers",
+        "@com_github_opentelemetry_proto//:common_proto_cc",
+        "@github_nlohmann_json//:json",
+    ],
+)
+
+cc_library(
+    name = "otlp_http_exporter",
+    srcs = [
+        "src/otlp_http_exporter.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_environment.h",
+        "include/opentelemetry/exporters/otlp/otlp_http_exporter.h",
+        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
+        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
+    ],
+    strip_include_prefix = "include",
+    deps = [
+        ":otlp_http_client",
+        ":otlp_recordable",
+        "//sdk/src/trace",
+        "@com_github_opentelemetry_proto//:trace_service_proto_cc",
+    ],
+)
+
+cc_library(
+    name = "otlp_http_log_exporter",
+    srcs = [
+        "src/otlp_http_log_exporter.cc",
+    ],
+    hdrs = [
+        "include/opentelemetry/exporters/otlp/otlp_environment.h",
+        "include/opentelemetry/exporters/otlp/otlp_http_log_exporter.h",
+        "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
+        "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
+    ],
+    strip_include_prefix = "include",
+    deps = [
+        ":otlp_http_client",
+        ":otlp_recordable",
         "//sdk/src/trace",
         "@com_github_opentelemetry_proto//:trace_service_proto_cc",
-        "@github_nlohmann_json//:json",
     ],
 )
 
@@ -117,6 +163,16 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "otlp_http_log_exporter_test",
+    srcs = ["test/otlp_http_log_exporter_test.cc"],
+    deps = [
+        ":otlp_http_log_exporter",
+        "//api",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 otel_cc_benchmark(
     name = "otlp_grpc_exporter_benchmark",
     srcs = ["test/otlp_grpc_exporter_benchmark.cc"],