fluent-plugin-jfrog-metrics 0.2.15 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e129c6f7bc3ddd71533676e19f0684500cbceb9785db59e514d3e18a6d42a856
-  data.tar.gz: 1ae603b9e3ed77ed7d66ec8ba92eea76461b25b4b064f168d562b222c0d59234
+  metadata.gz: 87d664942597bf1b01b10d646cfd7688e86c9eefe43488d4357777e4b2e30abb
+  data.tar.gz: 1f622fe466d1c2490ccc3719b06fc1d43dd888a24f725fb10bb7d760e001870e
 SHA512:
-  metadata.gz: 2338a45c27238e28b806916812acf7c33e64d7df4d1b8af67447e6b05ab0a7db5e58ada412dccd8ec4e95a27fe14037ec34f798cf0a4847ff3911980de2ef13a
-  data.tar.gz: f2ac0b3afca4d3301455ba5ae565e585f6eba3fcb930a34db5b488069fa83e3411c7bdb08892268ee632a4e9772889fcb4cce45956c6bd6ee4ea9f1da7b10c09
+  metadata.gz: 7eebd867297ddb78732c1c72621e3a89064ec3273893fee443f32403dd3cccf4b0c3ecc8bed29230545561b2c5dc0ad0f3b09296a9302f03df8da11fe0f6a31f
+  data.tar.gz: fc09d5541762477d5e8405e712abf72df64ab94bf7f6af88eaa0bcd8bda671d5f89e94f28c2d67c9692a40eb40c17a4752b4afe71020219a4db35194308fa07d

data/.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+fluent-plugin-jfrog-metrics-*.gem
+fluent-plugin-jfrog-metrics.iml

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,24 +1,22 @@
 # Changelog
 
-All notable changes to this project will be documented in this file.
+## 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
 
-## [0.2.15] - 2026-03-24
+## v0.2.16
+- 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`
 
-### Fixed
-- **JOBS-2011**: Fixed regex parsing issue that caused metrics shipping to fail when Artifactory emits metrics with nested curly braces in label values
-  - Changed regex from greedy `/(.*){(.*)}(.*)/i` to non-greedy `/(.*?){(.*)}(.*)/i` in all three parser files:
-    - `datadog_metrics_parser.rb`
-    - `splunk_metrics_parser.rb`
-    - `newrelic_metrics_parser.rb`
-  - This fix resolves the "no implicit conversion of nil into String" error when parsing metrics like:
-    ```
-    db_query_large_total{action="/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}",application="Artifactory"} 1.0
-    ```
+## v0.2.13
+- Added fix to parse metrics without timestamps (JOBS-1801)
+- Honour NO_PROXY environment variable for log analytics solutions (JOBS-1732)
 
-### Added
-- Unit tests for metrics with nested curly braces to prevent regression
+## v0.2.12
+- Add FluentD logger option to metrics plugins (PTRENG-6541)
+- Fix wrapper for gzip stream handling (PTRENG-6489)
+- Enhance HTTP request timeout handling (PTRENG-6489)
 
-## [0.2.14] - 2026-01-19
-
-### Previous Release
-- See previous release notes for earlier changes
+## v0.2.11
+- Add support for verify_ssl flag (PTRENG-6164)
+- Add http_proxy param support for API calls to vendors (PTRENG-6261)

data/Gemfile.lock

@@ -0,0 +1,81 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-jfrog-metrics (0.2.13)
+      fluentd (>= 0.14.10, < 2)
+      rest-client (~> 2.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    cool.io (1.7.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    fluentd (1.16.1)
+      bundler
+      cool.io (>= 1.4.5, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
+      msgpack (>= 1.3.1, < 2.0.0)
+      serverengine (>= 2.3.2, < 3.0.0)
+      sigdump (~> 0.2.2)
+      strptime (>= 0.2.4, < 1.0.0)
+      tzinfo (>= 1.0, < 3.0)
+      tzinfo-data (~> 1.0)
+      webrick (~> 1.4)
+      yajl-ruby (~> 1.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.4)
+      domain_name (~> 0.5)
+    http_parser.rb (0.8.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.1115)
+    minitest (5.14.4)
+    minitest-reporters (1.4.3)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    msgpack (1.7.1)
+    netrc (0.11.0)
+    power_assert (2.0.1)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    ruby-progressbar (1.11.0)
+    serverengine (2.3.2)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.5)
+    test-unit (3.5.0)
+      power_assert
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2023.3)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
+    webrick (1.8.1)
+    yajl-ruby (1.4.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.14)
+  fluent-plugin-jfrog-metrics!
+  minitest
+  minitest-reporters (>= 0.5.0)
+  rake (~> 12.0)
+  rest-client (>= 2.1.0)
+  test-unit (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,19 +3,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.15'
+  spec.version = '0.2.17'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 
-  spec.summary       = %q{Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
-  spec.description   = %q{Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
+  spec.summary       = %q{Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
+  spec.description   = %q{Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics (Prometheus Exposition Format) to target observability platform format (Splunk HEC, New Relic, DataDog)}
 
   spec.homepage      = 'https://github.com/jfrog/jfrog-fluentd-plugins/tree/main/fluent-plugin-jfrog-metrics'
   spec.license       = 'Apache-2.0'
 
-  spec.files         = Dir['lib/**/*', 'README.md', 'LICENSE', 'CHANGELOG.md', 'Gemfile', 'Rakefile', '*.gemspec']
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = Dir['test/**/*', 'spec/**/*']
+  test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.files         = files
+  spec.executables   = files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = test_files
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/lib/fluent/plugin/metrics_helper.rb

@@ -26,6 +26,8 @@ class MetricsHelper
             "#{@jpd_url}/artifactory/api/v1/metrics"
           when 'jfrog.xray'
             "#{@jpd_url}/xray/api/v1/metrics"
+          when 'jfrog.rtfs'
+            "#{@jpd_url}/rtfs/api/v1/metrics"
           else
             "#{@jpd_url}/artifactory/api/v1/metrics"
           end

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/datadog_metrics_parser_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe DatadogMetricsParser do
 
       hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
       expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
 
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be 1
@@ -47,16 +48,17 @@ RSpec.describe DatadogMetricsParser do
 
       hash_data_array = parser.format_data(cleaned_data, 'jfrog.xray', '.')
       expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
 
       serialized_data = parser.serialize_data(hash_data_array)
       expect(serialized_data.size).to be 1
     end
 
-    it 'should correctly parse metrics with nested curly braces in labels (JOBS-2011)' do
-      platform_metrics = File.read('./spec/fixtures/files/sample_metrics_with_nested_braces.txt')
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
       expect(platform_metrics.size).to be > 1
 
-      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+      parser = DatadogMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
 
       normalized_data = parser.normalise_data(platform_metrics)
       expect(normalized_data.size).to be > 1
@@ -64,44 +66,35 @@ RSpec.describe DatadogMetricsParser do
       cleaned_data = parser.clean_data(normalized_data)
       expect(cleaned_data.size).to be > 1
 
-      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
       expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be > 1
 
-      series_array = hash_data_array[0]['series']
-      expect(series_array.size).to be > 1
-
-      series_array.each do |metric|
-        expect(metric['metric']).to start_with('jfrog.artifactory.')
-        expect(metric['metric']).not_to include('{')
+      hash_data_array[0]['series'].each do |metric|
+        expect(metric['metric']).to start_with('jfrog.rtfs.')
         expect(metric['points']).not_to be_nil
         expect(metric['points'].size).to be >= 1
+        expect(metric['points'][0]['value']).to be_a(Numeric)
       end
-    end
-
-    it 'should parse single metric with nested braces correctly' do
-      metric_line = 'db_query_large_total{action="/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}",application="Artifactory",group="download",package="nuget"} 2.0 1711100784000'
 
-      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
-      result = parser.format_data([metric_line], 'jfrog.artifactory', '.')
-
-      expect(result.size).to eq(1)
-      series = result[0]['series']
-      expect(series.size).to eq(1)
-      expect(series[0]['metric']).to eq('jfrog.artifactory.db_query_large_total')
-      expect(series[0]['points'][0]['value']).to eq(2.0)
-      expect(series[0]['tags']).to include('action:/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}')
-      expect(series[0]['tags']).to include('application:Artifactory')
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
     end
 
-    it 'should not crash with nil values when parsing nested braces (regression test)' do
-      metric_with_complex_braces = 'db_query_large_total{action="/artifactory/api/artifactproperties{name:(/[^/]+?)?}",application="Artifactory",group="",package=""} 1.0 1711100784000'
+    it 'should parse a single RTFS metric line correctly' do
+      single_metric = "sys_memory_used_bytes 3836522496 1645738619452"
 
-      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+      parser = DatadogMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
+
+      hash_data_array = parser.format_data([single_metric], 'jfrog.rtfs', '.')
+      expect(hash_data_array.size).to be 1
+      expect(hash_data_array[0]['series'].size).to be 1
 
-      expect {
-        result = parser.format_data([metric_with_complex_braces], 'jfrog.artifactory', '.')
-        expect(result[0]['series'][0]['metric']).to eq('jfrog.artifactory.db_query_large_total')
-      }.not_to raise_error
+      metric = hash_data_array[0]['series'][0]
+      expect(metric['metric']).to eq('jfrog.rtfs.sys_memory_used_bytes')
+      expect(metric['points'][0]['value']).to eq(3836522496)
+      expect(metric['points'][0]['timestamp']).to eq(1645738619)
+      expect(metric['type']).to eq(3)
     end
   end
 end

data/spec/lib/newrelic_metrics_parser_spec.rb

@@ -52,11 +52,11 @@ RSpec.describe NewRelicMetricsParser do
       expect(serialized_data.size).to be  1
     end
 
-    it 'should correctly parse metrics with nested curly braces in labels (JOBS-2011)' do
-      platform_metrics = File.read('./spec/fixtures/files/sample_metrics_with_nested_braces.txt')
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
       expect(platform_metrics.size).to be > 1
 
-      parser = NewRelicMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+      parser = NewRelicMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
 
       normalized_data = parser.normalise_data(platform_metrics)
       expect(normalized_data.size).to be > 1
@@ -64,32 +64,40 @@ RSpec.describe NewRelicMetricsParser do
       cleaned_data = parser.clean_data(normalized_data)
       expect(cleaned_data.size).to be > 1
 
-      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
       expect(hash_data_array.size).to be 1
 
-      metrics_array = hash_data_array[0]['metrics']
-      expect(metrics_array.size).to be > 1
-
-      metrics_array.each do |metric|
-        expect(metric['name']).to start_with('jfrog.artifactory.')
-        expect(metric['name']).not_to include('{')
-        expect(metric['value']).not_to be_nil
+      hash_data_array[0]['metrics'].each do |metric|
+        expect(metric['name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
       end
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
     end
 
-    it 'should parse single metric with nested braces correctly' do
-      metric_line = 'db_query_large_total{action="/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}",application="Artifactory",group="download",package="nuget"} 2.0 1711100784000'
+    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.artifactory', '', 'jfrog.artifactory.metrics')
-      result = parser.format_data([metric_line], 'jfrog.artifactory', '.')
-
-      expect(result.size).to eq(1)
-      metrics = result[0]['metrics']
-      expect(metrics.size).to eq(1)
-      expect(metrics[0]['name']).to eq('jfrog.artifactory.db_query_large_total')
-      expect(metrics[0]['value']).to eq(2.0)
-      expect(metrics[0]['attributes']['action']).to eq('/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}')
-      expect(metrics[0]['attributes']['application']).to eq('Artifactory')
+      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

@@ -52,11 +52,11 @@ RSpec.describe SplunkMetricsParser do
       expect(serialized_data.size).to be > 1
     end
 
-    it 'should correctly parse metrics with nested curly braces in labels (JOBS-2011)' do
-      platform_metrics = File.read('./spec/fixtures/files/sample_metrics_with_nested_braces.txt')
+    it 'should parse RTFS metrics with jfrog.rtfs prefix and verify all metric names are prefixed' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_artifactory_metrics.txt')
       expect(platform_metrics.size).to be > 1
 
-      parser = SplunkMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+      parser = SplunkMetricsParser.new('jfrog.rtfs', '', 'jfrog.metrics.rtfs')
 
       normalized_data = parser.normalise_data(platform_metrics)
       expect(normalized_data.size).to be > 1
@@ -64,26 +64,38 @@ RSpec.describe SplunkMetricsParser do
       cleaned_data = parser.clean_data(normalized_data)
       expect(cleaned_data.size).to be > 1
 
-      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.rtfs', '.')
       expect(hash_data_array.size).to be > 1
 
-      hash_data_array.each do |metric_hash|
-        expect(metric_hash['metric_name']).to start_with('jfrog.artifactory.')
-        expect(metric_hash['metric_name']).not_to include('{')
-        expect(metric_hash['value']).not_to be_nil
+      hash_data_array.each do |metric|
+        expect(metric['metric_name']).to start_with('jfrog.rtfs.')
+        expect(metric['value']).to be_a(Numeric)
       end
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be > 1
     end
 
-    it 'should parse single metric with nested braces correctly' do
-      metric_line = 'db_query_large_total{action="/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}",application="Artifactory",group="download",package="nuget"} 2.0 1711100784000'
+    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')
 
-      parser = SplunkMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
-      result = parser.generate_hash_from_data(metric_line, 'jfrog.artifactory', '.')
+      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(result['metric_name']).to eq('jfrog.artifactory.db_query_large_total')
-      expect(result['value']).to eq(2.0)
-      expect(result['action']).to eq('/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}')
-      expect(result['application']).to eq('Artifactory')
+      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.15
+  version: 0.2.17
 platform: ruby
 authors:
 - MahithaB, BenHarosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-03-24 00:00:00.000000000 Z
+date: 2026-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,17 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
-description: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics
-  (Prometheus Exposition Format) to target observability platform format (Splunk HEC,
-  New Relic, DataDog)
+description: Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated
+  metrics (Prometheus Exposition Format) to target observability platform format (Splunk
+  HEC, New Relic, DataDog)
 email:
 - cpe-support@jfrog.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -124,7 +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_metrics_with_nested_braces.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
@@ -155,18 +158,18 @@ requirements: []
 rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics (Prometheus
-  Exposition Format) to target observability platform format (Splunk HEC, New Relic,
-  DataDog)
+summary: Fluentd Plugin for converting JFrog Artifactory, Xray, RTFS generated metrics
+  (Prometheus Exposition Format) to target observability platform format (Splunk HEC,
+  New Relic, DataDog)
 test_files:
-- test/helper.rb
-- test/plugin/test_in_jfrog_metrics.rb
-- spec/spec_helper.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/splunk_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb
 - spec/lib/newrelic_metrics_parser_spec.rb
-- spec/fixtures/files/sample_xray_metrics.txt
-- spec/fixtures/files/sample_metrics_with_nested_braces.txt
-- spec/fixtures/files/creds.rb
-- spec/fixtures/files/sample_artifactory_metrics.txt
+- spec/lib/splunk_metrics_parser_spec.rb
+- spec/spec_helper.rb
+- test/helper.rb
+- test/plugin/test_in_jfrog_metrics.rb

data/spec/fixtures/files/sample_metrics_with_nested_braces.txt

@@ -1,12 +0,0 @@
-# HELP db_query_large_total Total large queries
-# UPDATED db_query_large_total 1711100784000
-# TYPE db_query_large_total counter
-db_query_large_total{action="/artifactory/api/nuget/{repoKey}/Download/{packageId}/{packageVersion}",application="Artifactory",group="download",package="nuget"} 2.0 1711100784000
-# HELP db_query_large_total_alt Alternative large queries with different template
-# UPDATED db_query_large_total_alt 1711100784000
-# TYPE db_query_large_total_alt counter
-db_query_large_total{action="/artifactory/api/artifactproperties{name:(/[^/]+?)?}",application="Artifactory",group="",package=""} 1.0 1711100784000
-# HELP jfrt_http_connections_available_total Available HTTP Connections
-# UPDATED jfrt_http_connections_available_total 1711100784000
-# TYPE jfrt_http_connections_available_total gauge
-jfrt_http_connections_available_total{instance="node1",port="8081"} 50 1711100784000