skylight 3.1.0.beta → 3.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0fe62d44b7c3e18f7d22a6d8685f5d2111c8b35268c18f37416516511ac5a5
-  data.tar.gz: eab956ac5303ceb77d7b0f6195120dbebe5f0440f3f87f7eb3b30723ad47eaea
+  metadata.gz: 1664cf033ce6902a420b8d30643a15ad930a288a9b19b5f74d6045f0b29a6da6
+  data.tar.gz: cd37daff16478e809582981932ab71da7770d7ce5a381fa33455e7bb642d8ee7
 SHA512:
-  metadata.gz: 2b1026eaf0b5222e727373d7d85bbfe735c0e89824d4772872a13855abea39acfaa592fc98d94381f04327025cee7117c3a0c886ca993e9ed3a73e25fa4e6c58
-  data.tar.gz: 9302f07d4d72f49447c8f335015fa5ed8a3efdb326a1c750ac4a3d86c6782904b50b0b37dadaabe1a062f6ef3c95f837432f4257bd5bb6e4e57b7ee03977a246
+  metadata.gz: 4b5e035ee2aa19996bbb9439f4a1cf2cf46e9ba5a47683130e23fe4a09eaaabf7f0462c551132ae8553a63442ffdde96348ae6be11d7007eb73426332fe500c2
+  data.tar.gz: de6c79afca7082a658f2f7189858f5066930d20020f7642252295d32ae99d8a81536d472fce6b13c197eaf2875f3860fcba23d0376b5976ea6d8d11bbb25c021

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.0-beta2
+* [IMPROVEMENT] Trace Mongo aggregate queries
+* [BUGFIX] Correct configuration keys in skylight.yml
+
 ## 3.1.0-beta
 * [BUGFIX] SQL queries with schema-qualified table names are parsed correctly
 * [BUGFIX] `SELECT ... FOR UPDATE` queries are parsed correctly

data/ext/libskylight.yml

@@ -1,7 +1,7 @@
-version: "3.1.0-9085310"
+version: "3.1.0-5bbb3e6"
 checksums:
-  x86-linux:         "76470913ced831eeeede50160ae2c8e13c7e7305ce7a379483983a136d9544ea"
-  x86_64-linux:      "e6b5b315b0b144261cd68864d1a4b0d5416850247cf44d443f4e8fdb0558a646"
-  x86_64-linux-musl: "5b64bacc5440a6036e785f6de5bdc7a7e57d0a0f69f4fbd89b9130326cf0e43a"
-  x86_64-darwin:     "9025fd770d04729e8dd59164f5ee734c9badcd1476d6621b3d77338e67827b49"
-  x86_64-freebsd:    "92c889b8b20a9d0ffcba765a54d02722f927625002842203db423c4ddf9c7380"
+  x86-linux:         "992b88db54dbe981c76c7263ab93aaa03a54cbaf393aba1422cd083f79eb6df3"
+  x86_64-linux:      "dca8f50b91888f63c59d907e2c09c57daf921ae11bd29b04862533782ae28fdf"
+  x86_64-linux-musl: "5ff0afd380bba43a6842449afea31e3fac2dd153d8355227661fc3b83b94fe03"
+  x86_64-darwin:     "a560b78270cf3dbdf6ad4847b4366b80f948cce6ae639e6633d924777de7cff7"
+  x86_64-freebsd:    "346d647be38bacdc0dd4d7694892146cff3e88873a582946c13cf8631ae221d1"

data/ext/skylight_native.c

@@ -334,6 +334,19 @@ trace_set_endpoint(VALUE self, VALUE endpoint) {
   return Qnil;
 }
 
+static VALUE
+trace_use_pruning(VALUE self) {
+  sky_trace_t* trace;
+
+  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+
+  CHECK_FFI(
+      sky_trace_use_pruning(trace),
+      "Trace#native_use_pruning");
+
+  return Qtrue;
+}
+
 static VALUE
 trace_set_exception(VALUE self, VALUE exception) {
   UNUSED(self);
@@ -556,6 +569,7 @@ void Init_skylight_native() {
   rb_define_method(rb_cTrace, "native_get_started_at", trace_get_started_at, 0);
   rb_define_method(rb_cTrace, "native_get_endpoint", trace_get_endpoint, 0);
   rb_define_method(rb_cTrace, "native_set_endpoint", trace_set_endpoint, 1);
+  rb_define_method(rb_cTrace, "native_use_pruning", trace_use_pruning, 0);
   rb_define_method(rb_cTrace, "native_set_exception", trace_set_exception, 1);
   rb_define_method(rb_cTrace, "native_get_uuid", trace_get_uuid, 0);
   rb_define_method(rb_cTrace, "native_start_span", trace_start_span, 2);

data/lib/skylight/config.rb

@@ -19,8 +19,8 @@ module Skylight
         'SESSION_TOKEN' => :session_token,
 
         # == Component settings ==
-        'ENV' => :'component.environment',
-        'COMPONENT' => :'component.name',
+        'ENV' => :env,
+        'COMPONENT' => :component,
         'REPORT_RAILS_ENV' => :report_rails_env,
 
         # == Deploy settings ==
@@ -30,6 +30,7 @@ module Skylight
 
         # == Max Span Handling ==
         'REPORT_MAX_SPANS_EXCEEDED' => :report_max_spans_exceeded,
+        'PRUNE_LARGE_TRACES' => :prune_large_traces,
 
         # == Instrumenter ==
         "IGNORED_ENDPOINT" => :ignored_endpoint,
@@ -90,6 +91,7 @@ module Skylight
           :'daemon.lazy_start'  => true,
           :hostname             => Util::Hostname.default_hostname,
           :report_max_spans_exceeded => false,
+          :prune_large_traces   => false,
           :report_rails_env     => true,
         )
 
@@ -296,8 +298,7 @@ authentication: #{self[:authentication]}
     end
 
     def component
-      @component ||= Util::Component.new(get(:'component.environment'),
-                                         get(:'component.name'))
+      @component ||= Util::Component.new(get(:env), get(:component))
     rescue ArgumentError => e
       raise Core::ConfigError, e.message
     end
@@ -310,9 +311,9 @@ authentication: #{self[:authentication]}
     end
 
     def reporting_env?
-      # true if component.environment was explicitly set,
+      # true if env was explicitly set,
       # or if we are auto-detecting via the opt-in SKYLIGHT_REPORT_RAILS_ENV=true
-      !!(get(:report_rails_env) || get(:'component.environment'))
+      !!(get(:report_rails_env) || get(:env))
     end
   end
 end

data/lib/skylight/railtie.rb

@@ -38,7 +38,7 @@ module Skylight
       def load_skylight_config(app)
         super.tap do |config|
           if config[:report_rails_env]
-            config[:'component.environment'] ||= Rails.env.to_s
+            config[:env] ||= Rails.env.to_s
           end
         end
       end

data/lib/skylight/trace.rb

@@ -3,6 +3,7 @@ module Skylight
     def initialize(*)
       super
       @too_many_spans = false
+      native_use_pruning if use_pruning?
     end
 
     def uuid
@@ -47,5 +48,9 @@ module Skylight
         super
       end
 
+      def use_pruning?
+        config.get(:prune_large_traces)
+      end
+
   end
 end

data/lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = '3.1.0-beta'
+  VERSION = '3.1.0-beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta
+  version: 3.1.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: skylight-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: 3.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta
+        version: 3.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement