oneapm_rpm 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5b0c0c59292b8f19af963c849d53950ac6a556
-  data.tar.gz: e8362436077b6c3236e5672ae961a71cdd609bc4
+  metadata.gz: d94355838c55b992111ec0531980237b0f7e57b8
+  data.tar.gz: 4b484e6161e5233b5de9658808d4d0b2bc64d66d
 SHA512:
-  metadata.gz: 4addfa281b3b3438d0710c627b8d5ead8e79ad222b2a82794e4721fd25a41bc8631c629704441f252514e388a47aaf90d552a259c1eef71785d17400dd2b118b
-  data.tar.gz: eaab7c7c62faaf4d6f43b0929c5a1709dd9c96bd733687e325324295705e69652f62e0f068daaad98979dd1a9013bd7a753fc251b353ff7c820778b79b179e55
+  metadata.gz: 3466e03dbfceebed0482fea07276e1ee029fd04500baed33876f8adf9b378fc4be7a13b697b72e2f26303a79be06269f69045ef232ea5ca4f71a418f96690aac
+  data.tar.gz: 78716e10e0da55fdaf56c3dd0e59f5dcffc0825405d40f7500919158b5b963e0647aa25ac4416804f56efd0f937edb70d5ea42f92698d9adb2159f2062bd83ae

data/lib/one_apm/agent/datastore/metric_helper.rb

@@ -34,7 +34,7 @@ module OneApm
         end
 
         def self.product_rollup(product)
-          "Datastore//#{product}/all"
+          "Datastore/#{product}/all"
         end
 
         def self.suffixed_rollup(suffix)
@@ -46,7 +46,7 @@ module OneApm
           "Datastore/statement/#{product}/#{collection}/#{operation}"
         end
 
-        #Datastore/statement/NoSqlType:10.128.6.240:27017/book/insert
+        #Datastore/statement/NoSqlType:10.128.6.240:27017/insert
         def self.statement_action_metric_for(product, operation)
           "Datastore/statement/#{product}/#{operation}"
         end
@@ -78,20 +78,27 @@ module OneApm
 
           # Order of these metrics matters--the first metric in the list will
           # be treated as the scoped metric in a bunch of different cases.
-          metrics = [
-            operation_metric_for(product, operation),
-            operation_product_rollup(product),
-            operation_all(product),
-            product_suffixed_rollup(product, suffix),
-            product_rollup(product),
-            suffixed_rollup(suffix),
-            OA_ROLLUP_METRIC
-          ]
-
-          metrics.unshift statement_metric_for(product, collection, operation) if collection
-          metrics.unshift statement_action_metric_for(product,operation)
-          metrics.unshift statement_all_metric_for(product)
-          metrics.unshift statement_all(product)
+          metrics = Array.new
+          unless collection
+            metrics.push(
+              operation_metric_for(product, operation),
+              operation_product_rollup(product),
+              operation_all(product)
+            )
+          else
+            metrics.push(
+              statement_metric_for(product, collection, operation),
+              statement_action_metric_for(product,operation),
+              statement_all_metric_for(product),
+              statement_all(product)
+            )
+          end
+          metrics.push(
+              product_suffixed_rollup(product, suffix),
+              product_rollup(product),
+              suffixed_rollup(suffix),
+              OA_ROLLUP_METRIC
+          )
           metrics
         end
 

data/lib/one_apm/support/http_clients/uri_util.rb

@@ -29,8 +29,11 @@ module OneApm
             address.normalize!
             URI.parse(address.to_s)
           else
-            'http://'
-            URI.parse(url)
+            if url.include?('://')
+              URI.parse(url)
+            else
+              URI.parse('http://' + url)
+            end
           end
         end
 

data/lib/one_apm/version.rb

@@ -5,8 +5,9 @@ module OneApm
 
     MAJOR = 1
     MINOR = 4
-    TINY  = 1
-
+    TINY  = 2
+    #TAG   = Time.now.getutc.strftime("%Y%m%d%H%M%S")
+    #STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 
   end

data/oneapm_rpm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.5'
 
   file_list = `git ls-files`.split
-  file_list.delete_if { |item| item =~ /(test\/|bin\/|Rakefile)/ }
+  file_list.delete_if { |item| item =~ /(test\/|bin\/|dev\/|Rakefile)/ }
   s.files = file_list
 
   s.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -562,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: OneApm Ruby Agent