Add missing upstream string formatters #33857

keithmattix · 2024-04-30T00:23:25Z

%UPSTREAM_{PEER,LOCAL}_{URI,DNS,IP}_SAN% were not implemented; add them. Given that we're not too far from when v1.30 was cut, would it be possible to backport this to 1.30?

adisuissa

Thank you for this contribution!
The change in source/common/formatter/stream_info_formatter.cc seems pretty large compared to what this PR should achieve. It seems to be mainly due to a format related change.
Can you make sure that the right formatting tools are used?
/wait

adisuissa · 2024-04-30T12:47:23Z

Given that we're not too far from when v1.22 was cut, would it be possible to backport this to 1.30?

Do you want to backport to v1.30? If so, it is probably possible, and will require a subsequent PR to that release branch.

keithmattix · 2024-04-30T13:11:46Z

Do you want to backport to v1.30? If so, it is probably possible, and will require a subsequent PR to that release branch.

Sure, I'm happy to submit the 1.30 patch

keithmattix · 2024-04-30T13:16:26Z

Thank you for this contribution! The change in source/common/formatter/stream_info_formatter.cc seems pretty large compared to what this PR should achieve. It seems to be mainly due to a format related change. Can you make sure that the right formatting tools are used? /wait

@adisuissa I'm running ./tools/local_fix_format.sh; is there another tool I should be using?

adisuissa · 2024-05-06T17:16:56Z

_format

Can you please try running it using these instructions?

cpakulski · 2024-05-13T15:50:59Z

Quick check why CI failed, and I see:

 [ RUN      ] SubstitutionFormatterTest.streamInfoFormatterWithSsl
                  test/common/formatter/substitution_formatter_test.cc:1861: Failure
                  Expected equality of these values:
                  "san"
                     Which is: 0x22d019
                  upstream_format.formatWithContext({}, stream_info)
                    Which is: (nullopt)

Can you locally run
bazel test //test/common/formatter:substitution_formatter_test

It should fail in your local env as well and should be straightforward to debug why it happens.

cpakulski

Please fix formatting.

source/common/formatter/stream_info_formatter.cc

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

keithmattix · 2024-05-13T21:18:13Z

Looks like a flake in the udp tests?

/retest envoy-presubmit
/retest envoy-presubmit (Checks (Linux x64) Linux x64 compile_time_options)

keithmattix · 2024-05-13T22:08:36Z

@cpakulski @adisuissa thanks for your patience on this review; still learning the ins and outs of the devtools. Formatting and tests should be good to go now!

cpakulski

Formattting is still an issue in source/common/formatter/stream_info_formatter.cc.

source/common/formatter/stream_info_formatter.cc

adisuissa · 2024-05-14T15:21:48Z

/wait

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

adisuissa

Thanks!
Mostly minor comments.
/wait

docs/root/configuration/observability/access_log/usage.rst

source/common/formatter/stream_info_formatter.cc

test/common/formatter/substitution_formatter_test.cc

cpakulski

Looks good. Few minor comments.

test/common/formatter/substitution_formatter_test.cc

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

adisuissa

LGTM, thanks!
/assign-from @envoyproxy/senior-maintainers

repokitteh-read-only · 2024-05-17T15:54:39Z

@envoyproxy/senior-maintainers assignee is @zuercher

🐱

Caused by: a #33857 (review) was submitted by @adisuissa.

see: more, trace.

cpakulski

@keithmattix I think you should also update changelogs/current.yaml.

keithmattix · 2024-05-17T19:19:10Z

@keithmattix I think you should also update changelogs/current.yaml.

Does it need to be something different than what I have here?

cpakulski · 2024-05-17T19:21:25Z

Ah, sorry. I missed it. All good. Thanks!

zuercher · 2024-05-23T00:21:41Z

Sorry this needs a merge. I'll try to keep a better eye on it and get it merged.

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

keithmattix · 2024-05-23T20:34:04Z

No worries @zuercher - it should be caught up now

keithmattix · 2024-05-24T14:57:00Z

/retest envoy-presubmit
/retest envoy-presubmit (Linux arm64 Build and test)

keithmattix · 2024-05-29T22:17:43Z

FYI we found a way around this and don't need to backport

keithmattix force-pushed the stringformat/upstream-peer-uri-san branch from 708d982 to 9a74a55 Compare April 30, 2024 00:36

keithmattix mentioned this pull request Apr 30, 2024

ambient: stash hbone peer principal in endpoint metadata istio/istio#50753

Closed

adisuissa reviewed Apr 30, 2024

View reviewed changes

repokitteh-read-only bot added the waiting label Apr 30, 2024

adisuissa self-assigned this Apr 30, 2024

whitneygriffith mentioned this pull request Apr 30, 2024

Ambient telemetry: implement "waypoint single" approach istio/istio#50225

Closed

cpakulski suggested changes May 13, 2024

View reviewed changes

source/common/formatter/stream_info_formatter.cc Outdated Show resolved Hide resolved

keithmattix force-pushed the stringformat/upstream-peer-uri-san branch from 9a74a55 to 21601e2 Compare May 13, 2024 15:59

repokitteh-read-only bot removed the waiting label May 13, 2024

keithmattix added 3 commits May 13, 2024 18:59

Add URI_PEER_SAN string formatter

0c8331d

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

Fix formatting

e288819

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

Fix broken tests

d3e0eb0

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

keithmattix force-pushed the stringformat/upstream-peer-uri-san branch from 21601e2 to d3e0eb0 Compare May 13, 2024 19:23

keithmattix requested review from cpakulski and adisuissa May 13, 2024 22:08

cpakulski suggested changes May 14, 2024

View reviewed changes

source/common/formatter/stream_info_formatter.cc Outdated Show resolved Hide resolved

repokitteh-read-only bot added the waiting label May 14, 2024

keithmattix added 2 commits May 15, 2024 15:52

Merge main

67560d7

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

Fix format

1a965fd

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

repokitteh-read-only bot removed the waiting label May 15, 2024

Fix formatting once and for all

a65e529

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

keithmattix requested a review from cpakulski May 15, 2024 22:53

adisuissa reviewed May 17, 2024

View reviewed changes

repokitteh-read-only bot added the waiting label May 17, 2024

cpakulski suggested changes May 17, 2024

View reviewed changes

Address PR comments

3aa3e9c

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

repokitteh-read-only bot removed the waiting label May 17, 2024

keithmattix requested review from cpakulski and adisuissa May 17, 2024 15:15

adisuissa previously approved these changes May 17, 2024

View reviewed changes

repokitteh-read-only bot assigned zuercher May 17, 2024

cpakulski reviewed May 17, 2024

View reviewed changes

Merge branch 'main' into stringformat/upstream-peer-uri-san

62e8a3f

Signed-off-by: Keith Mattix II <keithmattix@microsoft.com>

keithmattix dismissed adisuissa’s stale review via 62e8a3f May 23, 2024 20:33

zuercher approved these changes May 29, 2024

View reviewed changes

zuercher added the backport/review Request to backport to stable releases label May 29, 2024

zuercher merged commit 8ce7b46 into envoyproxy:main May 29, 2024
53 checks passed

keithmattix deleted the stringformat/upstream-peer-uri-san branch May 29, 2024 21:29

zuercher removed the backport/review Request to backport to stable releases label May 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add missing upstream string formatters #33857

Add missing upstream string formatters #33857

keithmattix commented Apr 30, 2024 •

edited

Loading

adisuissa left a comment

adisuissa commented Apr 30, 2024

keithmattix commented Apr 30, 2024

keithmattix commented Apr 30, 2024

adisuissa commented May 6, 2024

cpakulski commented May 13, 2024

cpakulski left a comment

keithmattix commented May 13, 2024

keithmattix commented May 13, 2024

cpakulski left a comment

adisuissa commented May 14, 2024

adisuissa left a comment

cpakulski left a comment •

edited

Loading

adisuissa left a comment

repokitteh-read-only bot commented May 17, 2024

cpakulski left a comment

keithmattix commented May 17, 2024

cpakulski commented May 17, 2024

zuercher commented May 23, 2024

keithmattix commented May 23, 2024

keithmattix commented May 24, 2024

keithmattix commented May 29, 2024

Add missing upstream string formatters #33857

Add missing upstream string formatters #33857

Conversation

keithmattix commented Apr 30, 2024 • edited Loading

adisuissa left a comment

Choose a reason for hiding this comment

adisuissa commented Apr 30, 2024

keithmattix commented Apr 30, 2024

keithmattix commented Apr 30, 2024

adisuissa commented May 6, 2024

cpakulski commented May 13, 2024

cpakulski left a comment

Choose a reason for hiding this comment

keithmattix commented May 13, 2024

keithmattix commented May 13, 2024

cpakulski left a comment

Choose a reason for hiding this comment

adisuissa commented May 14, 2024

adisuissa left a comment

Choose a reason for hiding this comment

cpakulski left a comment • edited Loading

Choose a reason for hiding this comment

adisuissa left a comment

Choose a reason for hiding this comment

repokitteh-read-only bot commented May 17, 2024

cpakulski left a comment

Choose a reason for hiding this comment

keithmattix commented May 17, 2024

cpakulski commented May 17, 2024

zuercher commented May 23, 2024

keithmattix commented May 23, 2024

keithmattix commented May 24, 2024

keithmattix commented May 29, 2024

keithmattix commented Apr 30, 2024 •

edited

Loading

cpakulski left a comment •

edited

Loading