Merge pull request #47 from open-telemetry/main

merged from upstream

CMakeLists.txt

@@ -211,6 +211,9 @@ if(DEFINED WITH_OTLP)
   )
 endif()
 
+option(WITH_OTLP_GRPC_SSL_MTLS_PREVIEW
+       "Whether to enable mTLS support fro gRPC" OFF)
+
 option(WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK"
        OFF)
 

exporters/elasticsearch/src/es_log_record_exporter.cc

@@ -59,7 +59,7 @@ class ResponseHandler : public http_client::EventHandler
       // Store the body of the request
       body_ = std::string(response.GetBody().begin(), response.GetBody().end());
 
-      if (response.GetStatusCode() != 200 && response.GetStatusCode() != 202)
+      if (!(response.GetStatusCode() >= 200 && response.GetStatusCode() <= 299))
       {
         log_message = BuildResponseLogMessage(response, body_);
 

exporters/otlp/src/otlp_http_client.cc

@@ -100,7 +100,7 @@ class ResponseHandler : public http_client::EventHandler
       // Store the body of the request
       body_ = std::string(response.GetBody().begin(), response.GetBody().end());
 
-      if (response.GetStatusCode() != 200 && response.GetStatusCode() != 202)
+      if (!(response.GetStatusCode() >= 200 && response.GetStatusCode() <= 299))
       {
         log_message = BuildResponseLogMessage(response, body_);
 

exporters/zipkin/src/zipkin_exporter.cc

@@ -78,7 +78,7 @@ sdk::common::ExportResult ZipkinExporter::Export(
   http_client::Body body_v(body_s.begin(), body_s.end());
   auto result = http_client_->PostNoSsl(url_parser_.url_, body_v, options_.headers);
   if (result &&
-      (result.GetResponse().GetStatusCode() == 200 || result.GetResponse().GetStatusCode() == 202))
+      (result.GetResponse().GetStatusCode() >= 200 && result.GetResponse().GetStatusCode() <= 299))
   {
     return sdk::common::ExportResult::kSuccess;
   }