Merge branch 'main' into migrate_semconv_weaver

Author: marcalff

.github/workflows/ci.yml

@@ -946,8 +946,8 @@ jobs:
           CXX_STANDARD: '14'
         run: |
           ./ci/do_ci.sh cmake.w3c.trace-context.build-server
-          cd $HOME/build/ext/test/w3c_tracecontext_test
-          ./w3c_tracecontext_test &
+          cd $HOME/build/ext/test/w3c_tracecontext_http_test_server
+          ./w3c_tracecontext_http_test_server &
       - name: Checkout w3c/trace-context repo
         uses: actions/checkout@v4
         with:

CHANGELOG.md

@@ -35,6 +35,11 @@ Important changes:
 * Upgrade to prometheus 1.3.0
   [#3122](https://github.com/open-telemetry/opentelemetry-cpp/pull/3122)
 
+* [EXPORTER] Change log resources location for ElasticsearchLogRecordExporter
+  [#3119](https://github.com/open-telemetry/opentelemetry-cpp/pull/3131)
+
+  * Moved from `root/resources` to `root`
+
 ## [1.17 2024-10-07]
 
 * [CI] Add a clang-tidy build

exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_recordable.h

@@ -28,16 +28,12 @@ class ElasticSearchRecordable final : public sdk::logs::Recordable
 {
 private:
   /**
-   * A helper method that writes a key/value pair under a specified name, the two names used here
-   * being "attributes" and "resources"
+   * A helper method that writes a value under a specified name.
+   * `name` will be at the root of the JSON object. If it has to be nested under some other keys,
+   * then write `name` as `key1.key2.[...].name`
    */
-  void WriteKeyValue(nostd::string_view key,
-                     const opentelemetry::common::AttributeValue &value,
-                     const std::string &name);
-
-  void WriteKeyValue(nostd::string_view key,
-                     const opentelemetry::sdk::common::OwnedAttributeValue &value,
-                     const std::string &name);
+  void WriteValue(const opentelemetry::sdk::common::OwnedAttributeValue &value,
+                  const std::string &name);
 
   void WriteValue(const opentelemetry::common::AttributeValue &value, const std::string &name);
 

exporters/elasticsearch/src/es_log_recordable.cc

@@ -14,70 +14,33 @@ namespace exporter
 {
 namespace logs
 {
-void ElasticSearchRecordable::WriteKeyValue(nostd::string_view key,
-                                            const opentelemetry::common::AttributeValue &value,
-                                            const std::string &name)
-{
-  switch (value.index())
-  {
-    case common::AttributeType::kTypeBool:
-      json_[name][key.data()] = opentelemetry::nostd::get<bool>(value) ? true : false;
-      return;
-    case common::AttributeType::kTypeInt:
-      json_[name][key.data()] = opentelemetry::nostd::get<int>(value);
-      return;
-    case common::AttributeType::kTypeInt64:
-      json_[name][key.data()] = opentelemetry::nostd::get<int64_t>(value);
-      return;
-    case common::AttributeType::kTypeUInt:
-      json_[name][key.data()] = opentelemetry::nostd::get<unsigned int>(value);
-      return;
-    case common::AttributeType::kTypeUInt64:
-      json_[name][key.data()] = opentelemetry::nostd::get<uint64_t>(value);
-      return;
-    case common::AttributeType::kTypeDouble:
-      json_[name][key.data()] = opentelemetry::nostd::get<double>(value);
-      return;
-    case common::AttributeType::kTypeCString:
-      json_[name][key.data()] = opentelemetry::nostd::get<const char *>(value);
-      return;
-    case common::AttributeType::kTypeString:
-      json_[name][key.data()] =
-          opentelemetry::nostd::get<opentelemetry::nostd::string_view>(value).data();
-      return;
-    default:
-      return;
-  }
-}
-
-void ElasticSearchRecordable::WriteKeyValue(
-    nostd::string_view key,
+void ElasticSearchRecordable::WriteValue(
     const opentelemetry::sdk::common::OwnedAttributeValue &value,
     const std::string &name)
 {
   namespace common = opentelemetry::sdk::common;
   switch (value.index())
   {
     case common::kTypeBool:
-      json_[name][key.data()] = opentelemetry::nostd::get<bool>(value) ? true : false;
+      json_[name] = opentelemetry::nostd::get<bool>(value) ? true : false;
       return;
     case common::kTypeInt:
-      json_[name][key.data()] = opentelemetry::nostd::get<int>(value);
+      json_[name] = opentelemetry::nostd::get<int>(value);
       return;
     case common::kTypeInt64:
-      json_[name][key.data()] = opentelemetry::nostd::get<int64_t>(value);
+      json_[name] = opentelemetry::nostd::get<int64_t>(value);
       return;
     case common::kTypeUInt:
-      json_[name][key.data()] = opentelemetry::nostd::get<unsigned int>(value);
+      json_[name] = opentelemetry::nostd::get<unsigned int>(value);
       return;
     case common::kTypeUInt64:
-      json_[name][key.data()] = opentelemetry::nostd::get<uint64_t>(value);
+      json_[name] = opentelemetry::nostd::get<uint64_t>(value);
       return;
     case common::kTypeDouble:
-      json_[name][key.data()] = opentelemetry::nostd::get<double>(value);
+      json_[name] = opentelemetry::nostd::get<double>(value);
       return;
     case common::kTypeString:
-      json_[name][key.data()] = opentelemetry::nostd::get<std::string>(value).data();
+      json_[name] = opentelemetry::nostd::get<std::string>(value).data();
       return;
     default:
       return;
@@ -321,7 +284,7 @@ void ElasticSearchRecordable::SetResource(
 {
   for (auto &attribute : resource.GetAttributes())
   {
-    WriteKeyValue(attribute.first, attribute.second, "resource");
+    WriteValue(attribute.second, attribute.first);
   }
 }
 

ext/test/CMakeLists.txt

@@ -3,5 +3,5 @@
 
 add_subdirectory(http)
 if(BUILD_W3CTRACECONTEXT_TEST)
-  add_subdirectory(w3c_tracecontext_test)
+  add_subdirectory(w3c_tracecontext_http_test_server)
 endif()

ext/test/w3c_tracecontext_test/BUILD …/w3c_tracecontext_http_test_server/BUILDext/test/w3c_tracecontext_test/BUILD renamed to ext/test/w3c_tracecontext_http_test_server/BUILD ext/test/w3c_tracecontext_test/BUILD renamed to ext/test/w3c_tracecontext_http_test_server/BUILD

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 cc_binary(
-    name = "w3c_tracecontext_test",
+    name = "w3c_tracecontext_http_test_server",
     srcs = [
         "main.cc",
     ],

…est/w3c_tracecontext_test/CMakeLists.txt …econtext_http_test_server/CMakeLists.txtext/test/w3c_tracecontext_test/CMakeLists.txt renamed to ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt ext/test/w3c_tracecontext_test/CMakeLists.txt renamed to ext/test/w3c_tracecontext_http_test_server/CMakeLists.txt

@@ -3,12 +3,13 @@
 
 include_directories(${CMAKE_SOURCE_DIR}/exporters/ostream/include)
 
-add_executable(w3c_tracecontext_test main.cc)
+add_executable(w3c_tracecontext_http_test_server main.cc)
 target_link_libraries(
-  w3c_tracecontext_test
+  w3c_tracecontext_http_test_server
   PRIVATE ${CMAKE_THREAD_LIBS_INIT} opentelemetry_trace
           opentelemetry_http_client_curl opentelemetry_exporter_ostream_span
           ${CURL_LIBRARIES} nlohmann_json::nlohmann_json)
 if(nlohmann_json_clone)
-  add_dependencies(w3c_tracecontext_test nlohmann_json::nlohmann_json)
+  add_dependencies(w3c_tracecontext_http_test_server
+                   nlohmann_json::nlohmann_json)
 endif()

ext/test/w3c_tracecontext_test/Dockerfile …tracecontext_http_test_server/Dockerfileext/test/w3c_tracecontext_test/Dockerfile renamed to ext/test/w3c_tracecontext_http_test_server/Dockerfile ext/test/w3c_tracecontext_test/Dockerfile renamed to ext/test/w3c_tracecontext_http_test_server/Dockerfile

@@ -11,15 +11,15 @@ instructions](https://github.com/w3c/trace-context/tree/master/test#implement-te
 1: Build and start the test service endpoint:
 
 ```sh
-./w3c_tracecontext_test
+./w3c_tracecontext_http_test_server
 
 Listening to http://localhost:30000/test
 ```
 
 A custom port number for the test service to listen to can be specified:
 
 ```sh
-./w3c_tracecontext_test 31339
+./w3c_tracecontext_http_test_server 31339
 
 Listening to http://localhost:31339/test
 ```

ext/test/w3c_tracecontext_test/README.md …_tracecontext_http_test_server/README.mdext/test/w3c_tracecontext_test/README.md renamed to ext/test/w3c_tracecontext_http_test_server/README.md ext/test/w3c_tracecontext_test/README.md renamed to ext/test/w3c_tracecontext_http_test_server/README.md

@@ -98,7 +98,7 @@ void initTracer()
 nostd::shared_ptr<trace_api::Tracer> get_tracer()
 {
   auto provider = trace_api::Provider::GetTracerProvider();
-  return provider->GetTracer("w3c_tracecontext_test");
+  return provider->GetTracer("w3c_tracecontext_http_test_server");
 }
 
 struct Uri