793a427c50
Merge in RR/pyinfra from RED-6273-multi-tenant-storage to master
Squashed commit of the following:
commit 0fead1f8b59c9187330879b4e48d48355885c27c
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 28 15:02:22 2023 +0200
fix typos
commit 892a803726946876f8b8cd7905a0e73c419b2fb1
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Mar 28 14:41:49 2023 +0200
Refactoring
Replace custom storage caching logic with LRU decorator
commit eafcd90260731e3360ce960571f07dee8f521327
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 12:50:13 2023 +0100
fix bug in storage connection from endpoint
commit d0c9fb5b7d1c55ae2f90e8faa1efec9f7587c26a
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 11:49:34 2023 +0100
add logs to PayloadProcessor
- set log messages to determine if x-tenant
storage connection is working
commit 97309fe58037b90469cf7a3de342d4749a0edfde
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Fri Mar 24 10:41:59 2023 +0100
update PayloadProcessor
- introduce storage cache to make every unique
storage connection only once
- add functionality to pass optional processing
kwargs in queue message like the operation key to
the processing function
commit d48e8108fdc0d463c89aaa0d672061ab7dca83a0
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Wed Mar 22 13:34:43 2023 +0100
add multi-tenant storage connection 1st iteration
- forward x-tenant-id from queue message header to
payload processor
- add functions to receive storage infos from an
endpoint or the config. This enables hashing and
caching of connections created from these infos
- add function to initialize storage connections
from storage infos
- streamline and refactor tests to make them more
readable and robust and to make it easier to add
new tests
- update payload processor with first iteration
of multi tenancy storage connection support
with connection caching and backwards compability
commit 52c047c47b98e62d0b834a9b9b6c0e2bb0db41e5
Author: Julius Unverfehrt <julius.unverfehrt@iqser.com>
Date: Tue Mar 21 15:35:57 2023 +0100
add AES/GCM cipher functions
- decrypt x-tenant storage connection strings
45 lines
1.3 KiB
Python
45 lines
1.3 KiB
Python
import re
|
|
import time
|
|
|
|
import pytest
|
|
import requests
|
|
|
|
from pyinfra.payload_processing.monitor import PrometheusMonitor
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
def monitored_mock_function(metric_prefix, host, port):
|
|
def process(data=None):
|
|
time.sleep(2)
|
|
return ["result1", "result2", "result3"]
|
|
|
|
monitor = PrometheusMonitor(metric_prefix, host, port)
|
|
return monitor(process)
|
|
|
|
|
|
@pytest.fixture
|
|
def metric_endpoint(host, port):
|
|
return f"http://{host}:{port}/prometheus"
|
|
|
|
|
|
@pytest.mark.parametrize("metric_prefix, host, port", [("test", "0.0.0.0", 8000)], scope="class")
|
|
class TestPrometheusMonitor:
|
|
def test_prometheus_endpoint_is_available(self, metric_endpoint, monitored_mock_function):
|
|
resp = requests.get(metric_endpoint)
|
|
assert resp.status_code == 200
|
|
|
|
def test_processing_with_a_monitored_fn_increases_parameter_counter(
|
|
self,
|
|
metric_endpoint,
|
|
metric_prefix,
|
|
monitored_mock_function,
|
|
):
|
|
monitored_mock_function(data=None)
|
|
resp = requests.get(metric_endpoint)
|
|
pattern = re.compile(rf".*{metric_prefix}_processing_time_count (\d\.\d).*")
|
|
assert pattern.search(resp.text).group(1) == "1.0"
|
|
|
|
monitored_mock_function(data=None)
|
|
resp = requests.get(metric_endpoint)
|
|
assert pattern.search(resp.text).group(1) == "2.0"
|