skylight 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b231efb3b8755c457f1316274b958b7cca970b
-  data.tar.gz: 29de749779071d642006126ac6cf0d80abdd4fcb
+  metadata.gz: 24be9df7072117a45c6e4396a7d164551ca75fc7
+  data.tar.gz: ca45a492d94fdef72c28a3737c873e30a1e6a735
 SHA512:
-  metadata.gz: 13a8e72d5bcd1dc3fa3745ad27411020e1f5d6c9800fbd6d0b963a8a8d0bb0226831b1bb024ab48f30044fc6bbb44b871dda9591934eda213e8ce30701327b8d
-  data.tar.gz: 74be721ea966f9aa8836e273d41c49b1f392a19ef0f9e4856329460a6d7c76bed665d2c54c4a6dcb0e8ebcd5831d19d9ff6387475be83f589d89d21fb4832264
+  metadata.gz: cb70e2c9aeb62bb59df1c1070218cdd18301a8d3280d515969b51751fcf9aedbde0af55b772a96eaa0d0a0b53ab8b38dfe3ef87631721b3545ec4b2270aeeb82
+  data.tar.gz: 9d9f034c346ff2ae0c1629092ccdc349d08a598f5ad21c4b78d8fe006bf7ddd641a77a0019b902133867ccb8bb1298f22167cd6d734189df904a1cf948e7cb48

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.1 (October 1, 2015)
+
+* [BUGFIX] Fix agent on OS X El Capitan.
+* [PERFORMANCE] Explicitly subscribe to normalized events
+* [IMPROVEMENT] Use native unique description tracking
+* [IMPROVEMENT] Native SQL: Support multistatement queries
+
 ## 0.8.0 (August 13, 2015)
 
 * [FEATURE] Add Grape instumentation. See http://docs.skylight.io/grape

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.7.0-1c24017"
+version: "0.7.0-6aad54d"
 checksums:
-  x86-linux:     "717333a52e0a9ee3cae0406339a5532e722ec00c77babe71412f02fda60df212"
-  x86_64-linux:  "f63d13680ed9004bd958beb0f1bba6837125b882f005931201f9bcadc435d7f9"
-  x86_64-darwin: "9da568af9f4b9b2b613a36432b440d0fd705e567159819f9337fa344d42c04f6"
+  x86-linux:     "a3a16d2de1070d455dae8e46f95c8fa3621adfb062f7b23d629df870d6d7b385"
+  x86_64-linux:  "c62bcb68c124c5664cf22254c17db68b7f7a3fe6da9148a3f49c546449a9e766"
+  x86_64-darwin: "bb42c08044a94332a69c7d343273488d44ed7c85d3f1e2f37834f4ed6cdd178d"

data/ext/skylight_native.c

@@ -236,6 +236,30 @@ instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
   return Qnil;
 }
 
+static VALUE
+instrumenter_track_desc(VALUE self, VALUE rb_endpoint, VALUE rb_desc) {
+  int tracked;
+  sky_instrumenter_t* instrumenter;
+
+  CHECK_TYPE(rb_endpoint, T_STRING);
+  CHECK_TYPE(rb_desc, T_STRING);
+
+  tracked = 0;
+
+  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
+
+  CHECK_FFI(
+      sky_instrumenter_track_desc(instrumenter, STR2BUF(rb_endpoint), STR2BUF(rb_desc), &tracked),
+      "native Instrumenter#track_desc failed");
+
+  if (tracked) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
 /*
  *
  * class Skylight::Trace
@@ -460,4 +484,5 @@ void Init_skylight_native() {
   rb_define_method(rb_cInstrumenter, "native_start", instrumenter_start, 0);
   rb_define_method(rb_cInstrumenter, "native_stop", instrumenter_stop, 0);
   rb_define_method(rb_cInstrumenter, "native_submit_trace", instrumenter_submit_trace, 1);
+  rb_define_method(rb_cInstrumenter, "native_track_desc", instrumenter_track_desc, 2);
 }

data/lib/skylight/config.rb

@@ -86,8 +86,6 @@ module Skylight
       :'auth_url'             => 'https://auth.skylight.io/agent',
       :'sql_mode'             => 'ruby',
       :'daemon.lazy_start'    => true,
-      :'daemon.ssl_cert_path' => Util::SSL.ca_cert_file_or_default,
-      :'daemon.ssl_cert_dir'  => Util::SSL.ca_cert_dir,
 
       # == Legacy ==
       :'log_file'                => '-'.freeze,
@@ -111,6 +109,11 @@ module Skylight
       :'metrics.report_interval' => 60
     }
 
+    if Skylight::Util::Platform::OS != 'darwin'
+      DEFAULTS[:'daemon.ssl_cert_path'] = Util::SSL.ca_cert_file_or_default
+      DEFAULTS[:'daemon.ssl_cert_dir'] = Util::SSL.ca_cert_dir
+    end
+
     if Skylight.native?
       native_path = Skylight.libskylight_path
 

data/lib/skylight/instrumenter.rb

@@ -7,7 +7,6 @@ module Skylight
   class Instrumenter
     KEY  = :__skylight_current_trace
     LOCK = Mutex.new
-    DESC_LOCK = Mutex.new
 
     TOO_MANY_UNIQUES = "<too many unique descriptions>"
 
@@ -87,7 +86,6 @@ module Skylight
       @subscriber = Subscriber.new(config, self)
 
       @trace_info = @config[:trace_info] || TraceInfo.new
-      @descriptions = Hash.new { |h,k| h[k] = {} }
     end
 
     def current_trace
@@ -227,15 +225,12 @@ module Skylight
     def limited_description(description)
       endpoint = @trace_info.current.endpoint
 
-      DESC_LOCK.synchronize do
-        set = @descriptions[endpoint]
-
-        if set.size >= 100
-          return TOO_MANY_UNIQUES
+      if description
+        if native_track_desc(endpoint, description)
+          description
+        else
+          TOO_MANY_UNIQUES
         end
-
-        set[description] = true
-        description
       end
     end
 

data/lib/skylight/normalizers.rb

@@ -113,6 +113,10 @@ module Skylight
         @normalizers = normalizers
       end
 
+      def keys
+        @normalizers.keys
+      end
+
       def normalize(trace, name, payload)
         normalizer_for(name).normalize(trace, name, payload)
       end

data/lib/skylight/subscriber.rb

@@ -14,7 +14,8 @@ module Skylight
 
     def register!
       unregister! if @subscriber
-      @subscriber = ActiveSupport::Notifications.subscribe nil, self
+      pattern = ArrayPattern.new(@normalizers.keys)
+      @subscriber = ActiveSupport::Notifications.subscribe pattern, self
     end
 
     def unregister!
@@ -22,6 +23,18 @@ module Skylight
       @subscriber = nil
     end
 
+    class ArrayPattern
+
+      def initialize(keys)
+        @keys = Set.new keys
+      end
+
+      def ===(item)
+        @keys.include?(item)
+      end
+
+    end
+
     #
     #
     # ===== ActiveSupport::Notifications API

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport