Skip to content

Switch to runtime_version across the board for consistency #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
carlosantoniodasilva wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Switch to runtime_version across the board for consistency #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion judoscale/asgi/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, app, extra_config: Mapping = {}, **kwargs):
self.collector = WebMetricsCollector(judoconfig)
adapter = Adapter(
identifier=f"judoscale-{self.platform}",
adapter_info=AdapterInfo(platform_version=metadata.version(self.platform)),
adapter_info=AdapterInfo(runtime_version=metadata.version(self.platform)),
metrics_collector=self.collector,
)
reporter.add_adapter(adapter)
Expand Down
2 changes: 1 addition & 1 deletion judoscale/celery/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def judoscale_celery(celery: Celery, extra_config: Mapping = {}) -> None:
collector = CeleryMetricsCollector(config=judoconfig, broker=celery)
adapter = Adapter(
identifier="judoscale-celery",
adapter_info=AdapterInfo(platform_version=metadata.version("celery")),
adapter_info=AdapterInfo(runtime_version=metadata.version("celery")),
metrics_collector=collector,
)

Expand Down
2 changes: 1 addition & 1 deletion judoscale/core/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class AdapterInfo:
"""Information about the adapter"""

platform_version: str
runtime_version: str
adapter_version: str = JUDOSCALE_VERSION


Expand Down
2 changes: 1 addition & 1 deletion judoscale/core/reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(self, config: Config):
self.adapters.append(
Adapter(
identifier="judoscale-python",
adapter_info=AdapterInfo(platform_version=python_version()),
adapter_info=AdapterInfo(runtime_version=python_version()),
)
)

Expand Down
2 changes: 1 addition & 1 deletion judoscale/django/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def __init__(self, get_response):
self.collector = WebMetricsCollector(judoconfig)
adapter = Adapter(
identifier="judoscale-django",
adapter_info=AdapterInfo(platform_version=metadata.version("django")),
adapter_info=AdapterInfo(runtime_version=metadata.version("django")),
metrics_collector=self.collector,
)
reporter.add_adapter(adapter)
Expand Down
2 changes: 1 addition & 1 deletion judoscale/flask/judoscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def init_app(self, app: Flask):
collector = WebMetricsCollector(judoconfig)
adapter = Adapter(
identifier="judoscale-flask",
adapter_info=AdapterInfo(platform_version=metadata.version("flask")),
adapter_info=AdapterInfo(runtime_version=metadata.version("flask")),
metrics_collector=collector,
)
reporter.add_adapter(adapter)
Expand Down
2 changes: 1 addition & 1 deletion judoscale/rq/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def judoscale_rq(redis: Redis, extra_config: Mapping = {}) -> None:
collector = RQMetricsCollector(config=judoconfig, redis=redis)
adapter = Adapter(
identifier="judoscale-rq",
adapter_info=AdapterInfo(platform_version=metadata.version("rq")),
adapter_info=AdapterInfo(runtime_version=metadata.version("rq")),
metrics_collector=collector,
)

Expand Down
8 changes: 4 additions & 4 deletions tests/test_reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_no_explicit_adapter(self, reporter):
def test_add_adapter_no_collector(self, reporter):
adapter = Adapter(
identifier="test",
adapter_info=AdapterInfo(platform_version="0.0.0"),
adapter_info=AdapterInfo(runtime_version="0.0.0"),
metrics_collector=None,
)
reporter.add_adapter(adapter)
Expand All @@ -54,7 +54,7 @@ def test_add_adapter_no_collector(self, reporter):
def test_add_adapter_with_collector(self, reporter):
adapter = Adapter(
identifier="test",
adapter_info=AdapterInfo(platform_version="0.0.0"),
adapter_info=AdapterInfo(runtime_version="0.0.0"),
metrics_collector=WebMetricsCollector(config),
)
reporter.add_adapter(adapter)
Expand All @@ -68,13 +68,13 @@ def test_all_metrics_not_empty(self, reporter):
collector_instance_1 = WebMetricsCollector(reporter.config)
adapter_instance_1 = Adapter(
identifier="test",
adapter_info=AdapterInfo(platform_version="0.0.0"),
adapter_info=AdapterInfo(runtime_version="0.0.0"),
metrics_collector=collector_instance_1,
)
collector_instance_2 = WebMetricsCollector(reporter.config)
adapter_instance_2 = Adapter(
identifier="test",
adapter_info=AdapterInfo(platform_version="0.0.0"),
adapter_info=AdapterInfo(runtime_version="0.0.0"),
metrics_collector=collector_instance_2,
)
reporter.add_adapter(adapter_instance_1)
Expand Down