Merge branch 'main' into jp-xcode-13.4

* main: tools: fix source mapping (#2429) Update Envoy (#2427) tools: add arm64 debug run configuration (#2424) Revert "docs: use sphinx githubpages extension (#2418)" (#2425) Remove Tulsi configuration & docs (#2421) Fix isCleartextTrafficPermitted (#2420) Squelch two JNI build warnings (#2426) dns: allow using the `getaddrinfo`-based system DNS resolver (#2419) docs: use sphinx githubpages extension (#2418) Update Envoy (#2417) Remove rules_cc uses Bump Lyft Support Rotation (#2414) iOS: fix retain cycles in `EnvoyNetworkMonitor` (#2415) Update Envoy (#2413) engine: remove outdated comment about `registerFactories()` (#2412) api: make RequestTrailersBuilder and ResponseHeadersBuilder constructors public (#2410) Signed-off-by: JP Simard <jp@jpsim.com>
envoyproxy · Jul 18, 2022 · 4f1bdef · 4f1bdef
2 parents c3f4fa4 + 6eb67e6
commit 4f1bdef
Show file tree

Hide file tree

Showing 37 changed files with 187 additions and 248 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -40,6 +40,7 @@ build --java_language_version=8
 # Override PGV validation with NOP functions
 build --@com_envoyproxy_protoc_gen_validate//bazel:template-flavor=nop
 
+build:dbg --compilation_mode=dbg
 # Enable source map for debugging in IDEs
 build:dbg --copt="-fdebug-compilation-dir" --copt="/proc/self/cwd"
 

diff --git a/.github/lyft_maintainers.yml b/.github/lyft_maintainers.yml
@@ -1,4 +1,4 @@
-current: Augustyniak
+current: snowp
 maintainers:
   - Augustyniak
   - snowp

diff --git a/bazel/android_artifacts.bzl b/bazel/android_artifacts.bzl
@@ -1,7 +1,6 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
 load("@envoy_mobile//bazel:dokka.bzl", "sources_javadocs")
 load("@rules_java//java:defs.bzl", "java_binary")
-load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@google_bazel_common//tools/maven:pom_file.bzl", "pom_file")
 
 # This file is based on https://github.com/aj-michael/aar_with_jni which is
@@ -203,7 +202,7 @@ def _create_jni_library(name, native_deps = []):
     # We wrap our native so dependencies in a cc_library because android_binaries
     # require a library target as dependencies in order to generate the appropriate
     # architectures in the directory `lib/`
-    cc_library(
+    native.cc_library(
         name = cc_lib_name,
         srcs = native_deps,
     )

diff --git a/bazel/apple_test.bzl b/bazel/apple_test.bzl
@@ -1,6 +1,5 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
-load("@rules_cc//cc:defs.bzl", "objc_library")
 load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
 
 # Macro providing a way to easily/consistently define Swift unit test targets.
@@ -44,7 +43,7 @@ def envoy_mobile_swift_test(name, srcs, data = [], deps = [], tags = [], reposit
 
 def envoy_mobile_objc_test(name, srcs, data = [], deps = [], tags = [], visibility = []):
     test_lib_name = name + "_lib"
-    objc_library(
+    native.objc_library(
         name = test_lib_name,
         srcs = srcs,
         data = data,

diff --git a/docs/root/development/debugging/android_local.rst b/docs/root/development/debugging/android_local.rst
@@ -17,7 +17,7 @@ Setting up the environment
 Before we start, you'll need to download Android Studio and the `Bazel plugin <https://plugins.jetbrains.com/plugin/9185-bazel>`_, you can find it in Preferences -> Plugins
 .
 
-1. Go `here <https://developer.android.com/studio/>`_ and install Android Studio.
+1. Go `here <https://developer.android.com/studio/>`_ and install Android Studio
 2. Install the bazel plugin
 
 Adding Envoy-Mobile Project into Android Studio
@@ -51,16 +51,8 @@ Entering a debugging session
 
 With the project ready, you can now start debugging with Android Studio.
 
-1. Compile your envoy-mobile with debug symbols to the architecture of the device or emulator you are about to run.
-
-For example:
-::
-
-    $ ./bazelw build android_dist --config=android --fat_apk_cpu=x86 -c dbg
-
-Android supported archs are `arm64_v8a`, `armeabi-v7a`, `x86`, `x86_64`.
-
-2. From Android Studio select the `Example App x86 (Debug)` configuration and hit the debug icon. Note: if you don't see this option go to "Add configuration" and it'll be there on the Bazel category, just select it and hit Ok.
+1. From Android Studio select either `Example App (Debug) [x86]` or `Example App (Debug) [arm64]` configuration. Note: the `x86` configuration doesn't work on ARM machines (i.e., M1 Macbooks).
+2. Hit the debug icon. Note: if you don't see this option go to "Add configuration" and it'll be there on the Bazel category, just select it and hit Ok.
 3. Optionally you could create symbolic breakpoints before running by going to the Debugger tab.
 
 Your environment should look like this at this point:

diff --git a/docs/root/development/tools/tools.rst b/docs/root/development/tools/tools.rst
@@ -6,7 +6,6 @@ Development Tools
 .. toctree::
   :maxdepth: 2
 
-  tulsi
   intellij
 
 This documentation outlines additional tools that may prove useful when

diff --git a/docs/root/development/tools/tulsi.rst b/docs/root/development/tools/tulsi.rst
diff --git a/docs/root/intro/version_history.rst b/docs/root/intro/version_history.rst
@@ -44,6 +44,7 @@ Features:
 - android: create simple persistent SharedPreferencesStore (:issue: `#2319 <2319>`)
 - iOS: A documentation archive is now included in the GitHub release artifact (:issue: `#2335 <2335>`)
 - api: improved C++ APIs compatibility with Java / Kotlin / Swift (:issue `#2362 <2362>`)
+- api: add option to use the a ``getaddrinfo``-based system DNS resolver instead of c-ares (:issue: `#2419 <2419>`)
 
 0.4.6 (April 26, 2022)
 ========================

diff --git a/envoy b/envoy
diff --git a/envoy-mobile.tulsiproj/Configs/all.tulsigen b/envoy-mobile.tulsiproj/Configs/all.tulsigen
diff --git a/envoy-mobile.tulsiproj/project.tulsiconf b/envoy-mobile.tulsiproj/project.tulsiconf
diff --git a/envoy_build_config/extensions_build_config.bzl b/envoy_build_config/extensions_build_config.bzl
@@ -18,6 +18,7 @@ EXTENSIONS = {
     "envoy.http.original_ip_detection.xff":                "//source/extensions/http/original_ip_detection/xff:config",
     "envoy.key_value.platform":                            "@envoy_mobile//library/common/extensions/key_value/platform:config",
     "envoy.network.dns_resolver.apple":                    "//source/extensions/network/dns_resolver/apple:config",
+    "envoy.network.dns_resolver.getaddrinfo":              "//source/extensions/network/dns_resolver/getaddrinfo:config",
     "envoy.retry.options.network_configuration":           "@envoy_mobile//library/common/extensions/retry/options/network_configuration:config",
     "envoy.stat_sinks.metrics_service":                    "//source/extensions/stat_sinks/metrics_service:config",
     "envoy.transport_sockets.raw_buffer":                  "//source/extensions/transport_sockets/raw_buffer:config",

diff --git a/examples/kotlin/hello_world/.bazelproject b/examples/kotlin/hello_world/.bazelproject
@@ -13,6 +13,7 @@ directories:
 
 import_run_configurations:
   examples/kotlin/hello_world/tools/android-studio-run-configurations/run_configuration_example_debug_x86.xml
+  examples/kotlin/hello_world/tools/android-studio-run-configurations/run_configuration_example_debug_arm64.xml
 
 targets:
   //examples/kotlin/hello_world:hello_envoy_kt

diff --git a/...o_world/tools/android-studio-run-configurations/run_configuration_example_debug_arm64.xml b/...o_world/tools/android-studio-run-configurations/run_configuration_example_debug_arm64.xml
@@ -0,0 +1,39 @@
+<configuration name="Example App (Debug) [arm64]"
+    type="BlazeCommandRunConfigurationType"
+    factoryName="Bazel Command"
+    nameIsGenerated="false">
+    <blaze-settings kind="android_binary"
+        blaze-command="mobile-install"
+        handler-id="BlazeCommandGenericRunConfigurationHandlerProvider"
+        blaze-native-debug="true"
+        DEEP_LINK=""
+        ACTIVITY_CLASS=""
+        MODE="default_activity"
+        launch-method="NON_BLAZE"
+        use-split-apks-if-possible="false"
+        use-work-profile-if-present="false"
+        show-logcat-automatically="false"
+        AM_START_OPTIONS="">
+        <blaze-user-flag>--config=dbg</blaze-user-flag>
+        <blaze-user-flag>--fat_apk_cpu=arm64-v8a</blaze-user-flag>
+        <blaze-target>//examples/kotlin/hello_world:hello_envoy_kt</blaze-target>
+        <Profilers>
+            <option name="ADVANCED_PROFILING_ENABLED"
+                value="false" />
+            <option name="STARTUP_PROFILING_ENABLED"
+                value="false" />
+            <option name="STARTUP_CPU_PROFILING_ENABLED"
+                value="false" />
+            <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME"
+                value="Sample Java Methods" />
+            <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED"
+                value="false" />
+            <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES"
+                value="2048" />
+        </Profilers>
+    </blaze-settings>
+    <method v="2">
+        <option name="Blaze.BeforeRunTask"
+            enabled="true" />
+    </method>
+</configuration>
diff --git a/...llo_world/tools/android-studio-run-configurations/run_configuration_example_debug_x86.xml b/...llo_world/tools/android-studio-run-configurations/run_configuration_example_debug_x86.xml
@@ -1,4 +1,4 @@
-<configuration name="Example App x86 (Debug)"
+<configuration name="Example App (Debug) [x86]"
     type="BlazeCommandRunConfigurationType"
     factoryName="Bazel Command"
     nameIsGenerated="false">
@@ -14,6 +14,7 @@
         use-work-profile-if-present="false"
         show-logcat-automatically="false"
         AM_START_OPTIONS="">
+        <blaze-user-flag>--config=dbg</blaze-user-flag>
         <blaze-user-flag>--fat_apk_cpu=x86</blaze-user-flag>
         <blaze-target>//examples/kotlin/hello_world:hello_envoy_kt</blaze-target>
         <Profilers>

diff --git a/examples/objective-c/hello_world/BUILD b/examples/objective-c/hello_world/BUILD
@@ -1,5 +1,4 @@
 load("//bazel:config.bzl", "MINIMUM_IOS_VERSION")
-load("@rules_cc//cc:defs.bzl", "objc_library")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 
 licenses(["notice"])  # Apache 2