Skip to content

Commit b7faa70

Browse files
authored
tap: add headers to tap events (#348)
PR linkerd/linkerd2-proxy-api#33 adds headers to the `RequestInit`, `ResponseInit`, and `ResponseEnd` tap events. This branch updates the proxy to populate these fields. This updates the proxy-api dependency to the tag `v0.1.10`, or linkerd/linkerd2-proxy-api@34ab9c8 Signed-off-by: Eliza Weisman <[email protected]>
1 parent b8eba26 commit b7faa70

File tree

7 files changed

+194
-39
lines changed

7 files changed

+194
-39
lines changed

Cargo.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ dependencies = [
557557
"linkerd2-metrics 0.1.0",
558558
"opencensus-proto 0.1.0",
559559
"tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
560-
"tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
560+
"tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
561561
"tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
562562
]
563563

@@ -586,7 +586,7 @@ dependencies = [
586586
"linkerd2-identity 0.1.0",
587587
"linkerd2-metrics 0.1.0",
588588
"linkerd2-opencensus 0.1.0",
589-
"linkerd2-proxy-api 0.1.8 (git+https://github.com/linkerd/linkerd2-proxy-api?rev=ddbc3a4f7f8b0058801f896d27974d19ee98094c)",
589+
"linkerd2-proxy-api 0.1.10 (git+https://github.com/linkerd/linkerd2-proxy-api?tag=v0.1.10)",
590590
"linkerd2-proxy-api-resolve 0.1.0",
591591
"linkerd2-proxy-core 0.1.0",
592592
"linkerd2-proxy-discover 0.1.0",
@@ -619,7 +619,7 @@ dependencies = [
619619
"tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
620620
"tower-balance 0.1.0 (git+https://github.com/tower-rs/tower)",
621621
"tower-discover 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
622-
"tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
622+
"tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
623623
"tower-load 0.1.0 (git+https://github.com/tower-rs/tower)",
624624
"tower-request-modifier 0.1.0 (git+https://github.com/tower-rs/tower-http)",
625625
"tower-service 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -637,8 +637,8 @@ dependencies = [
637637

638638
[[package]]
639639
name = "linkerd2-proxy-api"
640-
version = "0.1.8"
641-
source = "git+https://github.com/linkerd/linkerd2-proxy-api?rev=ddbc3a4f7f8b0058801f896d27974d19ee98094c#ddbc3a4f7f8b0058801f896d27974d19ee98094c"
640+
version = "0.1.10"
641+
source = "git+https://github.com/linkerd/linkerd2-proxy-api?tag=v0.1.10#34ab9c848f2cadb6d3e9dc47cca5b1c36adcd59f"
642642
dependencies = [
643643
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
644644
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -648,8 +648,8 @@ dependencies = [
648648
"prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
649649
"quickcheck 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
650650
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
651-
"tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
652-
"tower-grpc-build 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
651+
"tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
652+
"tower-grpc-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
653653
]
654654

655655
[[package]]
@@ -659,12 +659,12 @@ dependencies = [
659659
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
660660
"indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
661661
"linkerd2-identity 0.1.0",
662-
"linkerd2-proxy-api 0.1.8 (git+https://github.com/linkerd/linkerd2-proxy-api?rev=ddbc3a4f7f8b0058801f896d27974d19ee98094c)",
662+
"linkerd2-proxy-api 0.1.10 (git+https://github.com/linkerd/linkerd2-proxy-api?tag=v0.1.10)",
663663
"linkerd2-proxy-core 0.1.0",
664664
"prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
665665
"tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
666666
"tower 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
667-
"tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
667+
"tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
668668
"tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
669669
]
670670

@@ -968,8 +968,8 @@ dependencies = [
968968
"prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
969969
"prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
970970
"tokio 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
971-
"tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
972-
"tower-grpc-build 0.1.0 (git+https://github.com/tower-rs/tower-grpc)",
971+
"tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
972+
"tower-grpc-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
973973
]
974974

975975
[[package]]
@@ -1701,7 +1701,7 @@ dependencies = [
17011701
[[package]]
17021702
name = "tower-grpc"
17031703
version = "0.1.0"
1704-
source = "git+https://github.com/tower-rs/tower-grpc#e16ff614088624bc7fd3783ce9f055c40a7ecd50"
1704+
source = "registry+https://github.com/rust-lang/crates.io-index"
17051705
dependencies = [
17061706
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
17071707
"bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1719,7 +1719,7 @@ dependencies = [
17191719
[[package]]
17201720
name = "tower-grpc-build"
17211721
version = "0.1.0"
1722-
source = "git+https://github.com/tower-rs/tower-grpc#e16ff614088624bc7fd3783ce9f055c40a7ecd50"
1722+
source = "registry+https://github.com/rust-lang/crates.io-index"
17231723
dependencies = [
17241724
"codegen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
17251725
"heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2236,7 +2236,7 @@ dependencies = [
22362236
"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
22372237
"checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047"
22382238
"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
2239-
"checksum linkerd2-proxy-api 0.1.8 (git+https://github.com/linkerd/linkerd2-proxy-api?rev=ddbc3a4f7f8b0058801f896d27974d19ee98094c)" = "<none>"
2239+
"checksum linkerd2-proxy-api 0.1.10 (git+https://github.com/linkerd/linkerd2-proxy-api?tag=v0.1.10)" = "<none>"
22402240
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
22412241
"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
22422242
"checksum matchers 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
@@ -2330,8 +2330,8 @@ dependencies = [
23302330
"checksum tower-balance 0.1.0 (git+https://github.com/tower-rs/tower)" = "<none>"
23312331
"checksum tower-buffer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c98a7784e6c8ba106bc98d44ed1dbb9c018a8e0322e5e894d365f9020967128"
23322332
"checksum tower-discover 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73a7632286f78164d65d18fd0e570307acde9362489aa5c8c53e6315cc2bde47"
2333-
"checksum tower-grpc 0.1.0 (git+https://github.com/tower-rs/tower-grpc)" = "<none>"
2334-
"checksum tower-grpc-build 0.1.0 (git+https://github.com/tower-rs/tower-grpc)" = "<none>"
2333+
"checksum tower-grpc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "839c195fd6e4e87442e7a631ea62632799695a3f897949192325a4e509ff4328"
2334+
"checksum tower-grpc-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8862053a26bc7b901cf52bca8ae7d4c2e041222673e38f81a475aeb6c82481df"
23352335
"checksum tower-layer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ddf07e10c07dcc8f41da6de036dc66def1a85b70eb8a385159e3908bb258328"
23362336
"checksum tower-limit 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "09d3d0fe82c2373225025d50881794e0792e544df9752dec66288b644b40fbfe"
23372337
"checksum tower-load 0.1.0 (git+https://github.com/tower-rs/tower)" = "<none>"

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ linkerd2-timeout = { path = "lib/linkerd2-timeout" }
6363
linkerd2-trace-context = { path = "lib/linkerd2-trace-context" }
6464
opencensus-proto = { path = "lib/opencensus-proto" }
6565

66-
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", rev = "ddbc3a4f7f8b0058801f896d27974d19ee98094c" }
66+
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
6767

6868
bytes = "0.4"
6969
futures = "0.1"
@@ -95,7 +95,7 @@ tower-balance = { git = "https://github.com/tower-rs/tower" }
9595
tower-load = { git = "https://github.com/tower-rs/tower" }
9696
tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" }
9797
tower-spawn-ready = { git = "https://github.com/tower-rs/tower" }
98-
tower-grpc = { git = "https://github.com/tower-rs/tower-grpc", default-features = false, features = ["protobuf"] }
98+
tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"] }
9999

100100
# FIXME update to a release when available (>0.11)
101101
trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", rev = "7c8a0739dad495bf5a4fddfe86b8bbe2aa52d060", default-features = false }
@@ -127,7 +127,7 @@ net2 = "0.2"
127127
quickcheck = { version = "0.8", default-features = false }
128128
linkerd2-metrics = { path = "./lib/linkerd2-metrics", features = ["test_util"] }
129129
linkerd2-task = { path = "lib/linkerd2-task", features = ["test_util"] }
130-
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], rev = "ddbc3a4f7f8b0058801f896d27974d19ee98094c" }
130+
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", features = ["arbitrary"], tag = "v0.1.10" }
131131
flate2 = { version = "1.0.1", default-features = false, features = ["rust_backend"] }
132132
# `tokio-io` is needed for TCP tests, because `tokio::io` doesn't re-export
133133
# the `read` function.

lib/linkerd2-opencensus/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ linkerd2-error = { path = "../linkerd2-error" }
1111
linkerd2-metrics = { path = "../linkerd2-metrics" }
1212
opencensus-proto = { path = "../opencensus-proto" }
1313
tokio = "0.1"
14-
tower-grpc = { git = "https://github.com/tower-rs/tower-grpc", default-features = false, features = ["protobuf"] }
14+
tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"] }
1515
tracing = "0.1"

lib/linkerd2-proxy-api-resolve/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ publish = false
88
[dependencies]
99
futures = "0.1"
1010
linkerd2-identity = { path = "../linkerd2-identity" }
11-
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", rev = "ddbc3a4f7f8b0058801f896d27974d19ee98094c" }
11+
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.10" }
1212
linkerd2-proxy-core = { path = "../linkerd2-proxy-core" }
1313
prost = "0.5.0"
14-
tower-grpc = { git = "https://github.com/tower-rs/tower-grpc", default-features = false, features = ["protobuf"] }
14+
tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"] }
1515
indexmap = "1.0"
1616
tokio-sync = "0.1"
1717
tower = "0.1"

lib/opencensus-proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ futures = "0.1"
1111
prost = "0.5.0"
1212
prost-types = "0.5.0"
1313
tokio = "0.1.14"
14-
tower-grpc = { git = "https://github.com/tower-rs/tower-grpc", default-features = false, features = ["protobuf"] }
14+
tower-grpc = { version = "0.1", default-features = false, features = ["protobuf"] }
1515

1616
[build-dependencies]
17-
tower-grpc-build = { git = "https://github.com/tower-rs/tower-grpc", default-features = false }
17+
tower-grpc-build = { version = "0.1", default-features = false }
1818

0 commit comments

Comments
 (0)