Merge branch 'main' into update_user_events_deps

open-telemetry · Jan 13, 2025 · d4ee4ac · d4ee4ac
2 parents 075d946 + a4d3681
commit d4ee4ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         image: ["ubuntu:24.04", "debian:11", "alpine:3.20", "amazonlinux:2", "amazonlinux:2023"]
-        nginx: ["1.27.3", "1.27.1", "1.26.2", "1.24.0", "1.22.1"]
+        nginx: ["1.27.3", "1.27.2", "1.27.1", "1.26.2", "1.24.0", "1.22.1"]
     steps:
       - name: checkout otel nginx
         uses: actions/checkout@v4

diff --git a/exporters/geneva/src/exporter.cc b/exporters/geneva/src/exporter.cc
@@ -3,9 +3,10 @@
 
 #include "opentelemetry/exporters/geneva/metrics/exporter.h"
 #include "opentelemetry/exporters/geneva/metrics/macros.h"
-#include "opentelemetry/exporters/geneva/metrics/unix_domain_socket_data_transport.h"
 #ifdef _WIN32
 #include "opentelemetry/exporters/geneva/metrics/etw_data_transport.h"
+#else
+#include "opentelemetry/exporters/geneva/metrics/unix_domain_socket_data_transport.h"
 #endif
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk_config.h"

diff --git a/exporters/user_events/include/opentelemetry/exporters/user_events/logs/exporter.h b/exporters/user_events/include/opentelemetry/exporters/user_events/logs/exporter.h
@@ -42,6 +42,12 @@ class Exporter final : public opentelemetry::sdk::logs::LogRecordExporter
   bool Shutdown(
       std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override;
 
+  bool ForceFlush(
+      std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override {
+        // TODO: implement forceflush
+        return true;
+      }
+
   bool isShutdown() const noexcept;
 
 private:

diff --git a/exporters/user_events/src/recordable.cc b/exporters/user_events/src/recordable.cc
@@ -48,6 +48,7 @@ void Recordable::SetBody(const opentelemetry::common::AttributeValue &message) n
   // Set intial bookmark size to 1 for body below.
   cs_part_b_bookmark_size_++;
   event_builder_.AddStruct("PartB", 1, 0, &cs_part_b_bookmark_);
+  utils::PopulateAttribute("_typeName", "Log", event_builder_);
   utils::PopulateAttribute("body", message, event_builder_);
 }
 

diff --git a/instrumentation/nginx/test/Dockerfile_amazonlinux b/instrumentation/nginx/test/Dockerfile_amazonlinux
@@ -4,8 +4,7 @@ FROM $image AS build
 ARG otel_cpp_version=1.17.0
 ARG nginx_version=1.27.3
 
-RUN yum check-update && \
-  yum install -y git gcc-c++ make tar curl-devel unzip zlib-devel pcre2-devel
+RUN yum install -y git gcc-c++ make tar curl-devel unzip zlib-devel pcre2-devel
 
 RUN curl -LO https://github.com/Kitware/CMake/releases/download/v3.31.1/cmake-3.31.1-linux-x86_64.tar.gz && tar xf cmake-3.31.1-linux-x86_64.tar.gz && mv cmake-3.31.1-linux-x86_64 cmake