fluent-plugin-jfrog-metrics 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d5ad46df6caec2199b42f521c9722ce27552d988fda9950d8f5dac659e40ed
-  data.tar.gz: 4ec636b979f8cae25013c698d977d3b9021b68325b806b8c415f3fa356396593
+  metadata.gz: e129c6f7bc3ddd71533676e19f0684500cbceb9785db59e514d3e18a6d42a856
+  data.tar.gz: 1ae603b9e3ed77ed7d66ec8ba92eea76461b25b4b064f168d562b222c0d59234
 SHA512:
-  metadata.gz: c0e1bc0f53fd024f6f200b27a4e0c39f98833b1412bf2fcaebbd24c743e7188dd8107c5a5f5e31c12cf8c0d9a88387ffe19bc5852e53c38afbe1b29dc18eebfa
-  data.tar.gz: f1db053da0248b953b9c023d092b101bd22dbf8a2a7a7379efacc675d6fb3ca8e161ea1dc66d43f01483da9e898057b0f373b4961781efe924a38420a585643a
+  metadata.gz: 2338a45c27238e28b806916812acf7c33e64d7df4d1b8af67447e6b05ab0a7db5e58ada412dccd8ec4e95a27fe14037ec34f798cf0a4847ff3911980de2ef13a
+  data.tar.gz: f2ac0b3afca4d3301455ba5ae565e585f6eba3fcb930a34db5b488069fa83e3411c7bdb08892268ee632a4e9772889fcb4cce45956c6bd6ee4ea9f1da7b10c09

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.2.15] - 2026-03-24
+
+### 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
+    ```
+
+### Added
+- Unit tests for metrics with nested curly braces to prevent regression
+
+## [0.2.14] - 2026-01-19
+
+### Previous Release
+- See previous release notes for earlier changes

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.14'
+  spec.version = '0.2.15'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 
@@ -13,12 +13,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/jfrog/jfrog-fluentd-plugins/tree/main/fluent-plugin-jfrog-metrics'
   spec.license       = 'Apache-2.0'
 
-  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.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/**/*']
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'

data/lib/fluent/plugin/datadog_metrics_parser.rb

@@ -19,7 +19,7 @@ class DatadogMetricsParser < BaseMetricsParser
       point = {}
       points = []
       if interim_data =~ /{/ && interim_data =~ /}/
-        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
+        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*?){(.*)}(.*)/i).captures
         additional_dims.split("\",").each do |interim_data|
           pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
           interim_data_value = pair_data.split("=", 2)[1]

data/lib/fluent/plugin/newrelic_metrics_parser.rb

@@ -17,7 +17,7 @@ class NewRelicMetricsParser < BaseMetricsParser
       metrics_hash = {}
       if interim_data =~ /{/ && interim_data =~ /}/
         attributes = {}
-        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*){(.*)}(.*)/i).captures
+        metric_name, additional_dims, metric_val_and_time = interim_data.match(/(.*?){(.*)}(.*)/i).captures
         additional_dims.split("\",").each do |interim_data|
           pair_data = interim_data.gsub("\"", "").gsub("{", "").gsub("}", "")
           interim_data_value = pair_data.split("=", 2)[1]

data/lib/fluent/plugin/splunk_metrics_parser.rb

@@ -20,7 +20,7 @@ class SplunkMetricsParser < BaseMetricsParser
   def generate_hash_from_data(data = '', prefix = '', separator = '')
     metrics_hash = {}
     if data =~ /{/ && data =~ /}/
-      metric_name, additional_dims, metric_val_and_time = data.match(/(.*){(.*)}(.*)/i).captures
+      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'] =

data/spec/fixtures/files/sample_metrics_with_nested_braces.txt

@@ -0,0 +1,12 @@
+# 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

data/spec/lib/datadog_metrics_parser_spec.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+[
+  File.join(File.dirname(__FILE__), '..'),
+  File.join(File.dirname(__FILE__), '..', 'lib/fluent/plugin'),
+  File.join(File.dirname(__FILE__), '..', 'spec'),
+].each do |dir|
+  $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+end
+
+require 'datadog_metrics_parser'
+require 'date'
+require 'rspec'
+
+
+RSpec.describe DatadogMetricsParser do
+  describe "#emit_parsed_metrics" do
+    it 'should read sample Artifactory metrics data and verify the size of parsed data > 1' 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')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      expect(hash_data_array.size).to be 1
+
+      serialized_data = parser.serialize_data(hash_data_array)
+      expect(serialized_data.size).to be 1
+    end
+
+    it 'should read sample Xray metrics data and verify the size of parsed data > 1' do
+      platform_metrics = File.read('./spec/fixtures/files/sample_xray_metrics.txt')
+      expect(platform_metrics.size).to be > 1
+
+      parser = DatadogMetricsParser.new('jfrog.xray', '', 'jfrog.xray.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.xray', '.')
+      expect(hash_data_array.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')
+      expect(platform_metrics.size).to be > 1
+
+      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      expect(hash_data_array.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('{')
+        expect(metric['points']).not_to be_nil
+        expect(metric['points'].size).to be >= 1
+      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')
+    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'
+
+      parser = DatadogMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+
+      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
+    end
+  end
+end

data/spec/lib/newrelic_metrics_parser_spec.rb

@@ -51,5 +51,45 @@ RSpec.describe NewRelicMetricsParser do
       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')
+      expect(platform_metrics.size).to be > 1
+
+      parser = NewRelicMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      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
+      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 = 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')
+    end
   end
 end

data/spec/lib/splunk_metrics_parser_spec.rb

@@ -51,5 +51,39 @@ RSpec.describe SplunkMetricsParser do
       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')
+      expect(platform_metrics.size).to be > 1
+
+      parser = SplunkMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+
+      normalized_data = parser.normalise_data(platform_metrics)
+      expect(normalized_data.size).to be > 1
+
+      cleaned_data = parser.clean_data(normalized_data)
+      expect(cleaned_data.size).to be > 1
+
+      hash_data_array = parser.format_data(cleaned_data, 'jfrog.artifactory', '.')
+      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
+      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 = SplunkMetricsParser.new('jfrog.artifactory', '', 'jfrog.artifactory.metrics')
+      result = parser.generate_hash_from_data(metric_line, 'jfrog.artifactory', '.')
+
+      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')
+    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.14
+  version: 0.2.15
 platform: ruby
 authors:
 - MahithaB, BenHarosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,10 +109,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -126,7 +124,9 @@ 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_xray_metrics.txt
+- spec/lib/datadog_metrics_parser_spec.rb
 - spec/lib/metrics_helper_spec.rb
 - spec/lib/newrelic_metrics_parser_spec.rb
 - spec/lib/splunk_metrics_parser_spec.rb
@@ -159,12 +159,14 @@ summary: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics
   Exposition Format) to target observability platform format (Splunk HEC, New Relic,
   DataDog)
 test_files:
-- spec/fixtures/files/creds.rb
-- spec/fixtures/files/sample_artifactory_metrics.txt
-- spec/fixtures/files/sample_xray_metrics.txt
-- spec/lib/metrics_helper_spec.rb
-- spec/lib/newrelic_metrics_parser_spec.rb
-- spec/lib/splunk_metrics_parser_spec.rb
-- spec/spec_helper.rb
 - test/helper.rb
 - test/plugin/test_in_jfrog_metrics.rb
+- spec/spec_helper.rb
+- 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

data/.gitignore

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

data/.rspec

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

data/Gemfile.lock

@@ -1,81 +0,0 @@
-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