Release 2024-08-22

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

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}

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

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

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

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

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():