From 8228a516cf1b7455ed7f263d4a0fcdac112e3674 Mon Sep 17 00:00:00 2001 From: cgerken Date: Wed, 23 Mar 2022 09:12:46 -0500 Subject: [PATCH] updating method and var names --- lib/telemetry/metrics/parser/line_protocol.rb | 13 ++++++------- spec/validate_spec.rb | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/telemetry/metrics/parser/line_protocol.rb b/lib/telemetry/metrics/parser/line_protocol.rb index 018383d..ed780de 100644 --- a/lib/telemetry/metrics/parser/line_protocol.rb +++ b/lib/telemetry/metrics/parser/line_protocol.rb @@ -56,15 +56,14 @@ def hash_to_line(hash) end module_function :hash_to_line - def line_is_current?(timestamp, limit: 86_400) + def line_is_recent?(timestamp, max_age_sec: 86_400) return false unless timestamp.is_a?(Integer) - return false unless limit.is_a?(Integer) + return false unless max_age_sec.is_a?(Integer) - current_time = DateTime.now.strftime('%s%9N').to_i - time_limit = current_time - (limit * 1000 * 1000 * 1000 * 3) - timestamp >= time_limit + current_epoch_ns = DateTime.now.strftime('%s%9N').to_i + timestamp >= current_epoch_ns - (max_age_sec * 1000 * 1000 * 1000 * 3) end - module_function :line_is_current? + module_function :line_is_recent? def field_is_number?(value) return false if value.nil? @@ -113,7 +112,7 @@ def valid_tag_chars def line_is_valid?(line) # rubocop:disable Metrics/AbcSize line = parse(line) if line.is_a?(String) - return "line is too old, #{line}" unless line_is_current?(line[:timestamp]) + return "line is too old, #{line}" unless line_is_recent?(line[:timestamp]) return "line is missing influxdb_database, #{line}" unless node_group_tag? line[:tags] return "line is missing influxdb_node_group, #{line}" unless database_tag? line[:tags] return "measurement name #{line[:measurement]} is not valid" unless measurement_valid?(line[:measurement]) diff --git a/spec/validate_spec.rb b/spec/validate_spec.rb index 965660a..458926d 100644 --- a/spec/validate_spec.rb +++ b/spec/validate_spec.rb @@ -33,9 +33,9 @@ end it 'can validate the line is current' do - expect(described_class.line_is_current?(1_465_839_830_100_400_200)).to eq false - expect(described_class.line_is_current?(2_665_839_830_100_400_200)).to eq true - expect(described_class.line_is_current?('11111')).to eq false + expect(described_class.line_is_recent?(1_465_839_830_100_400_200)).to eq false + expect(described_class.line_is_recent?(2_665_839_830_100_400_200)).to eq true + expect(described_class.line_is_recent?('11111')).to eq false end it 'can verify a node_group tag exists' do