Skip to content

Commit 18b1db6

Browse files
mukund-padaledependabot[bot]xiwencjeohistrus-kh
authored
Release 2024-08-22 (#791)
* Bump certifi from 2024.2.2 to 2024.6.2 (#754) Bumps [certifi](https://github.com/certifi/python-certifi) from 2024.2.2 to 2024.6.2. - [Commits](certifi/python-certifi@2024.02.02...2024.06.02) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ruff from 0.4.5 to 0.4.8 (#756) Bumps [ruff](https://github.com/astral-sh/ruff) from 0.4.5 to 0.4.8. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@v0.4.5...v0.4.8) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump requests from 2.32.2 to 2.32.3 (#753) Bumps [requests](https://github.com/psf/requests) from 2.32.2 to 2.32.3. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.32.2...v2.32.3) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pytest from 8.2.1 to 8.2.2 (#763) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@8.2.1...8.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pylint from 3.2.2 to 3.2.3 (#764) * Bump cryptography from 42.0.7 to 42.0.8 (#762) * admin API should listen on all interfaces (#705) * MET-2698 - Changing the startup order for user-metering sidecar (#784) * MET-2698 - Changing the startup order for user-metering sidecar * MET-2698 - Increased timeout due to failures in the pipeline * Disable New Relic / Splunk tests * Fix fluentbit config, set explicit host IP * Enable Splunk and Newrelic tests --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xiwen Cheng <x@cinaq.com> Co-authored-by: Joey den Broeder <joey.den.broeder@mendix.com> Co-authored-by: rus-kh <87760994+rus-kh@users.noreply.github.com> Co-authored-by: ekremsekerci <ekrem.sekerci@mendix.com> Co-authored-by: Denis Shuvalov <denis.shuvalov@mendix.com>
1 parent 1f931ec commit 18b1db6

7 files changed

Lines changed: 19 additions & 15 deletions

File tree

‎buildpack/start.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,20 @@ def _register_signal_handlers():
190190
telegraf.run(runtime_version)
191191
datadog.run(model_version, runtime_version)
192192
fluentbit.run(model_version, runtime_version)
193-
metering.run()
194193
logs.run(m2ee)
195194
runtime.run(m2ee, logs.get_loglevels())
196195
metrics.run(m2ee)
197196
appdynamics.run()
198197
nginx.run()
199198

200-
# Wait for the runtime to be ready before starting Databroker
199+
# Block of code where the order is important
200+
# Wait for the Runtime to be ready before starting Databroker and User-metering Sidecar to not block the Runtime from start
201+
runtime.await_database_ready(m2ee)
202+
metering.run()
201203
if databroker.is_enabled():
202-
runtime.await_database_ready(m2ee)
203204
databroker_processes.run(database.get_config())
205+
# End of the block where order is important
206+
204207
except RuntimeError as re:
205208
# Only the runtime throws RuntimeErrors (no pun intended)
206209
# Don't use the stack trace for these

‎etc/fluentbit/fluentbit.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[INPUT]
22
Name tcp
3-
Listen localhost
3+
Listen 127.0.0.1
44
Port ${FLUENTBIT_LOGS_PORT}
55
Format json
66
Log_Level ${FLUENTBIT_LOG_LEVEL}

‎etc/m2ee/m2ee.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ m2ee:
66
app_name: My Project Name
77
app_base: BUILD_PATH/
88
admin_port: ADMIN_PORT
9+
admin_listen_addresses: "*"
910
custom_environment:
1011
HOME: BUILD_PATH
1112
javabin: BUILD_PATH/.local/bin/java

‎requirements-dev.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
click==8.1.7
22
idna==3.7
3-
pytest==8.2.1
3+
pytest==8.2.2
44
pytest-timer==1.0.0
55
pytest-timeout==2.3.1
6-
pylint==3.2.2
6+
pylint==3.2.3
77
pyopenssl==24.0.0
88
randomname==0.2.1
99
requests-mock==1.12.1
10-
ruff==0.4.5
10+
ruff==0.4.8
1111
parameterized==0.9.0

‎requirements.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
backoff==2.2.1
2-
certifi==2024.2.2
3-
cryptography==42.0.7
2+
certifi==2024.6.2
3+
cryptography==42.0.8
44
distro==1.9.0
55
httplib2==0.22.0
66
jinja2==3.1.4
77
omegaconf==2.3.0
88
psycopg2-binary==2.9.9
99
pyyaml==6.0.1
10-
requests==2.32.2
10+
requests==2.32.3
1111
urllib3==2.2.1

‎requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ antlr4-python3-runtime==4.9.3
88
# via omegaconf
99
backoff==2.2.1
1010
# via -r requirements.in
11-
certifi==2024.2.2
11+
certifi==2024.6.2
1212
# via
1313
# -r requirements.in
1414
# requests
1515
cffi==1.14.4
1616
# via cryptography
1717
charset-normalizer==2.0.3
1818
# via requests
19-
cryptography==42.0.7
19+
cryptography==42.0.8
2020
# via -r requirements.in
2121
distro==1.9.0
2222
# via -r requirements.in
@@ -40,7 +40,7 @@ pyyaml==6.0.1
4040
# via
4141
# -r requirements.in
4242
# omegaconf
43-
requests==2.32.2
43+
requests==2.32.3
4444
# via -r requirements.in
4545
urllib3==2.2.1
4646
# via

‎tests/integration/runner.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def stage(
141141

142142
return result
143143

144-
def start(self, start_timeout=120, health="healthy"):
144+
def start(self, start_timeout=180, health="healthy"):
145145
self._check_for_cflocal()
146146

147147
if not self._container_id:
@@ -500,7 +500,7 @@ def stage(self, *args, **kwargs):
500500

501501
return super().stage(*args, **kwargs)
502502

503-
def start(self, start_timeout=120, health="healthy"):
503+
def start(self, start_timeout=180, health="healthy"):
504504
# Wait until the database is up
505505
@backoff.on_predicate(backoff.expo, lambda x: x > 0, max_time=30)
506506
def _await_database():

0 commit comments

Comments
 (0)