Merge branch 'main' into envoy-71248e512

* main:
  timing test (envoyproxy#2035)
  [CI] Update Xcode to 13.2.1 (envoyproxy#1997)
  owners: adding charles (envoyproxy#2038)
  [OWNERS] Update Envoy Mobile owners (envoyproxy#2031)
  [deps] Update rules_android to a stable release URL (envoyproxy#2032)

Signed-off-by: JP Simard <jp@jpsim.com>

.bazelrc

@@ -11,11 +11,11 @@ build --features=swift.debug_prefix_map
 build --host_force_python=PY3
 build --ios_minimum_os=11.0
 build --ios_simulator_device="iPhone 13"
-build --ios_simulator_version=15.0
+build --ios_simulator_version=15.2
 build --spawn_strategy=local
 build --verbose_failures
 build --workspace_status_command=envoy/bazel/get_workspace_status
-build --xcode_version=13.0
+build --xcode_version=13.2.1
 build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
 build --javabase=@bazel_tools//tools/jdk:remote_jdk11
 build --tool_java_runtime_version=remotejdk_11

OWNERS.md

@@ -11,10 +11,12 @@ routing PRs, questions, etc. to the right place.
   * Envoy mobile core, C bridge layer, C++ extensions, build system, Envoy upstream.
 * Snow Pettersen ([snowp](https://github.com/snowp)) (aickck@gmail.com)
   * Envoy Upstream. Stats.
-* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)
-  * iOS (swift/objective-c) platform bindings.
 * Mike Schore ([goaway](https://github.com/goaway)) (mschore@lyft.com)
   * General.
+* JP Simard ([jpsim](https://github.com/jpsim)) (jp@lyft.com)
+  * iOS (swift/objective-c) platform bindings.
+* Charles Le Borgne ([carloseltuerto](http://github.com/carloseltuerto)) (cleborgne@google.com)
+  * Cronvoy.
 
 # Friends of Envoy Mobile
 
@@ -31,3 +33,7 @@ matter expert reviews. Feel free to loop them in as needed.
   * Cronet API shim aka "Cronvoy".
 * Keith Smiley ([keith](https://github.com/keith)) (keithbsmiley@gmail.com)
   * Bazel build magician
+
+# Emeritus maintainers
+
+* Michael Rebello ([rebello95](https://github.com/rebello95)) (mrebello@lyft.com)

ci/BUILD

@@ -1,27 +1,27 @@
 licenses(["notice"])  # Apache 2
 
 xcode_version(
-    name = "xcode_13_0",
-    default_ios_sdk_version = "15.0",
-    default_macos_sdk_version = "11.3",
-    default_tvos_sdk_version = "15.0",
-    default_watchos_sdk_version = "7.4",
-    version = "13.0",
+    name = "xcode_13_2_1",
+    default_ios_sdk_version = "15.2",
+    default_macos_sdk_version = "12.1",
+    default_tvos_sdk_version = "15.2",
+    default_watchos_sdk_version = "8.3",
+    version = "13.2.1",
 )
 
 available_xcodes(
     name = "local_xcodes",
-    default = ":xcode_13_0",
+    default = ":xcode_13_2_1",
     versions = [
-        ":xcode_13_0",
+        ":xcode_13_2_1",
     ],
 )
 
 available_xcodes(
     name = "remote_xcodes",
-    default = ":xcode_13_0",
+    default = ":xcode_13_2_1",
     versions = [
-        ":xcode_13_0",
+        ":xcode_13_2_1",
     ],
 )
 

ci/mac_ci_setup.sh

@@ -45,7 +45,7 @@ fi
 
 pip3 install slackclient
 # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
-sudo xcode-select --switch /Applications/Xcode_13.0.app
+sudo xcode-select --switch /Applications/Xcode_13.2.1.app
 
 # Download and set up ndk 21. Github upgraded to ndk 22 for their Mac image.
 ANDROID_HOME=$ANDROID_SDK_ROOT

docs/root/start/building/building.rst

@@ -56,7 +56,8 @@ See `ci/mac_ci_setup.sh` for the specific NDK version used during builds.
 iOS requirements
 ----------------
 
-- Xcode 13.0
+- Xcode 13.2.1
+- iOS 11.0 or later
 - Note: Requirements are listed in the :repo:`.bazelrc file <.bazelrc>` and CI scripts
 
 .. _android_aar:

library/common/stream_info/extra_stream_info.cc

@@ -34,7 +34,9 @@ void setFinalStreamIntel(StreamInfo& stream_info, envoy_final_stream_intel& fina
     setFromOptional(final_intel.response_start_ms, timing.first_upstream_rx_byte_received_);
     setFromOptional(final_intel.connect_start_ms, timing.upstream_connect_start_);
     setFromOptional(final_intel.connect_end_ms, timing.upstream_connect_complete_);
-    setFromOptional(final_intel.ssl_start_ms, timing.upstream_connect_complete_);
+    if (timing.upstream_handshake_complete_.has_value()) {
+      setFromOptional(final_intel.ssl_start_ms, timing.upstream_connect_complete_);
+    }
     setFromOptional(final_intel.ssl_end_ms, timing.upstream_handshake_complete_);
     final_intel.socket_reused = upstream_info->upstreamNumStreams() > 1;
   }

test/common/integration/client_integration_test.cc

@@ -42,6 +42,30 @@ typedef struct {
   ConditionalInitializer* terminal_callback;
 } callbacks_called;
 
+void validateStreamIntel(const envoy_final_stream_intel& final_intel) {
+  // This test doesn't do DNS lookup
+  EXPECT_EQ(-1, final_intel.dns_start_ms);
+  EXPECT_EQ(-1, final_intel.dns_end_ms);
+  // This test doesn't do TLS.
+  EXPECT_EQ(-1, final_intel.ssl_start_ms);
+  EXPECT_EQ(-1, final_intel.ssl_end_ms);
+
+  ASSERT_NE(-1, final_intel.request_start_ms);
+  ASSERT_NE(-1, final_intel.connect_start_ms);
+  ASSERT_NE(-1, final_intel.connect_end_ms);
+  ASSERT_NE(-1, final_intel.sending_start_ms);
+  ASSERT_NE(-1, final_intel.sending_end_ms);
+  ASSERT_NE(-1, final_intel.response_start_ms);
+  ASSERT_NE(-1, final_intel.request_end_ms);
+
+  ASSERT_LE(final_intel.request_start_ms, final_intel.connect_start_ms);
+  ASSERT_LE(final_intel.connect_start_ms, final_intel.connect_end_ms);
+  ASSERT_LE(final_intel.connect_end_ms, final_intel.sending_start_ms);
+  ASSERT_LE(final_intel.sending_start_ms, final_intel.sending_end_ms);
+  ASSERT_LE(final_intel.request_end_ms, final_intel.response_start_ms);
+  ASSERT_LE(final_intel.request_end_ms, final_intel.sending_end_ms);
+}
+
 // TODO(junr03): move this to derive from the ApiListenerIntegrationTest after moving that class
 // into a test lib.
 class ClientIntegrationTest : public BaseIntegrationTest,
@@ -82,6 +106,7 @@ class ClientIntegrationTest : public BaseIntegrationTest,
     };
     bridge_callbacks_.on_complete = [](envoy_stream_intel, envoy_final_stream_intel final_intel,
                                        void* context) -> void* {
+      validateStreamIntel(final_intel);
       callbacks_called* cc_ = static_cast<callbacks_called*>(context);
       cc_->on_complete_received_byte_count = final_intel.received_byte_count;
       cc_->on_complete_calls++;