Skip to content

Bug fix cycle 7 #257

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bug fix cycle 7 #257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c2da44
Handle reset event to prevent duplicate execution entries
AndriiMysko Feb 3, 2022
737647d
Merge pull request #256 from travis-ci/handle-reset-billing-am
travis-architect Mar 3, 2022
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
10 changes: 8 additions & 2 deletions lib/travis/addons/handlers/billing.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module Travis
module Addons
module Handlers
class Billing < Base
EVENTS = ['job:started', 'job:finished', 'job:canceled'].freeze
EVENTS = ['job:started', 'job:finished', 'job:canceled', 'job:reset'].freeze
KEY = :billing

MSGS = {
Expand Down Expand Up @@ -38,6 +38,8 @@ def publish
end

def send_usage(data)
# Return if handling reset before start
return if reset? && object.started_at.nil?
logger.info "Hub usage #{data}"
Travis::Sidekiq.billing(data)
end
Expand All @@ -62,7 +64,7 @@ def job_data
instance_size: meta(:vm_size) || vm_size,
arch: config['arch'] || 'amd64',
started_at: object.started_at,
finished_at: object.finished_at,
finished_at: reset? && object.finished_at.nil? ? Time.now : object.finished_at,
virt_type: config['virt'],
queue: object.queue,
vm_size: vm_size,
Expand Down Expand Up @@ -146,6 +148,10 @@ def finished?
event != 'job:started'
end

def reset?
event == 'job:reset'
end

# EventHandler
class EventHandler < Addons::Instrument
def notify_completed
Expand Down