skylight 0.8.0.beta.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0993e8d64b2871c815490a9f891733c1a6beaf7d
-  data.tar.gz: c003faa733b2421b9cca0843ee188333556a045e
+  metadata.gz: f6b231efb3b8755c457f1316274b958b7cca970b
+  data.tar.gz: 29de749779071d642006126ac6cf0d80abdd4fcb
 SHA512:
-  metadata.gz: 5da96227e2f82d8f035f71647d8a3bbbcbd65655c16bf3bc5a1ec244a30cf95dd50747b047919c7d6931d8982e51bae69edb68e84ad6da2e6efaeb0c6babd2c5
-  data.tar.gz: ff421edd707482cbf4e750d86b9977925448d1159bce989a72fd58852dec1197f8ef1066dea0b70046f76aed7afbf2f10896d6590ccb10b8b2356f0f3950997d
+  metadata.gz: 13a8e72d5bcd1dc3fa3745ad27411020e1f5d6c9800fbd6d0b963a8a8d0bb0226831b1bb024ab48f30044fc6bbb44b871dda9591934eda213e8ce30701327b8d
+  data.tar.gz: 74be721ea966f9aa8836e273d41c49b1f392a19ef0f9e4856329460a6d7c76bed665d2c54c4a6dcb0e8ebcd5831d19d9ff6387475be83f589d89d21fb4832264

data/CHANGELOG.md

@@ -1,16 +1,9 @@
-## 0.8.0-beta.3 (August 10, 2015)
-
-* [BUGFIX] Fix require issue in Grape probe
-
-## 0.8.0-beta.2 (August 10, 2015) [YANKED]
+## 0.8.0 (August 13, 2015)
 
+* [FEATURE] Add Grape instumentation. See http://docs.skylight.io/grape
 * [FEATURE] Process ERB in config/skylight.yml
-* [IMPROVEMENT] Switch Grape instrumentation to use ActiveSupport::Notifications hooks provided by future Grape versions.
-* [IMPROVEMENT] Internal cleanup
-
-## 0.8.0-beta.1 (August 4, 2015)
-
-* [FEATURE] Add Grape instumentation
+* [FEATURE] Add Rust based SQL lexing. Currently beta. Enable with `config.sql_mode = 'rust'`.
+* [BUGFIX] Fixed a case where, With some logger configurations, duplicate messages could be written to STDOUT.
 
 ## 0.7.1 (August 4, 2015)
 

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.7.0-f0be226"
+version: "0.7.0-1c24017"
 checksums:
-  x86-linux:     "389346155f09ec4b335eb125adfeea170d4a429d3e1619a7a546b009e3b7d7bf"
-  x86_64-linux:  "1873ccc44c43ee2fabfacc53e05231612ba7820e047ba3b34d203f75fb84e845"
-  x86_64-darwin: "f8df1c68e5e643833681f3ba8fe08f8c314b51c37738cce200d7b0a454769dda"
+  x86-linux:     "717333a52e0a9ee3cae0406339a5532e722ec00c77babe71412f02fda60df212"
+  x86_64-linux:  "f63d13680ed9004bd958beb0f1bba6837125b882f005931201f9bcadc435d7f9"
+  x86_64-darwin: "9da568af9f4b9b2b613a36432b440d0fd705e567159819f9337fa344d42c04f6"

data/ext/skylight_native.c

@@ -389,9 +389,56 @@ trace_span_set_description(VALUE self, VALUE span, VALUE desc) {
   return Qnil;
 }
 
+static VALUE
+lex_sql(VALUE klass, VALUE rb_sql) {
+  sky_buf_t sql;
+  sky_buf_t title;
+  sky_buf_t statement;
+  uint8_t title_store[128];
+  VALUE rb_statement;
+  VALUE ret;
+
+  UNUSED(klass);
+  CHECK_TYPE(rb_sql, T_STRING);
+
+  sql = STR2BUF(rb_sql);
+  title = (sky_buf_t) {
+    .data = title_store,
+    .len = sizeof(title_store),
+  };
+
+  // The statement cannot be longer than the original sql string
+  rb_statement = rb_str_buf_new(RSTRING_LEN(rb_sql));
+  statement = (sky_buf_t) {
+    .data = RSTRING_PTR(rb_statement),
+    .len = RSTRING_LEN(rb_sql),
+  };
+
+  CHECK_FFI(
+      sky_lex_sql(sql, &title, &statement),
+      "native lex_sql failed");
+
+  // Set the statement return
+  rb_str_set_len(rb_statement, statement.len);
+
+  ret = rb_ary_new2(2);
+
+  if (title.len > 0) {
+    rb_ary_store(ret, 0, BUF2STR(title));
+  }
+  else {
+    rb_ary_store(ret, 0, Qnil);
+  }
+
+  rb_ary_store(ret, 1, rb_statement);
+
+  return ret;
+}
+
 void Init_skylight_native() {
   rb_mSkylight = rb_define_module("Skylight");
   rb_define_singleton_method(rb_mSkylight, "load_libskylight", load_libskylight, 1);
+  rb_define_singleton_method(rb_mSkylight, "lex_sql", lex_sql, 1);
 
   rb_mUtil  = rb_define_module_under(rb_mSkylight, "Util");
   rb_cClock = rb_define_class_under(rb_mUtil, "Clock", rb_cObject);

data/lib/skylight/config.rb

@@ -32,12 +32,14 @@ module Skylight
       'LOG_FILE'       => :'log_file',
       'LOG_LEVEL'      => :'log_level',
       'ALERT_LOG_FILE' => :'alert_log_file',
+      'LOG_SQL_PARSE_ERRORS' => :'log_sql_parse_errors',
 
       # == Proxy ==
       'PROXY_URL' => :'proxy_url',
 
       # == Instrumenter ==
       "IGNORED_ENDPOINT" => :'ignored_endpoint',
+      "SQL_MODE" => :'sql_mode',
 
       # == Skylight Remote ==
       "AUTH_URL"                     => :'auth_url',
@@ -82,6 +84,7 @@ module Skylight
     DEFAULTS = {
       :'version'              => VERSION,
       :'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,
@@ -90,6 +93,7 @@ module Skylight
       :'log_file'                => '-'.freeze,
       :'log_level'               => 'INFO'.freeze,
       :'alert_log_file'          => '-'.freeze,
+      :'log_sql_parse_errors'    => false,
       :'hostname'                => Util::Hostname.default_hostname,
       :'agent.keepalive'         => 60,
       :'agent.interval'          => 5,

data/lib/skylight/normalizers/active_record/sql.rb

@@ -26,18 +26,37 @@ module Skylight
             binds = binds.map { |col, val| val.inspect }
           end
 
-          extracted_title, sql, binds = extract_binds(payload, binds)
-          title = extracted_title if extracted_title
-
-          [ name, title, sql ]
+          begin
+            extracted_title, sql = extract_binds(payload, binds)
+            [ name, extracted_title || title, sql ]
+          rescue => e
+            if config[:log_sql_parse_errors]
+              config.logger.warn "failed to extract binds in SQL; sql=#{payload[:sql].inspect}; exception=#{e.inspect}"
+            end
+            [ name, title, nil ]
+          end
         end
 
-      private
+        private
+
         def extract_binds(payload, precalculated)
-          SqlLexer::Lexer.bindify(payload[:sql], precalculated, true)
-        rescue => e
-          # TODO: log
-          [ nil, nil, nil ]
+          case config[:sql_mode]
+          when 'rust'
+            extract_rust(payload)
+          when 'ruby'
+            extract_ruby(payload, precalculated)
+          else
+            raise "Unrecognized sql_mode: #{config.sql_mode}"
+          end
+        end
+
+        def extract_rust(payload)
+          Skylight.lex_sql(payload[:sql])
+        end
+
+        def extract_ruby(payload, precalculated)
+          name, title, _ = SqlLexer::Lexer.bindify(payload[:sql], precalculated, true)
+          [ name, title ]
         end
       end
     end

data/lib/skylight/util/logging.rb

@@ -10,7 +10,13 @@ module Skylight
 
       def write(*args)
         STDERR.write *args
-        @logger.<<(*args)
+
+        # Try to avoid writing to STDOUT/STDERR twice
+        logger_logdev = @logger.instance_variable_get(:@logdev)
+        logger_out = logger_logdev && logger_logdev.respond_to?(:dev) ? logger_logdev.dev : nil
+        if logger_out != STDOUT && logger_out != STDERR
+          @logger.<<(*args)
+        end
       end
 
       def close

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.8.0-beta.3'
+  VERSION = '0.8.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8