Fix tcp telemetry for service-oriented waypoints #5968

keithmattix · 2024-11-30T21:51:10Z

What this PR does / why we need it:
The metadata_exchange filter only looks at downstream metadata; this PR configures it to check upstream metadata and store it in filter state (with the appropriate key) if it exists. Note that workload oriented waypoints are still broken because those endpoints have no metadata. /cc @howardjohn on where to make the control plane adjustments there.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): part of istio/istio#53593

Special notes for your reviewer:
Replaces #5963 for adding a compdb script; if you want to review #5963 on its own; I'll rebase this PR once that one is done.

source/extensions/filters/network/metadata_exchange/config/metadata_exchange.pb.html

zirain

LGTM, can you rebase and just keep the core logic in this PR?

cc @howardjohn @kyessenov

istio-testing · 2024-12-30T03:47:56Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.22":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	test/envoye2e/stats_plugin/stats_test.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/stats_plugin/stats_test.go
Auto-merging test/envoye2e/inventory.go
CONFLICT (content): Merge conflict in test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:47:57Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.24":

Applying: format
Using index info to reconstruct a base tree...
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:47:57Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:47:57Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:48:30Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.23":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:48:30Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:48:30Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.22":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	test/envoye2e/stats_plugin/stats_test.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/stats_plugin/stats_test.go
Auto-merging test/envoye2e/inventory.go
CONFLICT (content): Merge conflict in test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:48:31Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:49:03Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.24":

Applying: format
Using index info to reconstruct a base tree...
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:49:04Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:49:04Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.22":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	test/envoye2e/stats_plugin/stats_test.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/stats_plugin/stats_test.go
Auto-merging test/envoye2e/inventory.go
CONFLICT (content): Merge conflict in test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:49:05Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.23":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:49:05Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:49:05Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:49:38Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.23":

Applying: format
Using index info to reconstruct a base tree...
M	source/extensions/filters/network/metadata_exchange/BUILD
M	source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
M	test/envoye2e/inventory.go
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
Auto-merging test/envoye2e/inventory.go
Auto-merging source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
CONFLICT (content): Merge conflict in source/extensions/filters/network/metadata_exchange/metadata_exchange.cc
Auto-merging source/extensions/filters/network/metadata_exchange/BUILD
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:49:38Z

In response to a cherrypick label: #5968 failed to apply on top of branch "release-1.24":

Applying: format
Using index info to reconstruct a base tree...
M	testdata/testdata.gen.go
Falling back to patching base and 3-way merge...
Auto-merging testdata/testdata.gen.go
CONFLICT (content): Merge conflict in testdata/testdata.gen.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 format

istio-testing · 2024-12-30T03:49:38Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

istio-testing · 2024-12-30T03:49:39Z

In response to a cherrypick label: new issue could not be created for failed cherrypick: status code 410 not one of [201], body: {"message":"Issues are disabled for this repo","documentation_url":"https://docs.github.com/v3/issues/","status":"410"}

keithmattix assigned kyessenov Nov 30, 2024

keithmattix requested a review from a team as a code owner November 30, 2024 21:51

istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 30, 2024

keithmattix assigned zirain Dec 2, 2024

zirain reviewed Dec 14, 2024

View reviewed changes

source/extensions/filters/network/metadata_exchange/config/metadata_exchange.pb.html Outdated Show resolved Hide resolved

zirain reviewed Dec 16, 2024

View reviewed changes

keithmattix force-pushed the fix-tcp-ambient-metrics branch from 47449a6 to 2750f0f Compare December 26, 2024 22:36

keithmattix mentioned this pull request Dec 26, 2024

Make lint and update docs #6027

Merged

istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Dec 27, 2024

keithmattix force-pushed the fix-tcp-ambient-metrics branch from 2750f0f to 4c1a543 Compare December 27, 2024 19:44

istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Dec 27, 2024

keithmattix force-pushed the fix-tcp-ambient-metrics branch from 4c1a543 to 5024ae9 Compare December 27, 2024 22:32

format

738c6e2

keithmattix force-pushed the fix-tcp-ambient-metrics branch from 5024ae9 to 738c6e2 Compare December 27, 2024 22:34

keithmattix requested a review from zirain December 27, 2024 22:53

zirain approved these changes Dec 30, 2024

View reviewed changes

istio-testing merged commit 1450780 into istio:master Dec 30, 2024
7 checks passed

keithmattix added a commit to keithmattix/proxy that referenced this pull request Dec 31, 2024

format (istio#5968)

a907ab5

This was referenced Dec 31, 2024

[release-1.22] Fix tcp telemetry for service-oriented waypoints #6035

Closed

[release-1.23] Fix tcp telemetry for service-oriented waypoints #6036

Merged

[release-1.24] Fix tcp telemetry for service-oriented waypoints #6037

Merged

keithmattix deleted the fix-tcp-ambient-metrics branch January 16, 2025 19:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tcp telemetry for service-oriented waypoints #5968

Fix tcp telemetry for service-oriented waypoints #5968

keithmattix commented Nov 30, 2024

zirain left a comment

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

Fix tcp telemetry for service-oriented waypoints #5968

Fix tcp telemetry for service-oriented waypoints #5968

Conversation

keithmattix commented Nov 30, 2024

zirain left a comment

Choose a reason for hiding this comment

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024

istio-testing commented Dec 30, 2024