From cae84a9ff0faddf2990e05c44d35356148d82360 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:40:27 +0100 Subject: [PATCH 01/11] 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](https://github.com/certifi/python-certifi/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index ac082fcd..739ad47f 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,5 @@ backoff==2.2.1 -certifi==2024.2.2 +certifi==2024.6.2 cryptography==42.0.7 distro==1.9.0 httplib2==0.22.0 diff --git a/requirements.txt b/requirements.txt index b10287ef..94c2798f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ 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 From b2af7f3ff686123cddf9bdb8258a063a7a01b833 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:02:54 +0100 Subject: [PATCH 02/11] 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](https://github.com/astral-sh/ruff/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.in b/requirements-dev.in index e4b9a545..c5c8dd87 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -7,5 +7,5 @@ pylint==3.2.2 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 From d227948e6e849a22f255f50927be5685b5fdbfc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:18:24 +0100 Subject: [PATCH 03/11] 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](https://github.com/psf/requests/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 739ad47f..38fc6311 100644 --- a/requirements.in +++ b/requirements.in @@ -7,5 +7,5 @@ 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 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 94c2798f..52ea1105 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From cfa3e4f7d79da2f617210706edb89d8c39a74ddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:41:57 +0100 Subject: [PATCH 04/11] 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](https://github.com/pytest-dev/pytest/compare/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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.in b/requirements-dev.in index c5c8dd87..ffd5c18f 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,6 +1,6 @@ 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 From fa1be1b3898cea4f6c3192cd715ac3540d0e87dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:10:07 +0100 Subject: [PATCH 05/11] Bump pylint from 3.2.2 to 3.2.3 (#764) --- requirements-dev.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.in b/requirements-dev.in index ffd5c18f..5324adc6 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -3,7 +3,7 @@ idna==3.7 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 From fb2088680ec246d33c658567aaf19f5023309d42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:19:46 +0100 Subject: [PATCH 06/11] Bump cryptography from 42.0.7 to 42.0.8 (#762) --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 38fc6311..8217fb83 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ backoff==2.2.1 certifi==2024.6.2 -cryptography==42.0.7 +cryptography==42.0.8 distro==1.9.0 httplib2==0.22.0 jinja2==3.1.4 diff --git a/requirements.txt b/requirements.txt index 52ea1105..0e11d808 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ 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 From 48dea8fef66d695f932736de834bdbb100bd2e97 Mon Sep 17 00:00:00 2001 From: Xiwen Cheng Date: Tue, 11 Jun 2024 21:41:45 +0200 Subject: [PATCH 07/11] admin API should listen on all interfaces (#705) --- etc/m2ee/m2ee.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/m2ee/m2ee.yaml b/etc/m2ee/m2ee.yaml index 2623f492..26687b2e 100644 --- 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 From 91d72fb7a6769a79156976df0490814cbf692456 Mon Sep 17 00:00:00 2001 From: rus-kh <87760994+rus-kh@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:21:40 +0200 Subject: [PATCH 08/11] 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 --- buildpack/start.py | 9 ++++++--- tests/integration/runner.py | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/buildpack/start.py b/buildpack/start.py index df2fa540..03621c77 100755 --- 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/tests/integration/runner.py b/tests/integration/runner.py index 36bbb5d8..ccc7dc3a 100755 --- 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(): From 0a1cd29e9e15e0da0ef69e5ba0e1888220fd566d Mon Sep 17 00:00:00 2001 From: Joey den Broeder Date: Thu, 15 Aug 2024 15:30:43 +0100 Subject: [PATCH 09/11] Disable New Relic / Splunk tests --- tests/integration/{test_newrelic.py => disabled_test_newrelic.py} | 0 tests/integration/{test_splunk.py => disabled_test_splunk.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/integration/{test_newrelic.py => disabled_test_newrelic.py} (100%) rename tests/integration/{test_splunk.py => disabled_test_splunk.py} (100%) diff --git a/tests/integration/test_newrelic.py b/tests/integration/disabled_test_newrelic.py similarity index 100% rename from tests/integration/test_newrelic.py rename to tests/integration/disabled_test_newrelic.py diff --git a/tests/integration/test_splunk.py b/tests/integration/disabled_test_splunk.py similarity index 100% rename from tests/integration/test_splunk.py rename to tests/integration/disabled_test_splunk.py From c9de911aa809c37e0635bdb272fd013af01184b7 Mon Sep 17 00:00:00 2001 From: Denis Shuvalov Date: Mon, 19 Aug 2024 16:45:15 +0200 Subject: [PATCH 10/11] Fix fluentbit config, set explicit host IP --- etc/fluentbit/fluentbit.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/fluentbit/fluentbit.conf b/etc/fluentbit/fluentbit.conf index 1d574064..178411f8 100644 --- 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} From 3dc2a14df6a6bdd0eeac7dccb5852d7929d4e9df Mon Sep 17 00:00:00 2001 From: Denis Shuvalov Date: Mon, 19 Aug 2024 17:19:10 +0200 Subject: [PATCH 11/11] Enable Splunk and Newrelic tests --- tests/integration/{disabled_test_newrelic.py => test_newrelic.py} | 0 tests/integration/{disabled_test_splunk.py => test_splunk.py} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/integration/{disabled_test_newrelic.py => test_newrelic.py} (100%) rename tests/integration/{disabled_test_splunk.py => test_splunk.py} (100%) diff --git a/tests/integration/disabled_test_newrelic.py b/tests/integration/test_newrelic.py similarity index 100% rename from tests/integration/disabled_test_newrelic.py rename to tests/integration/test_newrelic.py diff --git a/tests/integration/disabled_test_splunk.py b/tests/integration/test_splunk.py similarity index 100% rename from tests/integration/disabled_test_splunk.py rename to tests/integration/test_splunk.py