Include function_size in license fee event metric types

Author: korgan00

gateway/core/ibm_cloud/event_streams/kafka_event_streams_client.py

@@ -162,7 +162,14 @@ def _emit_job_completed(self, job, metric_type: str | None = None) -> None:
         )
 
     def _emit_license_fee(self, job: Job) -> None:
-        metric_type = "_".join([LICENSE_FEE_METRIC_TYPE, job.program.provider.name, job.program.title])
+        parts = [LICENSE_FEE_METRIC_TYPE, job.program.provider.name, job.program.title]
+
+        # Include function size if available
+        function_size = self._resolve_function_size(job)
+        if function_size:
+            parts.append(function_size)
+
+        metric_type = "_".join(parts)
         self._publish(
             job,
             metric_type=metric_type,
@@ -172,6 +179,20 @@ def _emit_license_fee(self, job: Job) -> None:
             business_model=billing_name_for(job.business_model),
         )
 
+    def _resolve_function_size(self, job: Job) -> str | None:
+        """Resolve the function size for the job.
+
+        Returns the job's explicit size if set, otherwise falls back to the function's
+        default size. Returns None if neither is set.
+        """
+        if job.function_size:
+            return job.function_size.function_size
+
+        if job.program and job.program.default_size:
+            return job.program.default_size.function_size
+
+        return None
+
     def _build_classical_metric_type(self, job: Job) -> str:
         """Build classical metric type from job attributes: classical_PROVIDER_FUNCTION_COMPUTE_PROFILE."""
         parts = [CLASSICAL_TIME_METRIC_TYPE_PREFIX]

gateway/tests/core/services/ibm_cloud/event_streams/test_event_streams_client.py

@@ -297,11 +297,13 @@ def test_emit_job_in_progress_returns_zero_usage_when_running_started_at_is_none
         assert published["data"]["metric_value"] == 0
         assert published["data"]["job_started_at"] is None
 
-    def test_emit_license_fee_publishes_correct_payload(self):
+    def test_emit_license_fee_publishes_correct_payload_without_size(self):
         job = _make_job()
         job.program = MagicMock()
         job.program.provider.name = "ibm"
         job.program.title = "test-program"
+        job.function_size = None
+        job.program.default_size = None
 
         with patch(f"{_CLIENT_MOD}.Producer") as mock_producer_cls:
             with patch(f"{_CLIENT_MOD}.uuid") as mock_uuid_mod:
@@ -343,6 +345,76 @@ def test_emit_license_fee_publishes_correct_payload(self):
         assert call_kwargs["key"] == str(job.id).encode("utf-8")
         mock_producer.flush.assert_called_once()
 
+    def test_emit_license_fee_includes_size_from_job_function_size(self):
+        job = _make_job()
+        job.program = MagicMock()
+        job.program.provider.name = "ibm"
+        job.program.title = "test-program"
+        job.function_size = MagicMock()
+        job.function_size.function_size = "S"
+
+        with patch(f"{_CLIENT_MOD}.Producer") as mock_producer_cls:
+            with patch(f"{_CLIENT_MOD}.uuid") as mock_uuid_mod:
+                with patch(f"{_CLIENT_MOD}.datetime") as mock_dt:
+                    with patch.dict(
+                        os.environ,
+                        {
+                            "EVENT_STREAMS_BOOTSTRAP_SERVERS": "b:9093",
+                            "EVENT_STREAMS_API_KEY": "k",
+                            "ENVIRONMENT": "production",
+                        },
+                    ):
+                        fake_event_id = uuid_module.UUID("00000000-0000-0000-0000-000000000003")
+                        mock_uuid_mod.uuid4.return_value = fake_event_id
+                        fake_now = datetime(2026, 1, 1, 12, 0, 1, tzinfo=timezone.utc)
+                        mock_dt.now.return_value = fake_now
+
+                        client = KafkaEventStreamsClient()
+                        mock_producer = mock_producer_cls.return_value
+                        mock_producer.flush.return_value = 0
+                        client.emit_license_fee(job)
+
+        call_kwargs = mock_producer.produce.call_args[1]
+        published = json.loads(call_kwargs["value"])
+        assert published["data"]["metric_type"] == "license_ibm_test-program_S"
+        assert published["data"]["business_model"] == "licensed"
+
+    def test_emit_license_fee_falls_back_to_program_default_size(self):
+        job = _make_job()
+        job.program = MagicMock()
+        job.program.provider.name = "ibm"
+        job.program.title = "test-program"
+        job.function_size = None
+        default_size = MagicMock()
+        default_size.function_size = "M"
+        job.program.default_size = default_size
+
+        with patch(f"{_CLIENT_MOD}.Producer") as mock_producer_cls:
+            with patch(f"{_CLIENT_MOD}.uuid") as mock_uuid_mod:
+                with patch(f"{_CLIENT_MOD}.datetime") as mock_dt:
+                    with patch.dict(
+                        os.environ,
+                        {
+                            "EVENT_STREAMS_BOOTSTRAP_SERVERS": "b:9093",
+                            "EVENT_STREAMS_API_KEY": "k",
+                            "ENVIRONMENT": "production",
+                        },
+                    ):
+                        fake_event_id = uuid_module.UUID("00000000-0000-0000-0000-000000000004")
+                        mock_uuid_mod.uuid4.return_value = fake_event_id
+                        fake_now = datetime(2026, 1, 1, 12, 0, 1, tzinfo=timezone.utc)
+                        mock_dt.now.return_value = fake_now
+
+                        client = KafkaEventStreamsClient()
+                        mock_producer = mock_producer_cls.return_value
+                        mock_producer.flush.return_value = 0
+                        client.emit_license_fee(job)
+
+        call_kwargs = mock_producer.produce.call_args[1]
+        published = json.loads(call_kwargs["value"])
+        assert published["data"]["metric_type"] == "license_ibm_test-program_M"
+        assert published["data"]["business_model"] == "licensed"
+
     @pytest.mark.parametrize(
         "business_model,expected",
         [
@@ -356,6 +428,8 @@ def test_emit_license_fee_maps_business_model(self, business_model, expected):
         job.program = MagicMock()
         job.program.provider.name = "ibm"
         job.program.title = "test-program"
+        job.function_size = None
+        job.program.default_size = None
 
         with patch(f"{_CLIENT_MOD}.Producer") as mock_producer_cls:
             with patch(f"{_CLIENT_MOD}.uuid"):