From 4685fa7367bd2f9c2649296372e3ad9b153a6749 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Tue, 14 May 2019 16:16:27 -0700
Subject: [PATCH 01/15] Update Envoy SHA to latest.

---
 WORKSPACE                      | 4 ++--
 istio.deps                     | 4 ++--
 test/integration/int_client.cc | 3 +--
 test/integration/int_server.cc | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 1b230222fa7..956979f2b98 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,9 +35,9 @@ bind(
 # When updating envoy sha manually please update the sha in istio.deps file also
 #
 # Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
-ENVOY_SHA = "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39"
+ENVOY_SHA = "228a963d1308eb1b06e2e8b7387e0bfa72fe77ea"
 
-ENVOY_SHA256 = "64beeb27f68ed644ff0bd37b193e5a85f49b883250940e292f6f150ec7173e38"
+ENVOY_SHA256 = "6480ed4a526c504dc7c7c6784c7f143183a5481d944b999a45b7a7fb925d8e09"
 
 http_archive(
     name = "envoy",
diff --git a/istio.deps b/istio.deps
index ee025b4b7cc..4aaed1fce86 100644
--- a/istio.deps
+++ b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39"
+		"lastStableSHA": "228a963d1308eb1b06e2e8b7387e0bfa72fe77ea"
 	}
-]
\ No newline at end of file
+]
diff --git a/test/integration/int_client.cc b/test/integration/int_client.cc
index 6447ec128f3..2820e7cff28 100644
--- a/test/integration/int_client.cc
+++ b/test/integration/int_client.cc
@@ -447,8 +447,7 @@ Client::Client(const std::string &name)
       stats_(),
       thread_(nullptr),
       time_system_(),
-      api_(Envoy::Thread::ThreadFactorySingleton::get(), stats_, time_system_,
-           Envoy::Filesystem::fileSystemForTest()),
+      api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()),
       dispatcher_{api_.allocateDispatcher()} {}
 
 Client::~Client() {
diff --git a/test/integration/int_server.cc b/test/integration/int_server.cc
index e5a7416bec5..0fccd8e77ce 100644
--- a/test/integration/int_server.cc
+++ b/test/integration/int_server.cc
@@ -118,7 +118,7 @@ class ServerStreamImpl : public ServerStream,
     }
 
     response_status_ = status;
-    response_body_ = Envoy::Grpc::Common::serializeBody(message);
+    response_body_ = Envoy::Grpc::Common::serializeToGrpcFrame(message);
     Envoy::Event::TimerCb send_grpc_response = [this, delay]() {
       ENVOY_LOG(
           debug,
@@ -612,7 +612,7 @@ Server::Server(const std::string &name,
     : name_(name),
       stats_(),
       time_system_(),
-      api_(Envoy::Thread::ThreadFactorySingleton::get(), stats_, time_system_,
+      api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_,
            Envoy::Filesystem::fileSystemForTest()),
       dispatcher_(api_.allocateDispatcher()),
       connection_handler_(new Envoy::Server::ConnectionHandlerImpl(

From fb9461304d554caf4f911ff26bbcbc98cadf8cce Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Tue, 14 May 2019 16:22:37 -0700
Subject: [PATCH 02/15] Fix formatting.

---
 test/integration/int_client.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/integration/int_client.cc b/test/integration/int_client.cc
index 2820e7cff28..41222bc8ff8 100644
--- a/test/integration/int_client.cc
+++ b/test/integration/int_client.cc
@@ -447,7 +447,8 @@ Client::Client(const std::string &name)
       stats_(),
       thread_(nullptr),
       time_system_(),
-      api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()),
+      api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_,
+           Envoy::Filesystem::fileSystemForTest()),
       dispatcher_{api_.allocateDispatcher()} {}
 
 Client::~Client() {

From 4808ca9e9b9951090d2fc128980b0825b55a4118 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Tue, 14 May 2019 16:42:59 -0700
Subject: [PATCH 03/15] Downgrade bazel version for macos.

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5731eb3c377..803e5f04b91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,6 +81,7 @@ jobs:
     steps:
       - run: sudo ntpdate -vu time.apple.com
       - run: brew install bazel cmake coreutils go libtool ninja wget
+      - run: brew switch bazel 0.23.2
       - checkout
       - restore_cache:
           keys:

From 367455dd9eaf649ffcf515e0428b3dd81e5b9c8f Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Tue, 14 May 2019 16:56:05 -0700
Subject: [PATCH 04/15] Fix build with bazel 0.25.

---
 .circleci/config.yml | 1 -
 repositories.bzl     | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 803e5f04b91..5731eb3c377 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,7 +81,6 @@ jobs:
     steps:
       - run: sudo ntpdate -vu time.apple.com
       - run: brew install bazel cmake coreutils go libtool ninja wget
-      - run: brew switch bazel 0.23.2
       - checkout
       - restore_cache:
           keys:
diff --git a/repositories.bzl b/repositories.bzl
index 7b8b89e1b3b..dfaea0d7f5e 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -15,6 +15,10 @@
 ################################################################################
 #
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load(":protobuf.bzl", "protobuf_repositories")
+load(":cc_gogo_protobuf.bzl", "cc_gogoproto_repositories")
+load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
+load(":googleapis.bzl", "googleapis_repositories")
 
 GOOGLETEST = "d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0"
 GOOGLETEST_SHA256 = "01508c8f47c99509130f128924f07f3a60be05d039cff571bb11d60bb11a3581"
@@ -234,11 +238,6 @@ filegroup(
             actual = "@mixerapi_git//:tcp_cluster_rewrite_config_cc_proto",
         )
 
-load(":protobuf.bzl", "protobuf_repositories")
-load(":cc_gogo_protobuf.bzl", "cc_gogoproto_repositories")
-load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
-load(":googleapis.bzl", "googleapis_repositories")
-
 def mixerapi_dependencies():
     protobuf_repositories(load_repo = True, bind = True)
     cc_gogoproto_repositories()

From 1108a568e7502647d281694eb67fbbfc2dab0fb0 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Tue, 14 May 2019 20:05:27 -0700
Subject: [PATCH 05/15] Remove duplicate dependency.

---
 repositories.bzl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/repositories.bzl b/repositories.bzl
index dfaea0d7f5e..bf346cfe33c 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -18,7 +18,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(":protobuf.bzl", "protobuf_repositories")
 load(":cc_gogo_protobuf.bzl", "cc_gogoproto_repositories")
 load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
-load(":googleapis.bzl", "googleapis_repositories")
 
 GOOGLETEST = "d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0"
 GOOGLETEST_SHA256 = "01508c8f47c99509130f128924f07f3a60be05d039cff571bb11d60bb11a3581"
@@ -143,7 +142,7 @@ cc_proto_library(
     deps = [
         "//external:cc_gogoproto",
         "//external:cc_wkt_protos",
-        "//external:rpc_status_proto",
+        "@googleapis//:rpc_status_protos",
     ],
 )
 
@@ -242,5 +241,4 @@ def mixerapi_dependencies():
     protobuf_repositories(load_repo = True, bind = True)
     cc_gogoproto_repositories()
     go_x_tools_imports_repositories()
-    googleapis_repositories()
     mixerapi_repositories()

From 104ae09e030e3b8d7bf767670dd4ef1c6ad61215 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 10:08:31 -0700
Subject: [PATCH 06/15] Address comments.

---
 cc_gogo_protobuf.bzl | 78 --------------------------------------------
 googleapis.bzl       | 59 ---------------------------------
 repositories.bzl     | 10 +++---
 3 files changed, 4 insertions(+), 143 deletions(-)
 delete mode 100644 cc_gogo_protobuf.bzl
 delete mode 100644 googleapis.bzl

diff --git a/cc_gogo_protobuf.bzl b/cc_gogo_protobuf.bzl
deleted file mode 100644
index c0d064130a8..00000000000
--- a/cc_gogo_protobuf.bzl
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2017 Istio Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-#
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-GOGO_PROTO_SHA = "100ba4e885062801d56799d78530b73b178a78f3"
-GOGO_PROTO_SHA256 = "b04eb8eddd2d15d8b12d111d4ef7816fca6e5c5d495adf45fb8478278aa80f79"
-
-def cc_gogoproto_repositories(bind = True):
-    BUILD = """
-# Copyright 2017 Istio Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-#
-
-licenses(["notice"])
-
-load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
-
-exports_files(glob(["google/**"]))
-
-cc_proto_library(
-    name = "cc_gogoproto",
-    srcs = [
-        "gogoproto/gogo.proto",
-    ],
-    include = ".",
-    default_runtime = "//external:protobuf",
-    protoc = "//external:protoc",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//external:cc_wkt_protos",
-    ],
-)
-"""
-    http_archive(
-        name = "gogoproto_git",
-        strip_prefix = "protobuf-" + GOGO_PROTO_SHA,
-        url = "https://github.com/gogo/protobuf/archive/" + GOGO_PROTO_SHA + ".tar.gz",
-        sha256 = GOGO_PROTO_SHA256,
-        build_file_content = BUILD,
-    )
-
-    if bind:
-        native.bind(
-            name = "cc_gogoproto",
-            actual = "@gogoproto_git//:cc_gogoproto",
-        )
-
-        native.bind(
-            name = "cc_gogoproto_genproto",
-            actual = "@gogoproto_git//:cc_gogoproto_genproto",
-        )
diff --git a/googleapis.bzl b/googleapis.bzl
deleted file mode 100644
index 0ab001e3109..00000000000
--- a/googleapis.bzl
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2017 Istio Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-#
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# Oct 21, 2016 (only release pre-dates sha)
-GOOGLEAPIS_SHA = "13ac2436c5e3d568bd0e938f6ed58b77a48aba15"
-GOOGLEAPIS_SHA256 = "f48956fb8c55617ed052c20884465f06b9a57b807164431185be397ea46993ca"
-
-def googleapis_repositories(bind = True):
-    GOOGLEAPIS_BUILD_FILE = """
-package(default_visibility = ["//visibility:public"])
-
-load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library")
-
-cc_proto_library(
-    name = "rpc_status_proto",
-    srcs = [
-        "google/rpc/status.proto",
-    ],
-    visibility = ["//visibility:public"],
-    protoc = "//external:protoc",
-    default_runtime = "//external:protobuf",
-    deps = [
-        "//external:cc_wkt_protos",
-    ],
-)
-
-"""
-    http_archive(
-        name = "com_github_googleapis_googleapis",
-        build_file_content = GOOGLEAPIS_BUILD_FILE,
-        strip_prefix = "googleapis-" + GOOGLEAPIS_SHA,
-        url = "https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_SHA + ".tar.gz",
-        sha256 = GOOGLEAPIS_SHA256,
-    )
-
-    if bind:
-        native.bind(
-            name = "rpc_status_proto",
-            actual = "@com_github_googleapis_googleapis//:rpc_status_proto",
-        )
-        native.bind(
-            name = "rpc_status_proto_genproto",
-            actual = "@com_github_googleapis_googleapis//:rpc_status_proto_genproto",
-        )
diff --git a/repositories.bzl b/repositories.bzl
index bf346cfe33c..b13f19f0355 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -16,7 +16,6 @@
 #
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(":protobuf.bzl", "protobuf_repositories")
-load(":cc_gogo_protobuf.bzl", "cc_gogoproto_repositories")
 load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
 
 GOOGLETEST = "d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0"
@@ -140,7 +139,7 @@ cc_proto_library(
     protoc = "//external:protoc",
     visibility = ["//visibility:public"],
     deps = [
-        "//external:cc_gogoproto",
+        "@com_github_gogo_protobuf//:gogo_proto_cc",
         "//external:cc_wkt_protos",
         "@googleapis//:rpc_status_protos",
     ],
@@ -171,7 +170,7 @@ cc_proto_library(
     protoc = "//external:protoc",
     visibility = ["//visibility:public"],
     deps = [
-        "//external:cc_gogoproto",
+        "@com_github_gogo_protobuf//:gogo_proto_cc",
     ],
 )
 
@@ -184,7 +183,7 @@ cc_proto_library(
     protoc = "//external:protoc",
     visibility = ["//visibility:public"],
     deps = [
-        "//external:cc_gogoproto",
+        "@com_github_gogo_protobuf//:gogo_proto_cc",
     ],
 )
 
@@ -197,7 +196,7 @@ cc_proto_library(
     protoc = "//external:protoc",
     visibility = ["//visibility:public"],
     deps = [
-        "//external:cc_gogoproto",
+        "@com_github_gogo_protobuf//:gogo_proto_cc",
     ],
 )
 
@@ -239,6 +238,5 @@ filegroup(
 
 def mixerapi_dependencies():
     protobuf_repositories(load_repo = True, bind = True)
-    cc_gogoproto_repositories()
     go_x_tools_imports_repositories()
     mixerapi_repositories()

From dedc44b6c5f4e10262d9e0b35374facfeb293881 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 10:10:16 -0700
Subject: [PATCH 07/15] Address comments.

---
 WORKSPACE | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/WORKSPACE b/WORKSPACE
index 956979f2b98..084094530a5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,6 +35,8 @@ bind(
 # When updating envoy sha manually please update the sha in istio.deps file also
 #
 # Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
+# envoy commit date  05/15/2019
+# bazel version: 0.25.0
 ENVOY_SHA = "228a963d1308eb1b06e2e8b7387e0bfa72fe77ea"
 
 ENVOY_SHA256 = "6480ed4a526c504dc7c7c6784c7f143183a5481d944b999a45b7a7fb925d8e09"

From 2e111f496e09672af76a1703812425f1b34abec4 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 13:34:49 -0700
Subject: [PATCH 08/15] Supress tsan issue in libevent.

---
 Makefile          | 2 +-
 tsan.suppressions | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 tsan.suppressions

diff --git a/Makefile b/Makefile
index be0166338fb..0102cdce942 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test_asan:
 	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 test_tsan:
-	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
+	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env=TSAN_OPTIONS=supressions=$(TOP)/tsan.suppressions -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 check:
 	@script/check-license-headers
diff --git a/tsan.suppressions b/tsan.suppressions
new file mode 100644
index 00000000000..ac16cf350c0
--- /dev/null
+++ b/tsan.suppressions
@@ -0,0 +1 @@
+race:event_

From dafc46c0163dcec628f08125709e363cd8dc1978 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 14:10:20 -0700
Subject: [PATCH 09/15] Update supression file.

---
 tsan.suppressions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsan.suppressions b/tsan.suppressions
index ac16cf350c0..15dcab26cce 100644
--- a/tsan.suppressions
+++ b/tsan.suppressions
@@ -1 +1 @@
-race:event_
+race:event_debug_node_too_late

From 513ba500a056057a61a67ba40f09df0ce76ea58c Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 14:11:33 -0700
Subject: [PATCH 10/15] typo

---
 tsan.suppressions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsan.suppressions b/tsan.suppressions
index 15dcab26cce..fc6077962a4 100644
--- a/tsan.suppressions
+++ b/tsan.suppressions
@@ -1 +1 @@
-race:event_debug_node_too_late
+race:event_debug_mode_too_late

From 1e9b6446457dcbd913a90ba349de769225aa75af Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 14:52:23 -0700
Subject: [PATCH 11/15] Remove duplicate protobuf library.  Add quotes on
 supressions argument.

---
 Makefile         | 2 +-
 repositories.bzl | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0102cdce942..b0eed22f76a 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test_asan:
 	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 test_tsan:
-	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env=TSAN_OPTIONS=supressions=$(TOP)/tsan.suppressions -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
+	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env='TSAN_OPTIONS="supressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 check:
 	@script/check-license-headers
diff --git a/repositories.bzl b/repositories.bzl
index b13f19f0355..002a17d87fe 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -15,7 +15,6 @@
 ################################################################################
 #
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load(":protobuf.bzl", "protobuf_repositories")
 load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
 
 GOOGLETEST = "d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0"
@@ -140,7 +139,7 @@ cc_proto_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_gogo_protobuf//:gogo_proto_cc",
-        "//external:cc_wkt_protos",
+        "@com_google_protobuf//:cc_wkt_protos",
         "@googleapis//:rpc_status_protos",
     ],
 )
@@ -237,6 +236,5 @@ filegroup(
         )
 
 def mixerapi_dependencies():
-    protobuf_repositories(load_repo = True, bind = True)
     go_x_tools_imports_repositories()
     mixerapi_repositories()

From 368c242379c092f075f1f35da3ac4e7d687068b5 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 14:57:10 -0700
Subject: [PATCH 12/15] Add -DEVENT__DISABLE_DEBUG_MODE for tsan targets to
 work around race in libevent.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b0eed22f76a..d6c26487aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test_asan:
 	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 test_tsan:
-	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env='TSAN_OPTIONS="supressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
+	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --copt -DEVENT__DISALBE_DEBUG_MODE --test_env='TSAN_OPTIONS="supressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 check:
 	@script/check-license-headers

From 9582136bfc2e6b02d5b119bebcf8d471cc95e0f2 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 15:07:33 -0700
Subject: [PATCH 13/15] Fix typo, remove disabling of debug mode.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d6c26487aa8..de3ccd6afc9 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test_asan:
 	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 test_tsan:
-	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --copt -DEVENT__DISALBE_DEBUG_MODE --test_env='TSAN_OPTIONS="supressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
+	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env='TSAN_OPTIONS="suppressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 check:
 	@script/check-license-headers

From 5db29ee1e78712a730d7f9971f6b0e002bd1bf19 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 15:29:57 -0700
Subject: [PATCH 14/15] Remove quotes.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index de3ccd6afc9..82dccc095d4 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ test_asan:
 	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 test_tsan:
-	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env='TSAN_OPTIONS="suppressions=$(TOP)/tsan.suppressions"' -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
+	PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env=TSAN_OPTIONS=suppressions=$(TOP)/tsan.suppressions -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
 
 check:
 	@script/check-license-headers

From 1c8506ded17f11bc09f651dd239103ad75a28571 Mon Sep 17 00:00:00 2001
From: John Plevyak <jplevyak@gmail.com>
Date: Wed, 15 May 2019 15:33:56 -0700
Subject: [PATCH 15/15] Remove protobuf.bzl.

---
 protobuf.bzl | 66 ----------------------------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 protobuf.bzl

diff --git a/protobuf.bzl b/protobuf.bzl
deleted file mode 100644
index 3371d6a416c..00000000000
--- a/protobuf.bzl
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2017 Istio Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-#
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# Match SHA used by Envoy
-PROTOBUF_SHA = "582743bf40c5d3639a70f98f183914a2c0cd0680"
-PROTOBUF_SHA256 = "cf9e2fb1d2cd30ec9d51ff1749045208bd641f290f64b85046485934b0e03783"
-
-def protobuf_repositories(load_repo = True, bind = True):
-    if load_repo:
-        http_archive(
-            name = "com_google_protobuf",
-            strip_prefix = "protobuf-" + PROTOBUF_SHA,
-            url = "https://github.com/google/protobuf/archive/" + PROTOBUF_SHA + ".tar.gz",
-            sha256 = PROTOBUF_SHA256,
-        )
-
-    if bind:
-        native.bind(
-            name = "protoc",
-            actual = "@com_google_protobuf//:protoc",
-        )
-
-        native.bind(
-            name = "protocol_compiler",
-            actual = "@com_google_protobuf//:protoc",
-        )
-
-        native.bind(
-            name = "protobuf",
-            actual = "@com_google_protobuf//:protobuf",
-        )
-
-        native.bind(
-            name = "cc_wkt_protos",
-            actual = "@com_google_protobuf//:cc_wkt_protos",
-        )
-
-        native.bind(
-            name = "cc_wkt_protos_genproto",
-            actual = "@com_google_protobuf//:cc_wkt_protos_genproto",
-        )
-
-        native.bind(
-            name = "protobuf_compiler",
-            actual = "@com_google_protobuf//:protoc_lib",
-        )
-
-        native.bind(
-            name = "protobuf_clib",
-            actual = "@com_google_protobuf//:protoc_lib",
-        )