Merge branch 'master' into HEAD

* master: (117 commits) vrp: allow supervisord to open its log file (envoyproxy#14066) [http1] fix H/1 response pipelining (envoyproxy#13983) wasm: make dependency clearer (envoyproxy#14062) docs: updating 100-continue docs (envoyproxy#14040) quiche: fix stream trailer decoding issue (envoyproxy#13871) tidy: use last_github_commit script instead of target branch (envoyproxy#14052) stats: use RE2 and a better pattern to accelerate a single stats tag-extraction RE (envoyproxy#8831) wasm: use static registration for runtimes (envoyproxy#14014) grpc-json-transcoder: Add support for configuring unescaping behavior (envoyproxy#14009) ci: fix CodeQL-build by removing deprecated set-env command (envoyproxy#14046) config: fix crash when type URL doesn't match proto. (envoyproxy#14031) Build: Propagate user-supplied tags to external headers library. (envoyproxy#14016) [test host utils] use make_shared to avoid memory leaks (envoyproxy#14042) jwt_authn: update to jwt_verify_lib with 1 minute clock skew (envoyproxy#13872) quiche: update QUICHE tar (envoyproxy#13949) sds: improve watched directory documentation. (envoyproxy#14029) log the internal error message from *SSL when the cert and private key doesn't match (envoyproxy#14023) wasm: fix CPE for Wasmtime. (envoyproxy#14024) docs: Bump sphinxext-rediraffe version (envoyproxy#13996) CDS: remove warming cluster if CDS response desired (envoyproxy#13997) ...
mpuncel · Nov 18, 2020 · ed7a0f1 · ed7a0f1
2 parents 2352719 + 9a65e98
commit ed7a0f1
Show file tree

Hide file tree

Showing 891 changed files with 21,654 additions and 6,941 deletions.
diff --git a/.azure-pipelines/cleanup.sh b/.azure-pipelines/cleanup.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Temporary script to remove tools from Azure pipelines agent to create more disk space room.
-sudo apt-get update -y
+sudo apt-get update -y || true
 sudo apt-get purge -y --no-upgrade 'ghc-*' 'zulu-*-azure-jdk' 'libllvm*' 'mysql-*' 'dotnet-*' 'libgl1' \
   'adoptopenjdk-*' 'azure-cli' 'google-chrome-stable' 'firefox' 'hhvm'
 

diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
@@ -41,6 +41,7 @@ stages:
 
       - job: docs
         dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel.
+        condition: ne(variables['PostSubmit'], true)
         pool:
           vmImage: "ubuntu-18.04"
         steps:
@@ -59,34 +60,14 @@ stages:
               GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
             displayName: "Generate docs"
 
-          - script: ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/docs docs'
+          - script: |
+              ci/run_envoy_docker.sh 'ci/upload_gcs_artifact.sh /source/generated/docs docs'
             displayName: "Upload Docs to GCS"
             env:
               ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
               GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
               GCS_ARTIFACT_BUCKET: $(GcsArtifactBucket)
 
-          - task: PublishBuildArtifacts@1
-            inputs:
-              pathtoPublish: "$(Build.SourcesDirectory)/generated/docs"
-              artifactName: docs
-
-          - task: InstallSSHKey@0
-            inputs:
-              hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
-              sshPublicKey: "$(DocsPublicKey)"
-              sshPassphrase: "$(SshDeployKeyPassphrase)"
-              sshKeySecureFile: "$(DocsPrivateKey)"
-            condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true))
-
-          - script: docs/publish.sh
-            displayName: "Publish to GitHub"
-            workingDirectory: $(Build.SourcesDirectory)
-            env:
-              AZP_BRANCH: $(Build.SourceBranch)
-              AZP_SHA1: $(Build.SourceVersion)
-            condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true))
-
       - job: dependencies
         dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel.
         pool:
@@ -305,6 +286,43 @@ stages:
               artifactName: docker
             condition: always()
 
+  - stage: docs
+    dependsOn: ["docker"]
+    condition: and(succeeded(), eq(variables['PostSubmit'], true), ne(variables['NoSync'], true))
+    jobs:
+      - job: publish
+        pool:
+          vmImage: "ubuntu-18.04"
+        steps:
+          - task: Cache@2
+            inputs:
+              key: "docs | ./WORKSPACE | **/*.bzl"
+              path: $(Build.StagingDirectory)/repository_cache
+            continueOnError: true
+
+          - script: ci/run_envoy_docker.sh 'ci/do_ci.sh docs'
+            workingDirectory: $(Build.SourcesDirectory)
+            env:
+              ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
+              BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
+              BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
+              GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
+            displayName: "Generate docs"
+
+          - task: InstallSSHKey@0
+            inputs:
+              hostName: "github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="
+              sshPublicKey: "$(DocsPublicKey)"
+              sshPassphrase: "$(SshDeployKeyPassphrase)"
+              sshKeySecureFile: "$(DocsPrivateKey)"
+
+          - script: docs/publish.sh
+            displayName: "Publish to GitHub"
+            workingDirectory: $(Build.SourcesDirectory)
+            env:
+              AZP_BRANCH: $(Build.SourceBranch)
+              AZP_SHA1: $(Build.SourceVersion)
+
   - stage: verify
     dependsOn: ["docker"]
     jobs:

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -10,6 +10,7 @@ tasks:
     test_flags:
       - "--config=remote-clang-libc++"
       - "--config=remote-ci"
+      - "--define=wasm=disabled"
       - "--jobs=75"
   coverage:
     name: "Coverage"

diff --git a/.bazelrc b/.bazelrc
@@ -246,7 +246,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:b480535e8423b5fd7c102fd30c92f4785519e33a
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:19a268cfe3d12625380e7c61d2467c8779b58b56
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:b480535e8423b5fd7c102fd30c92f4785519e33a
+FROM gcr.io/envoy-ci/envoy-build:19a268cfe3d12625380e7c61d2467c8779b58b56
 
 ARG USERNAME=vscode
 ARG USER_UID=501

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -12,6 +12,9 @@
     // Uncomment next line if you have devcontainer.env
     // "--env-file=.devcontainer/devcontainer.env"
   ],
+  "containerEnv": {
+    "ENVOY_SRCDIR": "${containerWorkspaceFolder}",
+  },
   "settings": {
     "terminal.integrated.shell.linux": "/bin/bash",
     "bazel.buildifierFixOnFormat": true,

diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml
@@ -24,7 +24,9 @@ jobs:
     - name: Get build targets
       run: |
        . .github/workflows/get_build_targets.sh
-       echo ::set-env name=BUILD_TARGETS::$(echo $BUILD_TARGETS_LOCAL)
+       echo 'BUILD_TARGETS<<EOF' >> $GITHUB_ENV
+       echo $BUILD_TARGETS_LOCAL >> $GITHUB_ENV
+       echo 'EOF' >> $GITHUB_ENV
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
@@ -57,7 +59,7 @@ jobs:
     - name: Clean Artifacts
       run: |
         git clean -xdf
-       
+
     - name: Perform CodeQL Analysis
       if: env.BUILD_TARGETS != ''
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/get_build_targets.sh b/.github/workflows/get_build_targets.sh
@@ -18,8 +18,8 @@ function get_targets() {
     # This chain of commands from left to right are:
     # 1. Excluding the redundant .cc/.h targets that bazel query emits.
     # 2. Storing only the unique output.
-    # 3. Limiting to the first 10 targets.
-  done | grep -v '\.cc\|\.h' | sort -u | head -n 10
+    # 3. Limiting to the first 3 targets.
+  done | grep -v '\.cc\|\.h' | sort -u | head -n 3
 }
 
 # Fetching the upstream HEAD to compare with and stored in FETCH_HEAD.

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -37,7 +37,7 @@ extensions/filters/common/original_src @snowp @klarose
 # alts transport socket extension
 /*/extensions/transport_sockets/alts @htuch @yangminzhu
 # tls transport socket extension
-/*/extensions/transport_sockets/tls @PiotrSikora @lizan @asraa
+/*/extensions/transport_sockets/tls @PiotrSikora @lizan @asraa @ggreenway
 # proxy protocol socket extension
 /*/extensions/transport_sockets/proxy_protocol @alyssawilk @wez470
 # common transport socket
@@ -50,12 +50,14 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/tracers/datadog @cgilmour @palazzem @mattklein123
 # tracers.xray extension
 /*/extensions/tracers/xray @marcomagdy @lavignes @mattklein123
+# tracers.skywalking extension
+/*/extensions/tracers/skywalking @wbpcode @dio @lizan
 # mysql_proxy extension
 /*/extensions/filters/network/mysql_proxy @rshriram @venilnoronha @mattklein123
 # postgres_proxy extension
 /*/extensions/filters/network/postgres_proxy @fabriziomello @cpakulski @dio
 # quic extension
-/*/extensions/quic_listeners/ @alyssawilk @danzh2010 @mattklein123 @mpwarres @wu-bin
+/*/extensions/quic_listeners/ @alyssawilk @danzh2010 @mattklein123 @mpwarres @wu-bin @ggreenway
 # zookeeper_proxy extension
 /*/extensions/filters/network/zookeeper_proxy @rgs1 @snowp
 # redis cluster extension
@@ -90,6 +92,8 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/filters/network/wasm @PiotrSikora @lizan
 # webassembly common extension
 /*/extensions/common/wasm @PiotrSikora @lizan
+# webassembly runtimes
+/*/extensions/wasm_runtime/ @PiotrSikora @lizan
 # common matcher
 /*/extensions/common/matcher @mattklein123 @yangminzhu
 # common crypto extension
@@ -125,7 +129,7 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/retry/host @snowp @alyssawilk
 /*/extensions/filters/network/http_connection_manager @alyssawilk @mattklein123
 /*/extensions/filters/network/ext_authz @gsagula @dio
-/*/extensions/filters/network/tcp_proxy @alyssawilk @zuercher
+/*/extensions/filters/network/tcp_proxy @alyssawilk @zuercher @ggreenway
 /*/extensions/filters/network/echo @htuch @alyssawilk
 /*/extensions/filters/udp/dns_filter @abaptiste @mattklein123
 /*/extensions/filters/network/direct_response @kyessenov @zuercher
@@ -144,9 +148,7 @@ extensions/filters/common/original_src @snowp @klarose
 /*/extensions/watchdog/profile_action @kbaichoo @antoniovicente
 # Core upstream code
 extensions/upstreams/http @alyssawilk @snowp @mattklein123
-extensions/upstreams/http/http @alyssawilk @snowp @mattklein123
-extensions/upstreams/http/tcp @alyssawilk @mattklein123
-extensions/upstreams/http/default @alyssawilk @snowp @mattklein123
+extensions/upstreams/tcp @alyssawilk @ggreenway @mattklein123
 # OAuth2
 extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp
 # HTTP Local Rate Limit

diff --git a/api/BUILD b/api/BUILD
@@ -247,6 +247,7 @@ proto_library(
         "//envoy/extensions/upstreams/http/generic/v3:pkg",
         "//envoy/extensions/upstreams/http/http/v3:pkg",
         "//envoy/extensions/upstreams/http/tcp/v3:pkg",
+        "//envoy/extensions/upstreams/tcp/generic/v3:pkg",
         "//envoy/extensions/wasm/v3:pkg",
         "//envoy/extensions/watchdog/profile_action/v3alpha:pkg",
         "//envoy/service/accesslog/v3:pkg",

diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl
@@ -40,6 +40,10 @@ def api_dependencies():
         name = "com_github_openzipkin_zipkinapi",
         build_file_content = ZIPKINAPI_BUILD_CONTENT,
     )
+    external_http_archive(
+        name = "com_github_apache_skywalking_data_collect_protocol",
+        build_file_content = SKYWALKING_DATA_COLLECT_PROTOCOL_BUILD_CONTENT,
+    )
 
 PROMETHEUSMETRICS_BUILD_CONTENT = """
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")
@@ -101,3 +105,30 @@ go_proto_library(
     visibility = ["//visibility:public"],
 )
 """
+
+SKYWALKING_DATA_COLLECT_PROTOCOL_BUILD_CONTENT = """
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+
+proto_library(
+    name = "protocol",
+    srcs = [
+        "common/Common.proto",
+        "language-agent/Tracing.proto",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_proto_library(
+    name = "protocol_cc_proto",
+    deps = [":protocol"],
+    visibility = ["//visibility:public"],
+)
+
+go_proto_library(
+    name = "protocol_go_proto",
+    proto = ":protocol",
+    visibility = ["//visibility:public"],
+)
+"""
diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl
@@ -88,4 +88,15 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         release_date = "2020-08-17",
         use_category = ["api"],
     ),
+    com_github_apache_skywalking_data_collect_protocol = dict(
+        project_name = "SkyWalking API",
+        project_desc = "SkyWalking's language independent model and gRPC API Definitions",
+        project_url = "https://github.com/apache/skywalking-data-collect-protocol",
+        version = "8.1.0",
+        sha256 = "ebea8a6968722524d1bcc4426fb6a29907ddc2902aac7de1559012d3eee90cf9",
+        strip_prefix = "skywalking-data-collect-protocol-{version}",
+        urls = ["https://github.com/apache/skywalking-data-collect-protocol/archive/v{version}.tar.gz"],
+        release_date = "2020-07-29",
+        use_category = ["api"],
+    ),
 )
diff --git a/api/envoy/config/common/matcher/v3/BUILD b/api/envoy/config/common/matcher/v3/BUILD
@@ -6,7 +6,9 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
+        "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
+        "//envoy/type/matcher/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )