sqreen 1.15.7 → 1.15.8.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29143768deb93b6a47c7804f971242b4700652a3e32ebd7f100346c522da5e73
-  data.tar.gz: 38eb496eb742d27392ae5587d551668fba57432d29f0dc4199e2f82d6614eb7e
+  metadata.gz: 4338bb99bd2f9ed5de996bdb28b9751cdfbbc4385a8caa1f0f7da8ff89a54b01
+  data.tar.gz: 410dc9b5f08e2393f73046c3ff17bcd39a3225eca4e5dc6582e8d15ff7d2d9ce
 SHA512:
-  metadata.gz: 9a87ceb16ebfbfaa5039ad6425b55bc882d622a448608c7e935e9670e65482ea1d2795c8ef9854d61cfa3a8542354c73cd3e295ea5f85549fe044e60ee529ba1
-  data.tar.gz: 5dbaeadca8d7fb1f96b4b7710c8ccef57b10b45522b344f7fe2b0440f8cd8b9675e337a52e4a51efbc16d822d43f5ab9397a51ee2647dc38a0948cb7b05bad77
+  metadata.gz: 4e8f110c02c0cedbe5afc457f8f743c996359096f0e51fd86ede7ed31d57336e44632b9161e97d6ff1c0be5dac438ac24a48d6bf832d6a2e20407709bfc5c162
+  data.tar.gz: 9acf76a1f4c7ac48a4df3955c2ed5d033cb4ce52fa1cd29875007a04e634794d9c7c25c3399be1ed91aec075cf2ee9ac5153b90b2897fba55f67030dba05764b

data/lib/sqreen/js/mini_racer_adapter.rb

@@ -59,8 +59,25 @@ module Sqreen
         end
       end
 
-      def give_back_context(isolate)
-        @mutex.synchronize { @contexts.push(isolate); }
+      def give_back_context(context)
+        context.possibly_gc
+
+        if context.gc_load > 30
+          if context.gc_threshold_in_bytes == DEFAULT_GC_THRESHOLD
+            context.gc_threshold_in_bytes *= 2
+            Sqreen.log.warn('Context %s had too many close garbage collections; ' \
+                            'doubling the threshold to %d bytes',
+                            context, context.gc_threshold_in_bytes)
+            context.gc_load = 0
+          else
+            Sqreen.log.warn('Context %s had too many close garbage ' \
+                            'collections; discarding it', context)
+            context.dispose
+            return
+          end
+        end
+
+        @mutex.synchronize { @contexts.push(context); }
       end
     end
 
@@ -194,10 +211,15 @@ module Sqreen
       private
 
       class << self
+        DEFAULT_GC_THRESHOLD = 15000000  # 15 MB
+
         def define_sqreen_context(modoole)
           # Context specialized for Sqreen usage
           Sqreen::Js.const_set 'SqreenContext', Class.new(modoole.const_get('Context'))
           SqreenContext.class_eval do
+            attr_accessor :gc_threshold_in_bytes
+            attr_accessor :gc_load
+
             def has_code?(code_id)
               return false unless @code_ids
               @code_ids.include?(code_id)
@@ -233,6 +255,22 @@ module Sqreen
               end
             end
 
+            def possibly_gc
+              Sqreen.log.warn("Heap usage: #{heap_stats[:total_heap_size]} for #{object_id}")
+
+              @gc_threshold_in_bytes = DEFAULT_GC_THRESHOLD
+              @gc_load ||= 0
+
+              # garbage collections max 1 in every 4 calls (avg)
+              if heap_stats[:total_heap_size] > @gc_threshold_in_bytes
+                Sqreen.log.warn("Doing low memory notification for context")
+                low_memory_notification
+                @gc_load += 4
+              else
+                @gc_load = [0, @gc_load - 1].max
+              end
+            end
+
             private
 
             def transf_global_funcs(code_id)

data/lib/sqreen/log.rb

@@ -2,6 +2,7 @@
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 
 require 'logger'
+require 'singleton'
 
 require 'sqreen/performance_notifications/log'
 require 'sqreen/performance_notifications/log_performance'

data/lib/sqreen/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Sqreen. All Rights Reserved.
 # Please refer to our terms for more information: https://www.sqreen.io/terms.html
 module Sqreen
-  VERSION = '1.15.7'.freeze
+  VERSION = '1.15.8.beta1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqreen
 version: !ruby/object:Gem::Version
-  version: 1.15.7
+  version: 1.15.8.beta1
 platform: ruby
 authors:
 - Sqreen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sq_mini_racer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2.sqreen1
+        version: 0.2.4.sqreen1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2.sqreen1
+        version: 0.2.4.sqreen1
 description: Sqreen is a SaaS based Application protection and monitoring platform
   that integrates directly into your Ruby applications. Learn more at https://sqreen.io.
 email: contact@sqreen.io
@@ -134,9 +134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7