chore(manager): rename measurement to usage

duanhongyi · duanhongyi · commit b37e037e7194 · 2025-08-07T13:41:05.000+08:00
diff --git a/charts/controller/templates/controller-cronjob-daily.yaml b/charts/controller/templates/controller-cronjob-daily.yaml
@@ -71,7 +71,7 @@ spec:
             args:
               - /bin/bash
               - -c
-              - python -u /workspace/manage.py measure_apps
+              - python -u /workspace/manage.py upload_app_usage
             {{- end }}
             {{- include "controller.envs" . | indent 12 }}
             {{- include "controller-job.envs" . | indent 12 }}
@@ -85,7 +85,7 @@ spec:
             args:
             - /bin/bash
             - -c
-            - python -u /workspace/manage.py measure_resources
+            - python -u /workspace/manage.py upload_resource_usage
             {{- end }}
             {{- include "controller.envs" . | indent 12 }}
             {{- include "controller-job.envs" . | indent 12 }}
@@ -99,7 +99,7 @@ spec:
             args:
             - /bin/bash
             - -c
-            - python -u /workspace/manage.py measure_volumes
+            - python -u /workspace/manage.py upload_volume_usage
             {{- end }}
             {{- include "controller.envs" . | indent 12 }}
             {{- include "controller-job.envs" . | indent 12 }}
diff --git a/charts/controller/templates/controller-cronjob-hourly.yaml b/charts/controller/templates/controller-cronjob-hourly.yaml
@@ -45,7 +45,7 @@ spec:
             args:
             - /bin/bash
             - -c
-            - python -u /workspace/manage.py measure_networks
+            - python -u /workspace/manage.py upload_network_usage
             {{- end }}
             {{- include "controller.envs" . | indent 12 }}
             {{- include "controller-job.envs" . | indent 12 }}
diff --git a/rootfs/api/management/commands/upload_app_usage.py b/rootfs/api/management/commands/upload_app_usage.py
@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 from api.models.app import App
-from api.tasks import send_measurements
+from api.tasks import send_usage
 
 logger = logging.getLogger(__name__)
 
@@ -20,11 +20,11 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} resources to workflow_manager when {timezone.now()}")
             app_list = []
             for app in App.objects.all():
-                app_list.extend(app.to_measurements(timestamp))
+                app_list.extend(app.to_usages(timestamp))
                 if len(app_list) % 1000 == 0:
-                    send_measurements.delay(app_list)
+                    send_usage.delay(app_list)
                     app_list = []
             if len(app_list) > 0:
-                send_measurements.delay(app_list)
+                send_usage.delay(app_list)
             logger.info(f"pushed {task_id} resources to workflow_manager when {timezone.now()}")
             self.stdout.write("done")
diff --git a/rootfs/api/management/commands/upload_gateway_usage.py b/rootfs/api/management/commands/upload_gateway_usage.py
@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 from api.models.gateway import Gateway
-from api.tasks import send_measurements
+from api.tasks import send_usage
 
 logger = logging.getLogger(__name__)
 
@@ -20,11 +20,11 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} gateways to workflow_manager when {timezone.now()}")
             gateway_list = []
             for gateway in Gateway.objects.all():
-                gateway_list.extend(gateway.to_measurements(timestamp))
+                gateway_list.extend(gateway.to_usages(timestamp))
                 if len(gateway_list) % 1000 == 0:
-                    send_measurements.delay(gateway_list)
+                    send_usage.delay(gateway_list)
                     gateway_list = []
             if len(gateway_list) > 0:
-                send_measurements.delay(gateway_list)
+                send_usage.delay(gateway_list)
             logger.info(f"pushed {task_id} gateways to workflow_manager when {timezone.now()}")
             self.stdout.write("done")
diff --git a/rootfs/api/management/commands/upload_network_usage.py b/rootfs/api/management/commands/upload_network_usage.py
@@ -7,15 +7,15 @@
 from django.conf import settings
 from api import monitor
 from api.models.app import App
-from api.tasks import send_measurements
+from api.tasks import send_usage
 
 logger = logging.getLogger(__name__)
 
 
 class Command(BaseCommand):
     """Management command for push data to manager"""
 
-    def _measure_networks(self, app_map, timestamp):
+    def _upload_network_usage(self, app_map, timestamp):
         stop = timestamp - (timestamp % 3600)
         start = stop - 3600
         networks = []
@@ -49,7 +49,7 @@ def _measure_networks(self, app_map, timestamp):
                 },
                 "timestamp": start
             })
-        send_measurements.delay(networks)
+        send_usage.delay(networks)
 
     def handle(self, *args, **options):
         if settings.WORKFLOW_MANAGER_URL:
@@ -60,9 +60,9 @@ def handle(self, *args, **options):
             for app in App.objects.all():
                 app_map[app.id] = app
                 if len(app_map) % 1000 == 0:
-                    self._measure_networks(app_map, timestamp)
+                    self._upload_network_usage(app_map, timestamp)
                     app_map = {}
             if len(app_map) > 0:
-                self._measure_networks(app_map, timestamp)
+                self._upload_network_usage(app_map, timestamp)
             logger.info(f"pushed {task_id} limits to workflow_manager when {timezone.now()}")
             self.stdout.write("done")
diff --git a/rootfs/api/management/commands/upload_resource_usage.py b/rootfs/api/management/commands/upload_resource_usage.py
@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 from api.models.resource import Resource
-from api.tasks import send_measurements
+from api.tasks import send_usage
 
 logger = logging.getLogger(__name__)
 
@@ -20,11 +20,11 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} resources to workflow_manager when {timezone.now()}")
             resource_list = []
             for resource in Resource.objects.filter(status="Ready"):
-                resource_list.extend(resource.to_measurements(timestamp))
+                resource_list.extend(resource.to_usages(timestamp))
                 if len(resource_list) % 1000 == 0:
-                    send_measurements.delay(resource_list)
+                    send_usage.delay(resource_list)
                     resource_list = []
             if len(resource_list) > 0:
-                send_measurements.delay(resource_list)
+                send_usage.delay(resource_list)
             logger.info(f"pushed {task_id} resources to workflow_manager when {timezone.now()}")
             self.stdout.write("done")
diff --git a/rootfs/api/management/commands/upload_volume_usage.py b/rootfs/api/management/commands/upload_volume_usage.py
@@ -5,7 +5,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 from api.models.volume import Volume
-from api.tasks import send_measurements
+from api.tasks import send_usage
 
 logger = logging.getLogger(__name__)
 
@@ -20,11 +20,11 @@ def handle(self, *args, **options):
             logger.info(f"pushing {task_id} volumes to workflow_manager when {timezone.now()}")
             volume_list = []
             for volume in Volume.objects.all():
-                volume_list.extend(volume.to_measurements(timestamp))
+                volume_list.extend(volume.to_usages(timestamp))
                 if len(volume_list) % 1000 == 0:
-                    send_measurements.delay(volume_list)
+                    send_usage.delay(volume_list)
                     volume_list = []
             if len(volume_list) > 0:
-                send_measurements.delay(volume_list)
+                send_usage.delay(volume_list)
             logger.info(f"pushed {task_id} volumes to workflow_manager when {timezone.now()}")
             self.stdout.write("done")
diff --git a/rootfs/api/manager.py b/rootfs/api/manager.py
@@ -54,7 +54,7 @@ def delete(self, url, **kwargs):
         return self.request('delete', url, **kwargs)
 
 
-class User(ManagerAPI):
+class UserAPI(ManagerAPI):
 
     def get_status(self, id):
         """
@@ -78,21 +78,21 @@ def get_status(self, id):
         return status
 
 
-class Measurement(ManagerAPI):
+class UsageAPI(ManagerAPI):
 
-    def post(self, measurements: List[Dict[str, str]]):
+    def post(self, usages: List[Dict[str, str]]):
         """
         [
             {
                 "app_id":  "test",
                 "owner": "test",
-                "name": web,
-                "type": "CPU",
-                "unit": "G"
+                "name": "web",
+                "type": "limits",
+                "unit": "std1.large.c1m1",
                 "usage": "2",
                 "timestamp": "1609231998.9103732"
             }
         ]
         """
-        url = "%s/measurements/" % settings.WORKFLOW_MANAGER_URL
-        return super().post(url=url, json=measurements)
+        url = "%s/usages/" % settings.WORKFLOW_MANAGER_URL
+        return super().post(url=url, json=usages)
diff --git a/rootfs/api/models/app.py b/rootfs/api/models/app.py
@@ -724,12 +724,12 @@ def set_application_config(self, release, ptype):
         else:
             self.scheduler.secret.update(self.id, secret_name, secrets_env, labels=labels)
 
-    def to_measurements(self, timestamp: float):
-        measurements = []
+    def to_usages(self, timestamp: float):
+        usage = []
         config = self.config_set.latest()
         for ptype, scale in self.structure.items():
             plan = config.limits.get(ptype)
-            measurements.append({
+            usage.append({
                 "app_id": str(self.uuid),
                 "owner": self.owner_id,
                 "name": plan,
@@ -741,7 +741,7 @@ def to_measurements(self, timestamp: float):
                 },
                 "timestamp": int(timestamp),
             })
-        return measurements
+        return usage
 
     def __str__(self):
         return self.id
diff --git a/rootfs/api/models/gateway.py b/rootfs/api/models/gateway.py
@@ -142,7 +142,7 @@ def delete(self, *args, **kwargs):
             )
         return super().delete(*args, **kwargs)
 
-    def to_measurements(self, timestamp: float):
+    def to_usages(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "owner": self.owner_id,
diff --git a/rootfs/api/models/resource.py b/rootfs/api/models/resource.py
@@ -207,7 +207,7 @@ def retrieve(self, *args, **kwargs):
             self.save()
         return self.status == self.binding == "Ready"
 
-    def to_measurements(self, timestamp: float):
+    def to_usages(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "owner": self.owner_id,
diff --git a/rootfs/api/models/volume.py b/rootfs/api/models/volume.py
@@ -78,7 +78,7 @@ def log(self, message, level=logging.INFO):
         send_app_log.delay(self.app.id, message, level)
         logger.log(level, "[{}]: {}".format(self.app.id, message))
 
-    def to_measurements(self, timestamp: float):
+    def to_usages(self, timestamp: float):
         return [{
             "app_id": str(self.app_id),
             "owner": self.owner_id,
diff --git a/rootfs/api/permissions.py b/rootfs/api/permissions.py
@@ -12,7 +12,7 @@ def get_app_status(app):
     if block:
         return False, block.remark
     if settings.WORKFLOW_MANAGER_URL:
-        status = manager.User().get_status(app.owner.pk)
+        status = manager.UserAPI().get_status(app.owner.pk)
         if not status["is_active"]:
             return False, status["message"]
     return True, None
diff --git a/rootfs/api/settings/celery.py b/rootfs/api/settings/celery.py
@@ -34,7 +34,7 @@ class Config(object):
 app.conf.update(
     timezone=os.environ.get('TZ', 'UTC'),
     task_routes={
-        'api.tasks.send_measurements': {
+        'api.tasks.send_usage': {
             'queue': 'controller.low',
             'exchange': 'controller.priority', 'routing_key': 'controller.priority.low',
         },
diff --git a/rootfs/api/signals.py b/rootfs/api/signals.py
@@ -14,7 +14,7 @@
 from django.dispatch import receiver
 from django.contrib.auth import get_user_model
 from api.utils import get_httpclient
-from api.tasks import send_measurements
+from api.tasks import send_usage
 from api.models.app import App
 from api.models.service import Service
 from api.models.gateway import Gateway
@@ -143,8 +143,8 @@ def app_changed_handle(sender, instance: App, created=False, update_fields=None,
     if settings.WORKFLOW_MANAGER_URL and not created and (
             update_fields is not None and "structure" in update_fields):
         timestamp = time.time()
-        send_measurements.apply_async(
-            args=[instance.to_measurements(timestamp), ],
+        send_usage.apply_async(
+            args=[instance.to_usages(timestamp), ],
         )
 
 
@@ -222,8 +222,8 @@ def config_changed_handle(sender, instance: Config, created=False, update_fields
     if settings.WORKFLOW_MANAGER_URL and (
             created or (update_fields is not None and "limits" in update_fields)):
         timestamp = time.time()
-        send_measurements.apply_async(
-            args=[instance.app.to_measurements(timestamp), ],
+        send_usage.apply_async(
+            args=[instance.app.to_usages(timestamp), ],
         )
 
 
@@ -232,8 +232,8 @@ def volume_changed_handle(sender, instance: Volume, created=False, update_fields
     # measure volumes to workflow manager
     if settings.WORKFLOW_MANAGER_URL and created:
         timestamp = time.time()
-        send_measurements.apply_async(
-            args=[instance.to_measurements(timestamp), ],
+        send_usage.apply_async(
+            args=[instance.to_usages(timestamp), ],
         )
 
 
@@ -247,6 +247,6 @@ def resource_changed_handle(
                 "plan" in update_fields
             ))):
         timestamp = time.time()
-        send_measurements.apply_async(
-            args=[instance.to_measurements(timestamp), ],
+        send_usage.apply_async(
+            args=[instance.to_usages(timestamp), ],
         )
diff --git a/rootfs/api/tasks.py b/rootfs/api/tasks.py
@@ -17,12 +17,11 @@
     retry_backoff_max=3600,
     retry_kwargs={'max_retries': None}
 )
-def send_measurements(measurements: List[Dict[str, str]]):
+def send_usage(usage: List[Dict[str, str]]):
     task_id = uuid.uuid4().hex
     signals.request_started.send(sender=task_id)
     try:
-        measurement = manager.Measurement()
-        measurement.post(measurements)
+        manager.UsageAPI().post(usage)
     except Exception as e:
         signals.got_request_exception.send(sender=task_id)
         raise e
diff --git a/rootfs/api/tests/test_config.py b/rootfs/api/tests/test_config.py
@@ -633,7 +633,7 @@ def test_unset_limits_error(self, mock_requests):
     def call_command(self, *args, **kwargs):
         out = StringIO()
         call_command(
-            "measure_apps",
+            "upload_app_usage",
             *args,
             stdout=out,
             stderr=StringIO(),
diff --git a/rootfs/api/tests/test_resource.py b/rootfs/api/tests/test_resource.py
@@ -155,15 +155,15 @@ def call_command(self, *args, **kwargs):
         from django.core.management import call_command
         out = StringIO()
         call_command(
-            "measure_resources",
+            "upload_resource_usage",
             *args,
             stdout=out,
             stderr=StringIO(),
             **kwargs,
         )
         return out.getvalue()
 
-    def test_measure_resources(self, *args, **kwargs):
+    def test_upload_resource_usage(self, *args, **kwargs):
         # create
         app_id = self.create_app()
         data = [
diff --git a/rootfs/api/tests/test_volume.py b/rootfs/api/tests/test_volume.py
@@ -277,15 +277,15 @@ def call_command(self, *args, **kwargs):
         from django.core.management import call_command
         out = StringIO()
         call_command(
-            "measure_volumes",
+            "upload_volume_usage",
             *args,
             stdout=out,
             stderr=StringIO(),
             **kwargs,
         )
         return out.getvalue()
 
-    def test_measure_volumes(self, *args, **kwargs):
+    def test_upload_volume_usage(self, *args, **kwargs):
         # create
         app_id = self.create_app()
         data = [

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ def delete(self, args, *kwargs):`
`142`	`142`	`)`
`143`	`143`	`return super().delete(args, *kwargs)`
`144`	`144`
`145`		`- def to_measurements(self, timestamp: float):`
	`145`	`+ def to_usages(self, timestamp: float):`
`146`	`146`	`return [{`
`147`	`147`	`"app_id": str(self.app_id),`
`148`	`148`	`"owner": self.owner_id,`