Merge #1185 and add OnEvent for nosend::HttpClient

Signed-off-by: owent <[email protected]>
open-telemetry · Feb 19, 2022 · db327de · db327de
1 parent 99f7bdb
commit db327de
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/exporters/otlp/test/otlp_http_exporter_test.cc b/exporters/otlp/test/otlp_http_exporter_test.cc
@@ -232,9 +232,10 @@ TEST_F(OtlpHttpExporterTestPeer, ExportBinaryIntegrationTest)
  {
  EXPECT_EQ("Custom-Header-Value", custom_header->second);
  }
+
  // let the otlp_http_client to continue
  http_client::nosend::Response response;
- callback.OnResponse(response);
+ response.Finish(callback);
  });
 
  child_span->End();

diff --git a/exporters/otlp/test/otlp_http_log_exporter_test.cc b/exporters/otlp/test/otlp_http_log_exporter_test.cc
@@ -167,9 +167,10 @@ TEST_F(OtlpHttpLogExporterTestPeer, ExportJsonIntegrationTest)
  {
  EXPECT_EQ("Custom-Header-Value", custom_header->second);
  }
+
  // let the otlp_http_client to continue
  http_client::nosend::Response response;
- callback.OnResponse(response);
+ response.Finish(callback);
  });
 }
 

diff --git a/ext/include/opentelemetry/ext/http/client/nosend/http_client_nosend.h b/ext/include/opentelemetry/ext/http/client/nosend/http_client_nosend.h
@@ -93,6 +93,19 @@ class Response : public opentelemetry::ext::http::client::Response
  return status_code_;
  }
 
+ void Finish(opentelemetry::ext::http::client::EventHandler &callback) noexcept
+ {
+ callback.OnEvent(opentelemetry::ext::http::client::SessionState::Created, "");
+ callback.OnEvent(opentelemetry::ext::http::client::SessionState::Connecting, "");
+ callback.OnEvent(opentelemetry::ext::http::client::SessionState::Connected, "");
+ callback.OnEvent(opentelemetry::ext::http::client::SessionState::Sending, "");
+
+ // let the otlp_http_client to continue
+ callback.OnResponse(*this);
+
+ callback.OnEvent(opentelemetry::ext::http::client::SessionState::Response, "");
+ }
+
 public:
  Headers headers_;
  opentelemetry::ext::http::client::Body body_;