Skip to content

stats(native): use SAN namespace by default#4117

Merged
istio-testing merged 3 commits intoistio:masterfrom
kyessenov:namespace_fallback
Oct 18, 2022
Merged

stats(native): use SAN namespace by default#4117
istio-testing merged 3 commits intoistio:masterfrom
kyessenov:namespace_fallback

Conversation

@kyessenov
Copy link
Contributor

@kyessenov kyessenov commented Oct 17, 2022 •
edited
Loading

Signed-off-by: Kuat Yessenov kuat@google.com

Make workload metadata namespace optional by parsing SAN first.

@kyessenov
stats(native): use SAN namespace by default
060e893 
Signed-off-by: Kuat Yessenov <kuat@google.com>
@kyessenov kyessenov requested a review from a team October 17, 2022 22:15
@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 17, 2022
@kyessenov
Copy link
Contributor Author

kyessenov commented Oct 18, 2022

/retest

@zirain
Copy link
Member

zirain commented Oct 18, 2022

/test test

@kyessenov
Copy link
Contributor Author

kyessenov commented Oct 18, 2022

/retest

1 similar comment
@kyessenov
Copy link
Contributor Author

kyessenov commented Oct 18, 2022

/retest

@zirain
Copy link
Member

zirain commented Oct 18, 2022

/test test

@kyessenov
Copy link
Contributor Author

kyessenov commented Oct 18, 2022

/retest

2 similar comments
@kyessenov
Copy link
Contributor Author

kyessenov commented Oct 18, 2022

/retest

@zirain
Copy link
Member

zirain commented Oct 18, 2022

/retest

@kyessenov
merge fix
29a1414 
Signed-off-by: Kuat Yessenov <kuat@google.com>
@kyessenov
format
b79a53b 
Signed-off-by: Kuat Yessenov <kuat@google.com>
@istio-testing istio-testing merged commit ecd9b55 into istio:master Oct 18, 2022
@kyessenov kyessenov deleted the namespace_fallback branch October 18, 2022 17:41
@kyessenov kyessenov added the cherrypick/release-1.16 Set this label on a PR to auto-merge it to the release-1.16 branch label Oct 20, 2022
@istio-testing
Copy link
Collaborator

istio-testing commented Oct 20, 2022

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

Applying: stats(native): use SAN namespace by default
Using index info to reconstruct a base tree...
M	source/extensions/filters/http/istio_stats/istio_stats.cc
Falling back to patching base and 3-way merge...
Removing src/istio/utils/utils_test.cc
Removing src/istio/utils/utils.h
Removing src/istio/utils/utils.cc
Auto-merging source/extensions/filters/http/istio_stats/istio_stats.cc
CONFLICT (content): Merge conflict in source/extensions/filters/http/istio_stats/istio_stats.cc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 stats(native): use SAN namespace by default
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

istio-testing commented Oct 20, 2022

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/"}

@kyessenov kyessenov added cherrypick/release-1.16 Set this label on a PR to auto-merge it to the release-1.16 branch and removed cherrypick/release-1.16 Set this label on a PR to auto-merge it to the release-1.16 branch labels Oct 20, 2022
@istio-testing
Copy link
Collaborator

istio-testing commented Oct 20, 2022

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

Applying: stats(native): use SAN namespace by default
Using index info to reconstruct a base tree...
M	source/extensions/filters/http/istio_stats/istio_stats.cc
Falling back to patching base and 3-way merge...
Removing src/istio/utils/utils_test.cc
Removing src/istio/utils/utils.h
Removing src/istio/utils/utils.cc
Auto-merging source/extensions/filters/http/istio_stats/istio_stats.cc
CONFLICT (content): Merge conflict in source/extensions/filters/http/istio_stats/istio_stats.cc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 stats(native): use SAN namespace by default
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

istio-testing commented Oct 20, 2022

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/"}

kyessenov added a commit to kyessenov/proxy that referenced this pull request Oct 20, 2022
@kyessenov
stats(native): use SAN namespace by default (istio#4117)
0ad2c99 
* stats(native): use SAN namespace by default

Signed-off-by: Kuat Yessenov <kuat@google.com>

* format

Signed-off-by: Kuat Yessenov <kuat@google.com>

Signed-off-by: Kuat Yessenov <kuat@google.com>
istio-testing pushed a commit that referenced this pull request Oct 21, 2022
@kyessenov
stats(native) cherrypicks (#4130)
f302a1d 
* stats(native): use SAN namespace by default (#4117)

* stats(native): use SAN namespace by default

Signed-off-by: Kuat Yessenov <kuat@google.com>

* format

Signed-off-by: Kuat Yessenov <kuat@google.com>

Signed-off-by: Kuat Yessenov <kuat@google.com>

* workload metadata: harden parsing (#4120)

* workload metadata: harden parsing

Signed-off-by: Kuat Yessenov <kuat@google.com>

* fix test

Signed-off-by: Kuat Yessenov <kuat@google.com>

* fix test

Signed-off-by: Kuat Yessenov <kuat@google.com>

Signed-off-by: Kuat Yessenov <kuat@google.com>

* stats(native): fixes to align with wasm stats (#4125)

* fixes

Signed-off-by: Kuat Yessenov <kuat@google.com>

* handle all wasm properties

Signed-off-by: Kuat Yessenov <kuat@google.com>

Signed-off-by: Kuat Yessenov <kuat@google.com>

Signed-off-by: Kuat Yessenov <kuat@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lei-tang lei-tang lei-tang approved these changes

Assignees

@lei-tang lei-tang

Labels

cherrypick/release-1.16 Set this label on a PR to auto-merge it to the release-1.16 branch size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kyessenov @zirain @istio-testing @lei-tang