skylight 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e17f0c6b492a15fe9be1823c16121ffa55ffbb
-  data.tar.gz: 000df33e16f6d5cd9c8e007e96f20d0a7fac89cb
+  metadata.gz: 8c2808cf85e0a48a911372e657dcfe99a191bf6e
+  data.tar.gz: bda10993e74865cc28f05f5db97a244ddf1af972
 SHA512:
-  metadata.gz: 5bc55e53b477093f2239a954aa2892a14b34cf7a49d85d48c83c77a04348b09be58f6529fd6ce0e58a09dc9662f801ba890388390498ddf7045dfd83cb8250aa
-  data.tar.gz: 8635a462ded00edf9e8cdf8c05919a64201a7f9d7e5b39a4cb107b89454635602cd1ef2a655fe3b2a989c403f90d782423d01cbbed6af202c2c84e72dbfe241a
+  metadata.gz: c247a8b0b9cde850ff0aa98cfb4a867fc73ef05539ab5f7fbdfc478e820a160bf0f4a8b22e94a94d2de731cf715fcefc623fc2dba64f1979738ffdb08c0620a0
+  data.tar.gz: 7f7893da15b537872e33abe3b670c69ce2ae5b0c62806300dafbed5242fea08edcea068514ed390c4bce5f39da1bdb85641556f115fce7ffcdb39d6e7633fc8c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.10 (April 8, 2014)
+
+* Don't raise on missing native agent path
+
+## 0.3.9 (April 8, 2014)
+
+* Avoid finalizing sockets in the child process
+* Fix non-displaying warnings around native agent
+* Remove HTTP path information from title for better grouping
+
 ## 0.3.8 (April 3, 2014)
 
 * Update vendored highline to 1.6.21

data/ext/skylight.h

@@ -53,7 +53,6 @@ bool skylight_high_res_time(uint64_t*);
 // Rust skylight_trace prototypes
 bool skylight_trace_new(uint64_t, RustSlice, RustTrace*);
 bool skylight_trace_free(RustTrace);
-bool skylight_trace_load(RustSlice, RustTrace*);
 bool skylight_trace_name_from_serialized_into_new_buffer(RustSlice, RustString*);
 bool skylight_trace_get_started_at(RustTrace, uint64_t*);
 bool skylight_trace_set_name(RustTrace, RustSlice);

data/ext/skylight_native.c

@@ -308,16 +308,6 @@ static VALUE trace_new(VALUE self, VALUE started_at, VALUE uuid) {
   return Data_Wrap_Struct(rb_cTrace, NULL, skylight_trace_free, trace);
 }
 
-static VALUE trace_load(VALUE self, VALUE protobuf) {
-  CHECK_TYPE(protobuf, T_STRING);
-
-  RustTrace trace;
-
-  CHECK_FFI(skylight_trace_load(STR2SLICE(protobuf), &trace), "Could not load Trace");
-
-  return Data_Wrap_Struct(rb_cTrace, NULL, skylight_trace_free, trace);
-}
-
 static VALUE trace_name_from_serialized(VALUE self, VALUE protobuf) {
   CHECK_TYPE(protobuf, T_STRING);
 
@@ -513,7 +503,6 @@ void Init_skylight_native() {
 
   rb_cTrace = rb_define_class_under(rb_mSkylight, "Trace", rb_cObject);
   rb_define_singleton_method(rb_cTrace, "native_new", trace_new, 2);
-  rb_define_singleton_method(rb_cTrace, "native_load", trace_load, 1);
   rb_define_singleton_method(rb_cTrace, "native_name_from_serialized", trace_name_from_serialized, 1);
   rb_define_method(rb_cTrace, "native_get_started_at", trace_get_started_at, 0);
   rb_define_method(rb_cTrace, "native_get_name", trace_get_name, 0);

data/lib/skylight.rb

@@ -52,12 +52,13 @@ module Skylight
 
   def self.warn_skylight_native_missing
     # TODO: Dumping the error messages this way is pretty hacky
-    if defined?(Rails) && !Rails.env.development? && !Rails.env.test?
-      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. We currently support monitoring in 32- and 64-bit Linux only. If you are on a supported platform, please contact support at support@skylight.io. The missing extension will not affect the functioning of your application."
-    elsif defined?(Rails)
-      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{Rails.env} mode. No data will be reported until you deploy your app."
+    is_rails = defined?(Rails)
+    env_name = is_rails ? Rails.env : "development"
+
+    if env_name == "development" || env_name == "test"
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{env_name} mode. No data will be reported until you deploy your app."
     else
-      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode."
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. We currently support monitoring in 32- and 64-bit Linux only. If you are on a supported platform, please contact support at support@skylight.io. The missing extension will not affect the functioning of your application."
     end
   end
 
@@ -157,19 +158,21 @@ module Skylight
     end
 
     if Hash === opts
-      category = opts.delete(:category) || DEFAULT_CATEGORY
-      title    = opts.delete(:title)
-      desc     = opts.delete(:description)
+      category    = opts[:category] || DEFAULT_CATEGORY
+      title       = opts[:title]
+      desc        = opts[:description]
+      annotations = opts[:annotations]
     else
-      category = DEFAULT_CATEGORY
-      title    = opts.to_s
-      desc     = nil
+      category    = DEFAULT_CATEGORY
+      title       = opts.to_s
+      desc        = nil
+      annotations = nil
     end
 
     if block_given?
-      inst.instrument(category, title, desc) { yield }
+      inst.instrument(category, title, desc, annotations) { yield }
     else
-      inst.instrument(category, title, desc)
+      inst.instrument(category, title, desc, annotations)
     end
   end
 

data/lib/skylight/formatters/http.rb

@@ -1,31 +1,16 @@
 module Skylight
   module Formatters
     module HTTP
-
       def self.build_opts(method, scheme, host, port, path, query)
-        category    = "api.http.#{method.downcase}"
-        title       = "#{method.upcase} #{host || path}"
-        description = "#{method.upcase} #{build_url(scheme, host, port, path, query)}"
-
-        { category: category, title: title, description: description }
-      end
-
-      def self.build_url(scheme, host, port, path, query)
-        url = ''
-        if scheme
-          url << "#{scheme}://"
-        end
-        if host
-          url << host
-        end
-        if port
-          url << ":#{port}"
-        end
-        url << path
-        if query
-          url << "?#{query}"
-        end
-        url
+        { category: "api.http.#{method.downcase}",
+          title:    "#{method.upcase} #{host}",
+          annotations: {
+            method: method.upcase,
+            scheme: scheme,
+            host:   host,
+            port:   port ? port.to_i : nil,
+            path:   path,
+            query:  query }}
       end
     end
   end

data/lib/skylight/native.rb

@@ -70,10 +70,6 @@ module Skylight
 
     class Trace
       alias serialize native_serialize
-
-      class << self
-        alias deserialize native_load
-      end
     end
 
     class Batch

data/lib/skylight/railtie.rb

@@ -15,19 +15,19 @@ module Skylight
     config.skylight.probes = []
 
     initializer 'skylight.configure' do |app|
-      if Skylight.native?
-        if activate?
-          load_probes
+      if activate?
+        load_probes
 
-          if config = load_skylight_config(app)
-            Instrumenter.start!(config)
+        if config = load_skylight_config(app)
+          if Instrumenter.start!(config)
             app.middleware.insert 0, Middleware
-
             puts "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
           end
-        elsif !Rails.env.test? && Rails.env.development?
-          puts "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
         end
+      elsif Rails.env.development?
+        puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode. No data will be reported until you deploy your app."
+      elsif !Rails.env.test?
+        puts "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
       end
     end
 

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.8'
+  VERSION = '0.3.10'
 end
 

data/lib/skylight/worker/standalone.rb

@@ -15,15 +15,19 @@ module Skylight
 
       # Locates skylight_native so that it can be included in the standalone agent startup command
       def self.locate_skylight_native
-        $LOADED_FEATURES.each do |feature|
+        $LOADED_FEATURES.find do |feature|
           return feature if feature =~ /skylight_native\.#{RbConfig::CONFIG['DLEXT']}/
         end
       end
 
       def self.build_subprocess_cmd
+        # Native extension location
+        native_path = locate_skylight_native
+        native_dir = native_path ? File.dirname(native_path) : nil
+
         paths = [
           File.expand_path('../../..', __FILE__), # Ruby code root
-          File.dirname(locate_skylight_native)    # Native extension location
+          native_dir
         ].uniq.compact
 
         ret = [ RUBYBIN ]
@@ -296,12 +300,20 @@ module Skylight
       # Spawn the worker process.
       def spawn_worker(f)
         pid = fork do
-          Process.setsid
-          exit if fork
+          # Note: By default, Ruby will finalize C objects inside the fork. Because those C objects
+          # are shared with the parent, this can cause database connections to disconnect in the
+          # parent process. We need to double-fork for proper semantics, so we disable the GC and
+          # exit! to avoid finalizing shared handles.
+          #
+          # We should continue to look for alternate solutions, and to determine whether there is
+          # still a possible race between the fork and the GC disabling.
+          ::GC.disable
+          ::Process.setsid
+          exit! if fork
 
           # Acquire exclusive file lock, exit otherwise
           unless f.flock(File::LOCK_EX | File::LOCK_NB)
-            exit 1
+            exit! 1
           end
 
           f.truncate(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport