fluent-plugin-jfrog-metrics 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335f7170ad6eed8eb8237cfe912c0e6c547825a7b16904ebbd84c0247e51dbf6
-  data.tar.gz: 73c094c9e41b5e163e5a6f604073a7ec84530fc9376033cc555aa15df58d21e5
+  metadata.gz: 87d664942597bf1b01b10d646cfd7688e86c9eefe43488d4357777e4b2e30abb
+  data.tar.gz: 1f622fe466d1c2490ccc3719b06fc1d43dd888a24f725fb10bb7d760e001870e
 SHA512:
-  metadata.gz: 84d8410b8fcccefdca9b76071cbf1a2e42cba33fde5fb973e52e09939f52b08d779f533189220c982af2a131b231807dcc76b2293661c327acf323cbf6cf495b
-  data.tar.gz: 58cb4bd996293b1ec508b35281f39788f5be88a32900da0faa941377328a9f9accd383b8673be109b3251c65176d9c7df9fde24e6084917fff96f4ca8f9d4272
+  metadata.gz: 7eebd867297ddb78732c1c72621e3a89064ec3273893fee443f32403dd3cccf4b0c3ecc8bed29230545561b2c5dc0ad0f3b09296a9302f03df8da11fe0f6a31f
+  data.tar.gz: fc09d5541762477d5e8405e712abf72df64ab94bf7f6af88eaa0bcd8bda671d5f89e94f28c2d67c9692a40eb40c17a4752b4afe71020219a4db35194308fa07d

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+## v0.2.17
+- Fixed timestamp handling in NewRelic and Splunk metrics parsers for Prometheus metrics without timestamps ([JOBS-2118](https://jfrog-int.atlassian.net/browse/JOBS-2118))
+- Metrics without timestamps (e.g., RTFS) now use current time instead of epoch 0, preventing silent rejection by New Relic Metric API
+
 ## v0.2.16
-- Added RTFS (Real-Time File Store) metrics endpoint support ([JOBS-1897](https://jfrog-int.atlassian.net/browse/JOBS-1897))
-- New metric_prefix `jfrog.rtfs` maps to `/artifactory/service/rtfs/api/v1/metrics`
+- Added RTFS (JFrog Artifactory Federation Service) metrics endpoint support ([JOBS-1897](https://jfrog-int.atlassian.net/browse/JOBS-1897))
+- New metric_prefix `jfrog.rtfs` maps to `/rtfs/api/v1/metrics`
 
 ## v0.2.13
 - Added fix to parse metrics without timestamps (JOBS-1801)

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.16'
+  spec.version = '0.2.17'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 

data/lib/fluent/plugin/newrelic_metrics_parser.rb

@@ -24,19 +24,20 @@ class NewRelicMetricsParser < BaseMetricsParser
           interim_data_key = pair_data.split("=", 2)[0]
           attributes[interim_data_key] = interim_data_value
         end
-        if metric_val_and_time =~ / /
-          metrics_hash['name'] = prefix + separator + metric_name
-          metrics_hash['value'] =
-              metric_val_and_time.strip.split[0] =~ /^\S*\.\S*$/ ? metric_val_and_time.strip.split[0].to_f : metric_val_and_time.strip.split[0].to_i
-          metrics_hash['timestamp'] = metric_val_and_time.strip.split[1].to_i
-          metrics_hash['attributes'] = attributes
-        end
+        parts = metric_val_and_time.strip.split
+        metrics_hash['name'] = prefix + separator + metric_name
+        metrics_hash['value'] =
+            parts[0] =~ /^\S*\.\S*$/ ? parts[0].to_f : parts[0].to_i
+        parsed_ts = parts[1].to_i
+        metrics_hash['timestamp'] = parsed_ts > 0 ? parsed_ts : Time.now.to_i
+        metrics_hash['attributes'] = attributes
       else
-        metrics_hash['name'], metrics_hash['value'], metrics_hash['timestamp'] = interim_data.split
+        metrics_hash['name'], metrics_hash['value'], raw_ts = interim_data.split
         metrics_hash['name'] = prefix + separator + metrics_hash['name']
         metrics_hash['value'] =
             metrics_hash['value'] =~ /^\S*\.\S*$/ ? metrics_hash['value'].to_f : metrics_hash['value'].to_i
-        metrics_hash['timestamp'] = metrics_hash['timestamp'].to_i
+        parsed_ts = raw_ts.to_i
+        metrics_hash['timestamp'] = parsed_ts > 0 ? parsed_ts : Time.now.to_i
       end
       data_array << metrics_hash
     end

data/lib/fluent/plugin/splunk_metrics_parser.rb

@@ -21,23 +21,24 @@ class SplunkMetricsParser < BaseMetricsParser
     metrics_hash = {}
     if data =~ /{/ && data =~ /}/
       metric_name, additional_dims, metric_val_and_time = data.match(/(.*?){(.*)}(.*)/i).captures
-      if metric_val_and_time =~ / /
-        metrics_hash['metric_name'] = prefix + separator + metric_name
-        metrics_hash['value'] =
-            metric_val_and_time.strip.split[0] =~ /^\S*\.\S*$/ ? metric_val_and_time.strip.split[0].to_f : metric_val_and_time.strip.split[0].to_i
-        metrics_hash['time'] = metric_val_and_time.strip.split[1].to_i
-        if additional_dims =~ /,/
-          additional_dims.split(/,/).map do |interim_data|
-            metrics_hash[interim_data.split(/=/)[0]] = interim_data.split(/=/)[1].gsub(/"/, '') if interim_data =~ /=/
-          end
+      parts = metric_val_and_time.strip.split
+      metrics_hash['metric_name'] = prefix + separator + metric_name
+      metrics_hash['value'] =
+          parts[0] =~ /^\S*\.\S*$/ ? parts[0].to_f : parts[0].to_i
+      parsed_ts = parts[1].to_i
+      metrics_hash['time'] = parsed_ts > 0 ? parsed_ts : Time.now.to_i
+      if additional_dims =~ /,/
+        additional_dims.split(/,/).map do |interim_data|
+          metrics_hash[interim_data.split(/=/)[0]] = interim_data.split(/=/)[1].gsub(/"/, '') if interim_data =~ /=/
         end
       end
     else
-      metrics_hash['metric_name'], metrics_hash['value'], metrics_hash['time'] = data.split
+      metrics_hash['metric_name'], metrics_hash['value'], raw_ts = data.split
       metrics_hash['metric_name'] = prefix + separator + metrics_hash['metric_name']
       metrics_hash['value'] =
           metrics_hash['value'] =~ /^\S*\.\S*$/ ? metrics_hash['value'].to_f : metrics_hash['value'].to_i
-      metrics_hash['time'] =  metrics_hash['time'].to_i
+      parsed_ts = raw_ts.to_i
+      metrics_hash['time'] = parsed_ts > 0 ? parsed_ts : Time.now.to_i
     end
     metrics_hash
   end

data/spec/fixtures/files/sample_rtfs_metrics.txt

@@ -0,0 +1,25 @@
+# HELP application_ready_time_seconds Time taken for the application to be ready to service requests
+# TYPE application_ready_time_seconds gauge
+application_ready_time_seconds{application="Federation",main_application_class="org.jfrog.rtfs.devenv.ArtifactoryFederationServiceApplicationStartup"} 18.218
+# HELP application_started_time_seconds Time taken to start the application
+# TYPE application_started_time_seconds gauge
+application_started_time_seconds{application="Federation",main_application_class="org.jfrog.rtfs.devenv.ArtifactoryFederationServiceApplicationStartup"} 5.931
+# HELP disk_free_bytes Usable space for path
+# TYPE disk_free_bytes gauge
+disk_free_bytes{application="Federation",path="/var/opt/jfrog/artifactory/."} 8.57595199488E11
+# HELP disk_total_bytes Total space for path
+# TYPE disk_total_bytes gauge
+disk_total_bytes{application="Federation",path="/var/opt/jfrog/artifactory/."} 9.77896124416E11
+# HELP executor_active_threads The approximate number of threads that are actively executing tasks
+# TYPE executor_active_threads gauge
+executor_active_threads{application="Federation",name="binariesTaskMetricsCollectorScheduler"} 0.0
+# HELP jvm_memory_used_bytes The amount of used memory
+# TYPE jvm_memory_used_bytes gauge
+jvm_memory_used_bytes{application="Federation",area="heap",id="G1 Eden Space"} 1.6777216E7
+jvm_memory_used_bytes{application="Federation",area="heap",id="G1 Old Gen"} 7.4136896E7
+# HELP process_cpu_usage The recent cpu usage for the JVM process
+# TYPE process_cpu_usage gauge
+process_cpu_usage{application="Federation"} 0.003
+# HELP simple_metric_no_labels A metric without labels or timestamp
+# TYPE simple_metric_no_labels gauge
+simple_metric_no_labels 42

data/spec/lib/newrelic_metrics_parser_spec.rb

@@ -75,5 +75,29 @@ RSpec.describe NewRelicMetricsParser do
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be 1
     end
+
+    it 'should assign current timestamp to RTFS metrics that lack timestamps' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_rtfs_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = NewRelicMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      cleaned_data = parser.clean_data(normalized_data)
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
+
+      expect(hash_data_array.size).to be 1
+      metrics = hash_data_array[0]['metrics']
+      expect(metrics.size).to be > 1
+
+      now = Time.now.to_i
+      metrics.each do |metric|
+        expect(metric['name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
+        expect(metric['timestamp']).to be_a(Integer)
+        expect(metric['timestamp']).to be > 0
+        expect(metric['timestamp']).to be_within(5).of(now)
+      end
+    end
   end
 end

data/spec/lib/splunk_metrics_parser_spec.rb

@@ -75,5 +75,27 @@ RSpec.describe SplunkMetricsParser do
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be > 1
     end
+
+    it 'should assign current timestamp to RTFS metrics that lack timestamps' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_rtfs_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = SplunkMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      cleaned_data = parser.clean_data(normalized_data)
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
+
+      expect(hash_data_array.size).to be > 1
+
+      now = Time.now.to_i
+      hash_data_array.each do |metric|
+        expect(metric['metric_name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
+        expect(metric['time']).to be_a(Integer)
+        expect(metric['time']).to be > 0
+        expect(metric['time']).to be_within(5).of(now)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - MahithaB, BenHarosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-04-21 00:00:00.000000000 Z
+date: 2026-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - lib/fluent/plugin/splunk_metrics_parser.rb
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_metrics.txt
+- spec/fixtures/files/sample_rtfs_metrics.txt
 - spec/fixtures/files/sample_xray_metrics.txt
 - spec/lib/datadog_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb
@@ -163,6 +164,7 @@ summary: Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated m
 test_files:
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_metrics.txt
+- spec/fixtures/files/sample_rtfs_metrics.txt
 - spec/fixtures/files/sample_xray_metrics.txt
 - spec/lib/datadog_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb