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] <[email protected]> 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] <[email protected]> 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] <[email protected]> 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] <[email protected]> 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xiwen Cheng <[email protected]> Co-authored-by: Joey den Broeder <[email protected]> Co-authored-by: rus-kh <[email protected]> Co-authored-by: ekremsekerci <[email protected]> Co-authored-by: Denis Shuvalov <[email protected]>
mendix · Aug 22, 2024 · 18b1db6 · 18b1db6
1 parent 1f931ec
commit 18b1db6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/buildpack/start.py b/buildpack/start.py
@@ -190,17 +190,20 @@ def _register_signal_handlers():
         telegraf.run(runtime_version)
         datadog.run(model_version, runtime_version)
         fluentbit.run(model_version, runtime_version)
-        metering.run()
         logs.run(m2ee)
         runtime.run(m2ee, logs.get_loglevels())
         metrics.run(m2ee)
         appdynamics.run()
         nginx.run()
 
-        # Wait for the runtime to be ready before starting Databroker
+        # Block of code where the order is important
+        # Wait for the Runtime to be ready before starting Databroker and User-metering Sidecar to not block the Runtime from start
+        runtime.await_database_ready(m2ee)
+        metering.run()
         if databroker.is_enabled():
-            runtime.await_database_ready(m2ee)
             databroker_processes.run(database.get_config())
+        # End of the block where order is important
+
     except RuntimeError as re:
         # Only the runtime throws RuntimeErrors (no pun intended)
         # Don't use the stack trace for these

diff --git a/etc/fluentbit/fluentbit.conf b/etc/fluentbit/fluentbit.conf
@@ -1,6 +1,6 @@
 [INPUT]
     Name        tcp
-    Listen      localhost
+    Listen      127.0.0.1
     Port        ${FLUENTBIT_LOGS_PORT}
     Format      json
     Log_Level   ${FLUENTBIT_LOG_LEVEL}

diff --git a/etc/m2ee/m2ee.yaml b/etc/m2ee/m2ee.yaml
@@ -6,6 +6,7 @@ m2ee:
   app_name: My Project Name
   app_base: BUILD_PATH/
   admin_port: ADMIN_PORT
+  admin_listen_addresses: "*"
   custom_environment:
     HOME: BUILD_PATH
   javabin: BUILD_PATH/.local/bin/java

diff --git a/requirements-dev.in b/requirements-dev.in
@@ -1,11 +1,11 @@
 click==8.1.7
 idna==3.7
-pytest==8.2.1
+pytest==8.2.2
 pytest-timer==1.0.0
 pytest-timeout==2.3.1
-pylint==3.2.2
+pylint==3.2.3
 pyopenssl==24.0.0
 randomname==0.2.1
 requests-mock==1.12.1
-ruff==0.4.5
+ruff==0.4.8
 parameterized==0.9.0
diff --git a/requirements.in b/requirements.in
@@ -1,11 +1,11 @@
 backoff==2.2.1
-certifi==2024.2.2
-cryptography==42.0.7
+certifi==2024.6.2
+cryptography==42.0.8
 distro==1.9.0
 httplib2==0.22.0
 jinja2==3.1.4
 omegaconf==2.3.0
 psycopg2-binary==2.9.9
 pyyaml==6.0.1
-requests==2.32.2
+requests==2.32.3
 urllib3==2.2.1
diff --git a/requirements.txt b/requirements.txt
@@ -8,15 +8,15 @@ antlr4-python3-runtime==4.9.3
     # via omegaconf
 backoff==2.2.1
     # via -r requirements.in
-certifi==2024.2.2
+certifi==2024.6.2
     # via
     #   -r requirements.in
     #   requests
 cffi==1.14.4
     # via cryptography
 charset-normalizer==2.0.3
     # via requests
-cryptography==42.0.7
+cryptography==42.0.8
     # via -r requirements.in
 distro==1.9.0
     # via -r requirements.in
@@ -40,7 +40,7 @@ pyyaml==6.0.1
     # via
     #   -r requirements.in
     #   omegaconf
-requests==2.32.2
+requests==2.32.3
     # via -r requirements.in
 urllib3==2.2.1
     # via

diff --git a/tests/integration/runner.py b/tests/integration/runner.py
@@ -141,7 +141,7 @@ def stage(
 
         return result
 
-    def start(self, start_timeout=120, health="healthy"):
+    def start(self, start_timeout=180, health="healthy"):
         self._check_for_cflocal()
 
         if not self._container_id:
@@ -500,7 +500,7 @@ def stage(self, *args, **kwargs):
 
         return super().stage(*args, **kwargs)
 
-    def start(self, start_timeout=120, health="healthy"):
+    def start(self, start_timeout=180, health="healthy"):
         # Wait until the database is up
         @backoff.on_predicate(backoff.expo, lambda x: x > 0, max_time=30)
         def _await_database():