From fb09945f05fe65c90c3f559a848e76909ba41848 Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Mon, 10 Sep 2018 23:17:52 +0000
Subject: [PATCH] Update Proxy SHA to latest with TCP proxy fixes.

Pulling the following changes from github.com/istio/proxy:

f498337 Fix a bug in origin authenticator that wrongly treats empty origin methods as pass (#1962)
c352de0 Mixer Client: Add support for TCP local attributes (#1967)
2c563c6 remove not used path patcher functions (#1966)
490d26f Update Envoy SHA to latest with TCP proxy fixes. (#1964)
4cc4b7c Mixer Client uses Node metadata to populate Mixer attributes (#1961)
cf23357 Fix the peerIsOptional and originIsOptional for authn filter. (#1959)
cc6e58e support per-path JWT validation. (#1928)
a5dd1aa mixer: clear route cache on header update (#1946)

Pulling the following changes from github.com/envoyproxy/envoy:

f936fc60f ssl: serialize accesses to SSL socket factory contexts (#4345)
e34dcd62a Fix crash in tcp_proxy (#4323)
ae6a25222 router: fix matching when all domains have wildcards (#4326)
aa06142ff test: Stop fake_upstream methods from accidentally succeeding (#4232)
5d731878f rbac: update the authenticated.user to a StringMatcher. (#4250)
c6bfc7d9a time: Event::TimeSystem abstraction to make it feasible to inject time with simulated timers (#4257)
752483ea9 Fixing the fix (#4333)
83487f6f3 tls: update BoringSSL to ab36a84b (3497). (#4338)
7bc210e02 test: fixing interactions between waitFor and ignore_spurious_events (#4309)
69474b398 admin: order stats in clusters json admin (#4306)
2d155f901 ppc64le build (#4183)
07efc6dc6 fix static initialization fiasco problem (#4314)
0b7e3b5e0 test: Remove declared but undefined class methods (#4297)
1485a1304 lua: make sure resetting dynamic metadata wrapper when request info is marked dead
d243cd62e test: set to zero when start_time exceeds limit (#4328)
0a1e92acc test: fix heap use-after-free in ~IntegrationTestServer. (#4319)
cddc732c7 CONTRIBUTING: Document 'kick-ci' trick. (#4335)
f13ef2464 docs: remove reference to deprecated value field (#4322)
e947a2766 router: minor doc fixes in stream idle timeout (#4329)
0c2e998af tcp-proxy: fixing a TCP proxy bug where we attempted to readDisable a closed connection (#4296)
00ffe44a2 utility: fix strftime overflow handling. (#4321)
af1183c28 Re-enable TcpProxySslIntegrationTest and make the tests pass again. (#4318)
35534617b fuzz: fix H2 codec fuzzer post #4262. (#4311)
42f604853 Proto string issue fix (#4320)
9c492a01d Support Envoy to fetch secrets using SDS service. (#4256)
a8572192f ratelimit: revert `revert rate limit failure mode config` and add tests (#4303)
1d34172bd dns: fix exception unsafe behavior in c-ares callbacks. (#4307)
121242340 alts: add gRPC TSI socket (#4153)
f0363ae63 fuzz: detect client-side resets in H2 codec fuzzer. (#4300)
01aa3f820 test: hopefully deflaking echo integration test (#4304)
1fc0f4ba2 ratelimit: link legacy proto when message is being used (#4308)
aa4481e6b fix rare List::remove(&target) segfault (#4244)
89e0f23ba headers: fixing fast fail of size-validation (#4269)
97eba5918 build: bump googletest version. (#4293)
0057e22d9 fuzz: avoid false positives in HCM fuzzer. (#4262)
9d094e590 Revert ac0bd74f6f9716e3a44d1412f795317c30ca770a (#4295)
ddb28a4a1 Add validation context provider (#4264)
3b47cbabb added histogram latency information to Hystrix dashboard stream (#3986)
cf87d50cd docs: update SNI FAQ. (#4285)
f952033a4 config: fix update empty stat for eds (#4276)
329e591d3 router: Add ability of custom headers to rely on per-request data (#4219)
68d20b46c  thrift: refactor build files and imports (#4271)
5fa8192a3 access_log: log requested_server_name in tcp proxy (#4144)
fa45bb48f fuzz: libc++ clocks don't like nanos. (#4282)
53f8944f7 stats: add symbol table for future stat name encoding (#3927)
c987b425b test infra: Remove timeSource() from the ClusterManager api (#4247)
cd171d9a9 websocket: tunneling websockets (and upgrades in general) over H2 (#4188)
b9dc5d9a0 router: disallow :path/host rewriting in request_headers_to_add. (#4220)
0c9101127 network: skip socket options and source address for UDS client connections (#4252)
da1857d59 build: fixing a downstream compile error by noting explicit fallthrough (#4265)
9857cfe2a fuzz: cleanup per-test environment after each fuzz case. (#4253)
52beb067d test: Wrap proto string in std::string before comparison (#4238)
f5e219edc extensions/thrift_proxy: Add header matching to thrift router (#4239)
c9ce5d2b1 fuzz: track read_disable_count bidirectionally in codec_impl_fuzz_test. (#4260)
35103b353 fuzz: use nanoseconds for SystemTime in RequestInfo. (#4255)
ba6ba9883 fuzz: make runtime root hermetic in server_fuzz_test. (#4258)
b0a901480 time: Add 'format' test to ensure no one directly instantiates Prod*Time from source. (#4248)
85674603b access_log: support beginning of epoch in START_TIME. (#4254)
28d5f4118 proto: unify envoy_proto_library/api_proto_library. (#4233)
f7d3cb638 http: fix allocation bug introduced in #4211. (#4245)

Fixes istio/istio#8310.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 istio.deps                                           |  2 +-
 .../client/check_cache_hit/check_cache_hit_test.go   |  9 +++++++++
 mixer/test/client/check_report/check_report_test.go  | 12 ++++++++++++
 .../check_report_large_post_request_test.go          |  6 ++++++
 .../disable_tcp_check_calls_test.go                  |  6 ++++++
 .../dynamic_attribute/dynamic_attribute_test.go      |  4 +++-
 .../client/dynamic_listener/dynamic_listener_test.go |  3 +++
 .../client/failed_request/failed_request_test.go     |  9 +++++++++
 mixer/test/client/fault_inject/fault_inject_test.go  |  3 +++
 .../authn_report_test.go                             |  6 ++++++
 .../authn_report_test.go                             |  6 ++++++
 .../authn_report_test.go                             |  6 ++++++
 mixer/test/client/report_batch/report_batch_test.go  |  9 +++++++++
 mixer/test/client/tcp_filter/tcp_filter_test.go      | 12 ++++++++++++
 .../tcp_filter_periodical_report_test.go             |  9 +++++++++
 15 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/istio.deps b/istio.deps
index d2ce13481c7f..df5348e1dce6 100644
--- a/istio.deps
+++ b/istio.deps
@@ -4,6 +4,6 @@
 		"name": "PROXY_REPO_SHA",
 		"repoName": "proxy",
 		"file": "",
-		"lastStableSHA": "a35b8f44b78439c3beeb2d3e805ab6b991d14f24"
+		"lastStableSHA": "f49833732cab7e6f249760d1ec9d3ec19d19fe2c"
 	}
 ]
diff --git a/mixer/test/client/check_cache_hit/check_cache_hit_test.go b/mixer/test/client/check_cache_hit/check_cache_hit_test.go
index 6969d7e6df2d..da1460e49b0b 100644
--- a/mixer/test/client/check_cache_hit/check_cache_hit_test.go
+++ b/mixer/test/client/check_cache_hit/check_cache_hit_test.go
@@ -26,6 +26,7 @@ import (
 const checkAttributesOkGet = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -38,6 +39,8 @@ const checkAttributesOkGet = `
   "request.url_path": "/echo",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -61,6 +64,7 @@ const checkAttributesOkGet = `
 var reportAttributesOkGet = [...]string{`{
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -75,6 +79,8 @@ var reportAttributesOkGet = [...]string{`{
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -108,6 +114,7 @@ var reportAttributesOkGet = [...]string{`{
 	`{
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -122,6 +129,8 @@ var reportAttributesOkGet = [...]string{`{
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/check_report/check_report_test.go b/mixer/test/client/check_report/check_report_test.go
index a73214b3c6b4..d76c43be50f5 100644
--- a/mixer/test/client/check_report/check_report_test.go
+++ b/mixer/test/client/check_report/check_report_test.go
@@ -25,6 +25,7 @@ import (
 const checkAttributesOkGet = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -37,6 +38,8 @@ const checkAttributesOkGet = `
   "request.url_path": "/echo",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -59,6 +62,7 @@ const reportAttributesOkGet = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -73,6 +77,8 @@ const reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -109,6 +115,7 @@ const reportAttributesOkGet = `
 const checkAttributesOkPost = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -121,6 +128,8 @@ const checkAttributesOkPost = `
   "request.url_path": "/echo",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -143,6 +152,7 @@ const reportAttributesOkPost = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -157,6 +167,8 @@ const reportAttributesOkPost = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/check_report_large_post_request/check_report_large_post_request_test.go b/mixer/test/client/check_report_large_post_request/check_report_large_post_request_test.go
index e829fc10e8f8..3e3f1e30b883 100644
--- a/mixer/test/client/check_report_large_post_request/check_report_large_post_request_test.go
+++ b/mixer/test/client/check_report_large_post_request/check_report_large_post_request_test.go
@@ -25,6 +25,7 @@ import (
 const checkAttributesOkPost = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "request.host": "*",
@@ -34,6 +35,8 @@ const checkAttributesOkPost = `
   "request.method": "POST",
   "request.scheme": "http",
   "request.url_path": "/echo",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -56,6 +59,7 @@ const reportAttributesOkPost = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "request.host": "*",
@@ -67,6 +71,8 @@ const reportAttributesOkPost = `
   "request.url_path": "/echo",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go b/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go
index 7872ef1a4d21..cea1b3ec36e0 100644
--- a/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go
+++ b/mixer/test/client/disable_tcp_check_calls/disable_tcp_check_calls_test.go
@@ -26,12 +26,15 @@ const reportAttributesOkPostOpen = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "connection.received.bytes": "*",
@@ -46,12 +49,15 @@ const reportAttributesOkPostClose = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "connection.received.bytes": "*",
diff --git a/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go b/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go
index 23d1cfe899b9..8354d24bfcc9 100644
--- a/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go
+++ b/mixer/test/client/dynamic_attribute/dynamic_attribute_test.go
@@ -120,9 +120,9 @@ static_resources:
 // Report attributes from a good GET request
 const reportAttributesOkGet = `
 {
-  "destination.uid": "pod1.ns2",
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "request.host": "*",
@@ -134,6 +134,8 @@ const reportAttributesOkGet = `
   "request.url_path": "/echo",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "pod1.ns2",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/dynamic_listener/dynamic_listener_test.go b/mixer/test/client/dynamic_listener/dynamic_listener_test.go
index 18d82030544f..553b7fd31506 100644
--- a/mixer/test/client/dynamic_listener/dynamic_listener_test.go
+++ b/mixer/test/client/dynamic_listener/dynamic_listener_test.go
@@ -86,6 +86,7 @@ static_resources:
 // Check attributes from a good GET request
 const checkAttributesOkGet = `
 {
+  "context.reporter.uid": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "context.protocol": "http",
@@ -98,6 +99,8 @@ const checkAttributesOkGet = `
   "request.method": "GET",
   "request.scheme": "http",
   "request.url_path": "/echo",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.namespace": "XYZ222",
   "target.uid": "POD222",
   "request.headers": {
diff --git a/mixer/test/client/failed_request/failed_request_test.go b/mixer/test/client/failed_request/failed_request_test.go
index ae51ef19583b..7fd57bbcd968 100644
--- a/mixer/test/client/failed_request/failed_request_test.go
+++ b/mixer/test/client/failed_request/failed_request_test.go
@@ -31,6 +31,7 @@ const (
 const checkAttributesMixerFail = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -43,6 +44,8 @@ const checkAttributesMixerFail = `
   "request.url_path": "/echo",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -67,6 +70,7 @@ const reportAttributesMixerFail = `
   "check.error_message": "UNAUTHENTICATED:Unauthenticated by mixer.",
   "context.protocol": "http",
   "context.proxy_error_code": "UAEX",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -79,6 +83,8 @@ const reportAttributesMixerFail = `
   "request.url_path": "/echo",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -117,6 +123,7 @@ const reportAttributesBackendFail = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -131,6 +138,8 @@ const reportAttributesBackendFail = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/fault_inject/fault_inject_test.go b/mixer/test/client/fault_inject/fault_inject_test.go
index ce0188e57289..4f32e3ecd012 100644
--- a/mixer/test/client/fault_inject/fault_inject_test.go
+++ b/mixer/test/client/fault_inject/fault_inject_test.go
@@ -26,6 +26,7 @@ const reportAttributes = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "FI",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -37,6 +38,8 @@ const reportAttributes = `
   "request.scheme": "http",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/istio_authn_origin_jwt_bound_origin/authn_report_test.go b/mixer/test/client/istio_authn_origin_jwt_bound_origin/authn_report_test.go
index 030220769478..abd203bec575 100644
--- a/mixer/test/client/istio_authn_origin_jwt_bound_origin/authn_report_test.go
+++ b/mixer/test/client/istio_authn_origin_jwt_bound_origin/authn_report_test.go
@@ -49,6 +49,7 @@ const secIstioAuthUserinfoHeaderValue = `{"aud":"aud1","exp":20000000000,` +
 var checkAttributesOkGet = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -60,6 +61,8 @@ var checkAttributesOkGet = `
   "request.scheme": "http",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -92,6 +95,7 @@ var reportAttributesOkGet = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -105,6 +109,8 @@ var reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/istio_authn_origin_jwt_bound_peer/authn_report_test.go b/mixer/test/client/istio_authn_origin_jwt_bound_peer/authn_report_test.go
index bd8b0269c62c..df6275bf5afd 100644
--- a/mixer/test/client/istio_authn_origin_jwt_bound_peer/authn_report_test.go
+++ b/mixer/test/client/istio_authn_origin_jwt_bound_peer/authn_report_test.go
@@ -48,6 +48,7 @@ const secIstioAuthUserinfoHeaderValue = `{"aud":"aud1","exp":20000000000,` +
 var checkAttributesOkGet = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -59,6 +60,8 @@ var checkAttributesOkGet = `
   "request.scheme": "http",
   "source.uid": "POD11",
   "source.namespace": "XYZ11",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -90,6 +93,7 @@ var reportAttributesOkGet = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -103,6 +107,8 @@ var reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/istio_authn_peer_jwt_bound_peer/authn_report_test.go b/mixer/test/client/istio_authn_peer_jwt_bound_peer/authn_report_test.go
index c33ec508e7a2..7e0e81f1223a 100644
--- a/mixer/test/client/istio_authn_peer_jwt_bound_peer/authn_report_test.go
+++ b/mixer/test/client/istio_authn_peer_jwt_bound_peer/authn_report_test.go
@@ -49,6 +49,7 @@ const secIstioAuthUserinfoHeaderValue = `{"aud":"aud1","exp":20000000000,` +
 var checkAttributesOkGet = `
 {
   "context.protocol": "http",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -62,6 +63,8 @@ var checkAttributesOkGet = `
   "source.namespace": "XYZ11",
   "source.principal": "issuer@foo.com/sub@foo.com",
   "source.user": "issuer@foo.com/sub@foo.com",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -94,6 +97,7 @@ var reportAttributesOkGet = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -109,6 +113,8 @@ var reportAttributesOkGet = `
   "source.user": "issuer@foo.com/sub@foo.com",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/report_batch/report_batch_test.go b/mixer/test/client/report_batch/report_batch_test.go
index 559dcab0d26b..aa5fc7755e4b 100644
--- a/mixer/test/client/report_batch/report_batch_test.go
+++ b/mixer/test/client/report_batch/report_batch_test.go
@@ -26,6 +26,7 @@ const reportAttributesOkGet = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -40,6 +41,8 @@ const reportAttributesOkGet = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -78,6 +81,7 @@ const reportAttributesOkPost1 = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -92,6 +96,8 @@ const reportAttributesOkPost1 = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
@@ -131,6 +137,7 @@ const reportAttributesOkPost2 = `
 {
   "context.protocol": "http",
   "context.proxy_error_code": "-",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "mesh2.ip": "[0 0 0 0 0 0 0 0 0 0 255 255 204 152 189 116]",
   "mesh3.ip": "[0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 8]",
@@ -145,6 +152,8 @@ const reportAttributesOkPost2 = `
   "source.namespace": "XYZ11",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.name": "target-name",
   "target.user": "target-user",
   "target.uid": "POD222",
diff --git a/mixer/test/client/tcp_filter/tcp_filter_test.go b/mixer/test/client/tcp_filter/tcp_filter_test.go
index 14f8349f599e..0dd9561d499b 100644
--- a/mixer/test/client/tcp_filter/tcp_filter_test.go
+++ b/mixer/test/client/tcp_filter/tcp_filter_test.go
@@ -28,8 +28,11 @@ const checkAttributesOkPost = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
+  "destination.uid": "",
+  "destination.namespace": "",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "connection.mtls": false,
@@ -43,12 +46,15 @@ const reportAttributesOkPostOpen = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "check.cache_hit": false,
@@ -65,12 +71,15 @@ const reportAttributesOkPostClose = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "check.cache_hit": false,
@@ -90,6 +99,7 @@ const reportAttributesFailPost = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "*",
   "target.uid": "POD222",
@@ -102,6 +112,8 @@ const reportAttributesFailPost = `
   "connection.received.bytes_total": "*",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.sent.bytes": 0,
   "connection.sent.bytes_total": 0,
   "connection.duration": "*",
diff --git a/mixer/test/client/tcp_filter_periodical_report/tcp_filter_periodical_report_test.go b/mixer/test/client/tcp_filter_periodical_report/tcp_filter_periodical_report_test.go
index ed40b14c6094..406470570410 100644
--- a/mixer/test/client/tcp_filter_periodical_report/tcp_filter_periodical_report_test.go
+++ b/mixer/test/client/tcp_filter_periodical_report/tcp_filter_periodical_report_test.go
@@ -26,12 +26,15 @@ const openReportAttributesOkPost = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "check.cache_hit": false,
@@ -48,12 +51,15 @@ const deltaReportAttributesOkPost = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "check.cache_hit": false,
@@ -70,12 +76,15 @@ const finalReportAttributesOkPost = `
 {
   "context.protocol": "tcp",
   "context.time": "*",
+  "context.reporter.uid": "",
   "mesh1.ip": "[1 1 1 1]",
   "source.ip": "[127 0 0 1]",
   "target.uid": "POD222",
   "target.namespace": "XYZ222",
   "destination.ip": "[127 0 0 1]",
   "destination.port": "*",
+  "destination.uid": "",
+  "destination.namespace": "",
   "connection.mtls": false,
   "origin.ip": "[127 0 0 1]",
   "check.cache_hit": false,