merge latest upstream main #11
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Shrink emailservice base image, to python:3.13.0-alpine
* Update SHA256 hash
* Use AMD image instead of ARM
* Update commands in Dockerfile for alpine
* Downgrade to Python 3.12
I got the following error:
Building wheels for collected packages: google-cloud-profiler, grpcio, markupsafe
Building wheel for google-cloud-profiler (pyproject.toml): started
Building wheel for google-cloud-profiler (pyproject.toml): finished with status 'error'
error: subprocess-exited-with-error
× Building wheel for google-cloud-profiler (pyproject.toml) did not run successfully.
│ exit code: 1
╰─> [59 lines of output]
running bdist_wheel
See https://github.com/GoogleCloudPlatform/microservices-demo/actions/runs/12034390461/job/33550847022?pr=2813.
This is because of an incompatibility between the google-cloud-profiler library and Python 3.13.
* Added param to configure locust user spawn rate * Rate parameter in helm * Added rate to kustomize base and template
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.30.0 to 0.31.0. - [Commits](golang/crypto@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2827) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.31.0. - [Commits](golang/crypto@v0.29.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Shrink recommendationservice base image to python:3.12.8-alpine * Remove comment in Dockerfile * Remove comment in Dockerfile * Remove extra dependencies Dockerfile
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google.golang.org/protobuf](https://redirect.github.com/protocolbuffers/protobuf-go) | `v1.36.4` -> `v1.36.5` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>protocolbuffers/protobuf-go (google.golang.org/protobuf)</summary> ### [`v1.36.5`](https://redirect.github.com/protocolbuffers/protobuf-go/releases/tag/v1.36.5) [Compare Source](https://redirect.github.com/protocolbuffers/protobuf-go/compare/v1.36.4...v1.36.5) **Full Changelog**: https://togithub.com/protocolbuffers/protobuf-go/compare/v1.36.4...v1.36.5 Bug fixes: [CL/644437](https://go-review.googlesource.com/c/protobuf/+/644437): protogen: fix name mangling for fields with identical GoCamelCase Maintenance: [CL/641655](https://go-review.googlesource.com/c/protobuf/+/641655): all: remove weak field support </details> --- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * 1" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/GoogleCloudPlatform/microservices-demo). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNjQuMSIsInVwZGF0ZWRJblZlciI6IjM5LjE2NC4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJsYW5nOiBnbyJdfQ==-->
…protos to v2.51.0 (#2898)
Bumps [cryptography](https://github.com/pyca/cryptography) from 44.0.0 to 44.0.1. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](pyca/cryptography@44.0.0...44.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [python-json-logger](https://redirect.github.com/nhairs/python-json-logger) | `==3.2.1` -> `==3.3.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>nhairs/python-json-logger (python-json-logger)</summary> ### [`v3.3.0`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.3.0): 3.3.0 [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v3.2.1...v3.3.0) ##### Added - `exc_info_as_array` and `stack_info_as_array` options are added to `pythonjsonlogger.core.BaseJsonFormatter` allowing both to be encoded as list of lines instead of a single multi-line string. [#​35](https://redirect.github.com/nhairs/python-json-logger/issues/35) ##### Security - Remove `msgspec-python313-pre` from `dev` dependencies preventing potential RCE. Details: [GHSA-wmxh-pxcx-9w24](https://redirect.github.com/nhairs/python-json-logger/security/advisories/GHSA-wmxh-pxcx-9w24#advisory-comment-121307) Thanks [@​1hakusai1](https://redirect.github.com/1hakusai1) and [@​omnigodz](https://redirect.github.com/omnigodz) ### [`v3.2.1`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.2.1): 3.2.1 [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v3.2.0...v3.2.1) ##### Fixed - Import error on `import pythonjsonlogger.jsonlogger` [#​29](https://redirect.github.com/nhairs/python-json-logger/issues/29) ### [`v3.2.0`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.2.0): 3.2.0 [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v3.1.0...v3.2.0) ##### Changed - `pythonjsonlogger.[ORJSON,MSGSPEC]_AVAILABLE` no longer imports the respective package when determining availability. - `pythonjsonlogger.[orjson,msgspec]` now throws a `pythonjsonlogger.exception.MissingPackageError` when required libraries are not available. These contain more information about what is missing whilst still being an `ImportError`. - `defaults` parameter is no longer ignored and now conforms to the standard library. Setting a defaults dictionary will add the specified keys if the those keys do not exist in a record or weren't passed by the `extra` parameter when logging a message. - `typing_extensions` is only installed on Python version < 3.10. - Support Python 3.13 - `msgspec` has only been tested against pre-release versions. Thanks [@​cjwatson](https://redirect.github.com/cjwatson) and [@​bharel](https://redirect.github.com/bharel) ### [`v3.1.0`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.1.0) [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v3.0.1...v3.1.0) This splits common funcitonality out to allow supporting other JSON encoders. Although this is a large refactor, backwards compatibility has been maintained. ##### Added - `pythonjsonlogger.core` - more details below. - `pythonjsonlogger.defaults` module that provides many functions for handling unsupported types. - Orjson encoder support via `pythonjsonlogger.orjson.OrjsonFormatter` with the following additions: - bytes are URL safe base64 encoded. - Exceptions are "pretty printed" using the exception name and message e.g. `"ValueError: bad value passed"` - Enum values use their value, Enum classes now return all values as a list. - Tracebacks are supported - Classes (aka types) are support - Will fallback on `__str__` if available, else `__repr__` if available, else will use `__could_not_encode__` - MsgSpec encoder support via `pythonjsonlogger.msgspec.MsgspecFormatter` with the following additions: - Exceptions are "pretty printed" using the exception name and message e.g. `"ValueError: bad value passed"` - Enum classes now return all values as a list. - Tracebacks are supported - Classes (aka types) are support - Will fallback on `__str__` if available, else `__repr__` if available, else will use `__could_not_encode__` - Note: msgspec only supprts enum values of type `int` or `str` [jcrist/msgspec#680](https://redirect.github.com/jcrist/msgspec/issues/680) ##### Changed - `pythonjsonlogger.jsonlogger` has been moved to `pythonjsonlogger.json` with core functionality moved to `pythonjsonlogger.core`. - `pythonjsonlogger.core.BaseJsonFormatter` properly supports all `logging.Formatter` arguments: - `fmt` is unchanged. - `datefmt` is unchanged. - `style` can now support non-standard arguments by setting `validate` to `False` - `validate` allows non-standard `style` arguments or prevents calling `validate` on standard `style` arguments. - `default` is ignored. - `pythonjsonlogger.json.JsonFormatter` default encodings changed: - bytes are URL safe base64 encoded. - Exception formatting detected using `BaseException` instead of `Exception`. Now "pretty prints" the exception using the exception name and message e.g. `"ValueError: bad value passed"` - Dataclasses are now supported - Enum values now use their value, Enum classes now return all values as a list. - Will fallback on `__str__` if available, else `__repr__` if available, else will use `__could_not_encode__` - Renaming fields now preserves order ([#​7](https://redirect.github.com/nhairs/python-json-logger/issues/7)) and ignores missing fields ([#​6](https://redirect.github.com/nhairs/python-json-logger/issues/6)). - Documentation - Generated documentation using `mkdocs` is stored in `docs/` - Documentation within `README.md` has been moved to `docs/index.md` and `docs/qucikstart.md`. - `CHANGELOG.md` has been moved to `docs/change-log.md` - `SECURITY.md` has been moved and replaced with a symbolic link to `docs/security.md`. ##### Deprecated - `pythonjsonlogger.jsonlogger` is now `pythonjsonlogger.json` - `pythonjsonlogger.jsonlogger.RESERVED_ATTRS` is now `pythonjsonlogger.core.RESERVED_ATTRS`. - `pythonjsonlogger.jsonlogger.merge_record_extra` is now `pythonjsonlogger.core.merge_record_extra`. ##### Removed - Python 3.7 support dropped - `pythonjsonlogger.jsonlogger.JsonFormatter._str_to_fn` replaced with `pythonjsonlogger.core.str_to_object`. ### [`v3.0.1`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.0.1) [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v3.0.0...v3.0.1) ##### Fixes - Fix spelling of parameter `json_serialiser` -> `json_serializer` ([#​8](https://redirect.github.com/nhairs/python-json-logger/issues/8)) - [@​juliangilbey](https://redirect.github.com/juliangilbey) ### [`v3.0.0`](https://redirect.github.com/nhairs/python-json-logger/releases/tag/v3.0.0) [Compare Source](https://redirect.github.com/nhairs/python-json-logger/compare/v2.0.7...v3.0.0) Note: using new major version to separate changes from this fork and the original (upstream). See [#​1](https://redirect.github.com/nhairs/python-json-logger/issues/1) for details. ##### Changes - Update supported Python versions - [@​nhairs](https://redirect.github.com/nhairs) - Drop 3.6 - The following versions are supported and tested: - CPython 3.7-3.12 (ubuntu, windows, mac) - PyPy 3.7-3.10 (ubuntu, wundows, mac) - `RESERVED_ATTRS` is now a list and version dependent - Fix `JsonFormatter.__init__` return type (`None`) - [@​nhairs](https://redirect.github.com/nhairs) - Moved to `pyproject.toml` - [@​nhairs](https://redirect.github.com/nhairs) - Update linting and testing - [@​nhairs](https://redirect.github.com/nhairs) - Split lint and test steps in GHA - Use validate-pyproject, black, pylint, mypy #### New Contributors **Full Changelog**: https://togithub.com/nhairs/python-json-logger/compare/v2.0.7...v3.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "* 0-3 * * 1" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/GoogleCloudPlatform/microservices-demo). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yMDAuMCIsInVwZGF0ZWRJblZlciI6IjM5LjIwMC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJsYW5nOiBweXRob24iXX0=-->
|
closing for now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Background
Fixes
Change Summary
Additional Notes
Testing Procedure
Related PRs or Issues