Merge branch 'main' into fix-3302

marcalff · web-flow · commit 389490435a98 · 2025-03-24T12:10:57.000+01:00
diff --git a/exporters/elasticsearch/src/es_log_recordable.cc b/exporters/elasticsearch/src/es_log_recordable.cc
@@ -88,12 +88,6 @@ void ElasticSearchRecordable::SetTimestamp(
 {
   const std::chrono::system_clock::time_point timePoint{timestamp};
 
-  // If built with with at least cpp 20 then use std::format
-  // Otherwise use the old style to format the timestamp in UTC
-  // @see https://en.cppreference.com/w/cpp/feature_test#cpp_lib_format
-#if defined(__cpp_lib_format) && __cpp_lib_format >= 201907
-  const std::string dateStr = std::format("{:%FT%T%Ez}", timePoint);
-#else
   std::time_t time = std::chrono::system_clock::to_time_t(timePoint);
   std::tm tm       = *std::gmtime(&time);
   auto microseconds =
@@ -108,7 +102,6 @@ void ElasticSearchRecordable::SetTimestamp(
                 static_cast<long>(microseconds.count()));
 
   const std::string dateStr(bufferDate);
-#endif
 
   json_["@timestamp"] = dateStr;
 }
diff --git a/exporters/otlp/test/otlp_grpc_exporter_test.cc b/exporters/otlp/test/otlp_grpc_exporter_test.cc
@@ -37,6 +37,7 @@
 
 #  include <grpcpp/grpcpp.h>
 #  include <gtest/gtest.h>
+#  include <future>
 
 #  if defined(_MSC_VER)
 #    include "opentelemetry/sdk/common/env_variables.h"
@@ -510,15 +511,21 @@ TEST_P(OtlpGrpcExporterRetryIntegrationTests, StatusCodes)
   TestTraceService service(status_codes);
   std::unique_ptr<grpc::Server> server;
 
-  std::thread server_thread([&server, &service]() {
+  std::promise<void> server_ready;
+  auto server_ready_future = server_ready.get_future();
+
+  std::thread server_thread([&server, &service, &server_ready]() {
     std::string address("localhost:4317");
     grpc::ServerBuilder builder;
     builder.RegisterService(&service);
     builder.AddListeningPort(address, grpc::InsecureServerCredentials());
     server = builder.BuildAndStart();
+    server_ready.set_value();
     server->Wait();
   });
 
+  server_ready_future.wait();
+
   otlp::OtlpGrpcExporterOptions opts{};
 
   if (is_retry_enabled)
