Merge branch 'open-telemetry:main' into feature/statsd_exporter

Author: zurex

exporters/fluentd/include/opentelemetry/exporters/fluentd/common/socket_tools.h

@@ -585,8 +585,14 @@ struct Socket {
     assert(m_sock != Invalid);
     if ((m_sock == Invalid) || (buffer == nullptr) || (size == 0))
       return 0;
+    int flags =
+#ifdef _WIN32
+        0;
+#else
+        MSG_NOSIGNAL;
+#endif
     return static_cast<int>(
-        ::send(m_sock, reinterpret_cast<char const *>(buffer), size, 0));
+        ::send(m_sock, reinterpret_cast<char const *>(buffer), size, flags));
   }
 
   int sendto(void const *buffer, size_t size, int flags, SocketAddr &destAddr) {

exporters/geneva/include/opentelemetry/exporters/geneva/metrics/socket_tools.h

@@ -570,8 +570,14 @@ struct Socket {
     assert(m_sock != Invalid);
     if ((m_sock == Invalid) || (buffer == nullptr) || (size == 0))
       return 0;
+    int flags =
+#ifdef _WIN32
+        0;
+#else
+        MSG_NOSIGNAL;
+#endif
     return static_cast<int>(
-        ::send(m_sock, reinterpret_cast<char const *>(buffer), size, 0));
+        ::send(m_sock, reinterpret_cast<char const *>(buffer), size, flags));
   }
 
   int sendto(void const *buffer, size_t size, int flags, SocketAddr &destAddr) {

exporters/geneva/src/exporter.cc

@@ -42,7 +42,6 @@ Exporter::Exporter(const ExporterOptions &options)
   auto status = data_transport_->Connect();
   if (!status) {
     LOG_ERROR("[Geneva Exporter] Connect failed. No data would be sent.");
-    is_shutdown_ = true;
     return;
   }
 }

exporters/geneva/src/socket_data_transport.cc

@@ -58,7 +58,7 @@ bool SocketDataTransport::Send(MetricsEventType event_type,
           "Geneva Exporter: UDS::Send Socket reconnect failed. Send failed");
     }
   }
-  if (error_code != 0) {
+  if (!connected_ || error_code != 0 ) {
     LOG_ERROR("Geneva Exporter: UDS::Send failed - not connected");
     connected_ = false;
     return false;
@@ -77,7 +77,7 @@ bool SocketDataTransport::Send(MetricsEventType event_type,
 bool SocketDataTransport::Disconnect() noexcept {
   if (connected_) {
     connected_ = false;
-    if (socket_.invalid()) {
+    if (!socket_.invalid()) {
       socket_.close();
       return true;
     }