Add instrumentation for step functions and CREATE, UPDATE, and COMMENT operations (#752)

Author: grahamalama

jbi/runner.py

@@ -105,6 +105,7 @@ def __call__(self, context: ActionContext) -> ActionResult:
             try:
                 step_kwargs = self.build_step_kwargs(step)
                 context = step(context=context, **step_kwargs)
+                statsd.incr(f"jbi.steps.{step.__name__}.count")
             except IncompleteStepError as exc:
                 # Step did not execute all its operations.
                 context = exc.context
@@ -248,7 +249,7 @@ def execute_action(
         )
         executor = Executor(parameters=action.parameters)
         handled, details = executor(context=action_context)
-
+        statsd.incr(f"jbi.operation.{action_context.operation.lower()}.count")
         logger.info(
             "Action %r executed successfully for Bug %s",
             action.whiteboard_tag,

tests/unit/test_runner.py

@@ -440,3 +440,63 @@ def test_counter_is_incremented_when_workflows_was_incomplete(
         callable_object(context=context_create_example)
 
     mocked.incr.assert_called_with("jbi.action.fnx.incomplete.count")
+
+
+def test_step_function_counter_incremented(
+    action_params_factory, action_context_factory
+):
+    context = action_context_factory(operation=Operation.CREATE)
+    executor = Executor(action_params_factory(steps={"new": ["create_issue"]}))
+    with mock.patch("jbi.runner.statsd") as mocked:
+        executor(context=context)
+    mocked.incr.assert_called_with("jbi.steps.create_issue.count")
+
+
+def test_counter_is_incremented_for_create(
+    webhook_factory, actions_factory, mocked_bugzilla, bug_factory
+):
+    webhook_payload = webhook_factory(
+        event__target="bug",
+        bug__see_also=[],
+    )
+    mocked_bugzilla.get_bug.return_value = webhook_payload.bug
+    with mock.patch("jbi.runner.statsd") as mocked:
+        result = execute_action(
+            request=webhook_factory(),
+            actions=actions_factory(),
+        )
+    mocked.incr.assert_any_call("jbi.operation.create.count")
+
+
+def test_counter_is_incremented_for_update(
+    actions_factory, webhook_factory, mocked_bugzilla, mocked_jira
+):
+    webhook_payload = webhook_factory(
+        event__target="bug",
+        bug__see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
+    )
+    mocked_bugzilla.get_bug.return_value = webhook_payload.bug
+    mocked_jira.get_issue.return_value = {"fields": {"project": {"key": "JBI"}}}
+    with mock.patch("jbi.runner.statsd") as mocked:
+        result = execute_action(
+            request=webhook_payload,
+            actions=actions_factory(),
+        )
+    mocked.incr.assert_any_call("jbi.operation.update.count")
+
+
+def test_counter_is_incremented_for_comment(
+    actions_factory, webhook_factory, mocked_bugzilla, mocked_jira
+):
+    webhook_payload = webhook_factory(
+        event__target="comment",
+        bug__see_also=["https://mozilla.atlassian.net/browse/JBI-234"],
+    )
+    mocked_bugzilla.get_bug.return_value = webhook_payload.bug
+    mocked_jira.get_issue.return_value = {"fields": {"project": {"key": "JBI"}}}
+    with mock.patch("jbi.runner.statsd") as mocked:
+        result = execute_action(
+            request=webhook_payload,
+            actions=actions_factory(),
+        )
+    mocked.incr.assert_any_call("jbi.operation.comment.count")