-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
formatter: add a formatter that returns a google::protobuf::Struct rather than a string #14258
Conversation
Hi @itamarkam, welcome and thank you for your contribution. We will try to review your Pull Request as quickly as possible. In the meantime, please take a look at the contribution guidelines if you have not done so already. |
@yanavlasov this is a small refactoring, to be used later by the OT logger - I wanted to get the hang of Envoy repo PRs with something relatively simple. If you prefer that I wait with this change and send it together with the actual logger implementation, I'll do that. |
5d1bd72
to
94d03ab
Compare
5c04629
to
784528a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! This is just a quick initial pass.
accf9cb
to
5da219b
Compare
CC @envoyproxy/api-shepherds: Your approval is needed for changes made to |
5da219b
to
5d1bd72
Compare
… wrapper that generates a string Signed-off-by: Itamar Kaminski <itamark@google.com>
Signed-off-by: Itamar Kaminski <itamark@google.com> Delete some leftovers Signed-off-by: Itamar Kaminski <itamark@google.com> Delete some leftovers Signed-off-by: Itamar Kaminski <itamark@google.com> clang-format Signed-off-by: Itamar Kaminski <itamark@google.com> Revert "clang-format" This reverts commit 4576bc86fdb8baa2f161bde2dbdd7871169f725f. Signed-off-by: Itamar Kaminski <itamark@google.com> Fix error message formatting test Fix clang-tidy Signed-off-by: Itamar Kaminski <itamark@google.com> Fix clang tidy again Signed-off-by: Itamar Kaminski <itamark@google.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Some small comments, but otherwise looks good.
}; | ||
|
||
bool omit_empty_values_; | ||
bool preserve_types_; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think these bools can be const as well.
I think this was tagged for API remove accidentally so I'm removing myself. |
LGTM modulo @zuercher comments. |
Signed-off-by: Itamar Kaminski <itamark@google.com>
Signed-off-by: Itamar Kaminski <itamark@google.com>
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
* master: (49 commits) sds: allow multiple init managers share sds target (envoyproxy#14357) [http] Remove legacy codecs (envoyproxy#14381) http2: Add integration tests for METADATA and RST_STREAM frame flood mitigation for upstream servers (envoyproxy#14365) test: start dissolving :printers_include rule. (envoyproxy#14429) integration tests: re-enable set_node_on_first_message_only (envoyproxy#14270) formatter: add a formatter that returns a google::protobuf::Struct rather than a string (envoyproxy#14258) ratelimit: support returning custom response bodies for non-OK responses from the external ratelimit service (envoyproxy#14189) deps: update protobuf to 3.14 (envoyproxy#14253) stream_info: add setResponseCode and update local_reply to take a normal StreamInfo (envoyproxy#14402) http: alpn upstream (envoyproxy#13922) Moved starttls integration test to test/extensions/transport_sockets/starttls. (envoyproxy#14425) generic conn pool: directly use thread local cluster (envoyproxy#14423) wasm: add mathetake to CODEOWNERS (envoyproxy#14427) wasm: clear route cache when modifying HTTP request headers. (envoyproxy#14318) tls: disable TLS inspector injection (envoyproxy#14404) aggregate cluster: cleanups (envoyproxy#14411) Mark starttls_integration_test flaky on Windows (envoyproxy#14419) tcp: improved unit testing (envoyproxy#14415) config: making protocol config explicit (envoyproxy#14362) wasm: dead code (envoyproxy#14407) ... Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Commit Message: add a formatter that returns google::protobuf::Struct rather than a string
Additional Description: the logic was already implemented in the JSON (string) formatter, which created a formatted struct and converted it into a string. The JSON formatter was split into the aforementioned Struct formatter, and a wrapper that converts the struct into a string. Note that the new formatter is still not used anywhere (will be in the OTLP logger)
Risk Level: Low (refactoring)
Testing: Unit tests (JSON formatter tests were converted to Struct formatter tests and a simpler test was added to the JSON formatter).
Docs Changes: None
Release Notes: None
Platform Specific Features: None
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]
@omriz @yanavlasov @htuch @edrukh