upate envoy (#17)

* upate envoy * compilefix * compilefix * compilefix * compile fix * compilefix
solo-io · Jul 15, 2019 · 972a60d · 972a60d
1 parent da0277a
commit 972a60d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1,6 +1,6 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        commit = "49b5a915324e44b9445e3fc5434e0deffaf3f94f",
+        commit = "9e3871ade779664ffb0a8f09b11688878253a082",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(

diff --git a/source/common/tcp/conn_pool_impl.h b/source/common/tcp/conn_pool_impl.h
@@ -114,7 +114,7 @@ class ClientImpl : public Client<T>,
     try {
       decoder_->decode(data);
     } catch (ProtocolError &) {
-      putOutlierEvent(Upstream::Outlier::Result::REQUEST_FAILED);
+      putOutlierEvent(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_FAILED);
       host_->cluster().stats().upstream_cx_protocol_error_.inc();
       connection_->close(Network::ConnectionCloseType::NoFlush);
     }
@@ -136,7 +136,7 @@ class ClientImpl : public Client<T>,
     //   host_->cluster().stats().upstream_rq_cancelled_.inc();
     // }
 
-    putOutlierEvent(Upstream::Outlier::Result::SUCCESS);
+    putOutlierEvent(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_SUCCESS);
   }
 
   // Network::ConnectionCallbacks
@@ -147,7 +147,7 @@ class ClientImpl : public Client<T>,
       // if (!pending_requests_.empty()) {
       //   host_->cluster().stats().upstream_cx_destroy_with_active_rq_.inc();
       if (event == Network::ConnectionEvent::RemoteClose) {
-        putOutlierEvent(Upstream::Outlier::Result::SERVER_FAILURE);
+        putOutlierEvent(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_FAILED);
         // host_->cluster()
         //     .stats()
         //     .upstream_cx_destroy_remote_with_active_rq_.inc();

diff --git a/test/common/tcp/conn_pool_impl_test.cc b/test/common/tcp/conn_pool_impl_test.cc
@@ -135,13 +135,13 @@ TEST_F(TcpClientImplTest, Basic) {
         TPtr response1(new T());
         EXPECT_CALL(pool_callbacks_, onResponse_(Ref(response1)));
         EXPECT_CALL(host_->outlier_detector_,
-                    putResult(Upstream::Outlier::Result::SUCCESS));
+                    putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_SUCCESS, _));
         callbacks_->onValue(std::move(response1));
 
         TPtr response2(new T());
         EXPECT_CALL(pool_callbacks_, onResponse_(Ref(response2)));
         EXPECT_CALL(host_->outlier_detector_,
-                    putResult(Upstream::Outlier::Result::SUCCESS));
+                    putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_SUCCESS, _));
         callbacks_->onValue(std::move(response2));
       }));
   upstream_read_filter_->onData(fake_data, false);
@@ -177,13 +177,13 @@ TEST_F(TcpClientImplTest, Cancel) {
         TPtr response1(new T());
         EXPECT_CALL(pool_callbacks_, onResponse_(_)).Times(0);
         EXPECT_CALL(host_->outlier_detector_,
-                    putResult(Upstream::Outlier::Result::SUCCESS));
+                    putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_SUCCESS, _));
         callbacks_->onValue(std::move(response1));
 
         TPtr response2(new T());
         EXPECT_CALL(pool_callbacks_, onResponse_(_)).Times(0);
         EXPECT_CALL(host_->outlier_detector_,
-                    putResult(Upstream::Outlier::Result::SUCCESS));
+                    putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_SUCCESS, _));
         callbacks_->onValue(std::move(response2));
       }));
   upstream_read_filter_->onData(fake_data, false);
@@ -211,7 +211,7 @@ TEST_F(TcpClientImplTest, FailAll) {
   onConnected();
 
   EXPECT_CALL(host_->outlier_detector_,
-              putResult(Upstream::Outlier::Result::SERVER_FAILURE));
+              putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_FAILED, _));
   EXPECT_CALL(pool_callbacks_, onClose());
   EXPECT_CALL(connection_callbacks,
               onEvent(Network::ConnectionEvent::RemoteClose));
@@ -270,7 +270,7 @@ TEST_F(TcpClientImplTest, ProtocolError) {
       .WillOnce(Invoke(
           [&](Buffer::Instance &) -> void { throw ProtocolError("error"); }));
   EXPECT_CALL(host_->outlier_detector_,
-              putResult(Upstream::Outlier::Result::REQUEST_FAILED));
+              putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_FAILED, _));
   EXPECT_CALL(*upstream_connection_,
               close(Network::ConnectionCloseType::NoFlush));
 
@@ -291,7 +291,7 @@ TEST_F(TcpClientImplTest, ConnectFail) {
   client_->makeRequest(request1);
 
   EXPECT_CALL(host_->outlier_detector_,
-              putResult(Upstream::Outlier::Result::SERVER_FAILURE));
+              putResult(Upstream::Outlier::Result::EXT_ORIGIN_REQUEST_FAILED, _));
 
   EXPECT_CALL(pool_callbacks_, onClose());
 
@@ -314,7 +314,7 @@ TEST_F(TcpClientImplTest, OutlierDisabled) {
   EXPECT_CALL(*encoder_, encode(Ref(request1), _));
   client_->makeRequest(request1);
 
-  EXPECT_CALL(host_->outlier_detector_, putResult(_)).Times(0);
+  EXPECT_CALL(host_->outlier_detector_, putResult(_, _)).Times(0);
 
   EXPECT_CALL(pool_callbacks_, onClose());
 

diff --git a/test/integration/aws_lambda_filter_integration_test.cc b/test/integration/aws_lambda_filter_integration_test.cc
@@ -77,7 +77,7 @@ class AWSLambdaFilterIntegrationTest
   void SetUp() override { initialize(); }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     IpVersions, AWSLambdaFilterIntegrationTest,
     testing::ValuesIn(TestEnvironment::getIpVersionsForTest()));
 

diff --git a/test/integration/transformation_filter_integration_test.cc b/test/integration/transformation_filter_integration_test.cc
@@ -148,7 +148,7 @@ class TransformationFilterIntegrationTest
   std::string transformation_string_{DEFAULT_TRANSFORMATION};
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     IpVersions, TransformationFilterIntegrationTest,
     testing::ValuesIn(TestEnvironment::getIpVersionsForTest()));