From 5f0889a0ac3c3c7b16ee8038dda5636a6860bb34 Mon Sep 17 00:00:00 2001 From: Lukas Krause Date: Thu, 9 Mar 2023 15:00:09 +0100 Subject: [PATCH] Gather metrics about comment creation on request action diffs Instrumenting the feature introduced in https://github.com/openSUSE/open-build-service/pull/13912 --- src/api/app/models/comment.rb | 2 +- src/api/app/models/event/comment_for_request.rb | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/api/app/models/comment.rb b/src/api/app/models/comment.rb index 913d387d6a5..8b46709b961 100644 --- a/src/api/app/models/comment.rb +++ b/src/api/app/models/comment.rb @@ -61,7 +61,7 @@ def create_event when 'BsRequest' Event::CommentForRequest.create(event_parameters) when 'BsRequestAction' - Event::CommentForRequest.create(event_parameters.merge({ id: commentable.bs_request.id })) + Event::CommentForRequest.create(event_parameters.merge({ id: commentable.bs_request.id, diff_ref: diff_ref })) end end diff --git a/src/api/app/models/event/comment_for_request.rb b/src/api/app/models/event/comment_for_request.rb index e947295579c..f6ffc5c1ae5 100644 --- a/src/api/app/models/event/comment_for_request.rb +++ b/src/api/app/models/event/comment_for_request.rb @@ -3,7 +3,7 @@ class CommentForRequest < Request include CommentEvent self.message_bus_routing_key = 'request.comment' self.description = 'New comment for request created' - payload_keys :request_number + payload_keys :request_number, :diff_ref receiver_roles :source_maintainer, :target_maintainer, :creator, :reviewer, :source_watcher, :target_watcher, :source_package_watcher, :target_package_watcher, :request_watcher @@ -17,6 +17,18 @@ def set_payload(attribs, keys) attribs['files'] = attribs['files'][0..800] if attribs['files'].present? super(attribs, keys) end + + def metric_measurement + 'comment' + end + + def metric_tags + { diff_ref: payload['diff_ref'].present? } + end + + def metric_fields + { value: 1 } + end end end