skylight 6.1.0.beta → 7.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d780476141077955da4d5e8c7ca2fdbb7ae6c34d12e4fc4d02936d57c7280860
-  data.tar.gz: 6342fb5535a2bab178fe1ad50d6987586bab709a43ac0b350957e269ed551a01
+  metadata.gz: e85fc890c72f6fdd61b4ce526da796e93b881204cc3a23c3aa49b2af79b102e6
+  data.tar.gz: c1b04bcba22ae003689ba594e7c84c256c498426e3dc8a0b1e52e662e2df0505
 SHA512:
-  metadata.gz: a8dc8c057b7837f951b360fde644aab87371800cefd18131224238c6c9753a955c26df62d89331410f0b00028d0b961257079a540811b6e5d7342448098a0dea
-  data.tar.gz: 5ac028176833f79a0205c2a952df35c70c4996876b5b3cd0ac3f1562de041edb883b3a6e17d22d7a7960f030060f6a05e9828cdc20e29afd26b6cc5b0fbd1313
+  metadata.gz: 6cf4914170bc6741a6afbbceea055ad430d9d0bc536d2d241540615e48ffd986ad03473399d0b930b19d462059398d158e0e100b9e90860944c409ab47f4d75d
+  data.tar.gz: cbd977277cdae972fd6421986defe7250b1b5c73eed724ab72a8f47a72f72c7a69fff7a94c056607fc675e9b3d2442bb50b778b0ccca72b86221e81980e3073b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 7.0.0.beta (September 3, 2025)
+
+- IMPROVEMENT Initial support for AWS Lambda
+- BREAKING end support for Ruby 2.7 and 3.0
+- BREAKING end support for Rails < 7.1
+- BUGFIX Fix an issue handling deserialization errors in Delayed::Job
+- IMPROVEMENT Support GraphQL >= 2.5
+- IMPROVEMENT Ignore `Rails::HealthController` by default
+
 ## 6.1.0.beta (June 11, 2024)
 
 - [IMPROVEMENT] Initial support for parsing queries from activerecord-sqlserver-adapter

data/ext/extconf.rb

@@ -10,18 +10,17 @@ require "skylight/util/platform"
 
 GLIBC_MIN = 2.23
 GLIBC_V4_MIN = 2.15
-
 LIBSKYLIGHT_INFO = {
-  "version" => "5.2.1-0a9bfee",
+  "version" => "6.0.0-beta-ec1a887",
   "checksums" => {
-    "x86-linux" => "af118eee2d41a0b989ec7620c7ee090cd1b75d5bb515cf09213fb977b9018fc7",
-    "x86_64-linux" => "26e752796a4b6c6e22668903a056958743b234d1c43973bc427c41280b2da0ec",
-    "x86_64-linux-musl" => "d082c465b48b8ac8c4149ecd052588bd7c65d8c9593de61c86996aa5a4cbc060",
-    "x86_64-darwin" => "bc0eb0f5aa45ab0dd1a85f446fa4533977ba5b9607c77c81fc81b1a4763a1888",
-    "x86_64-freebsd" => "a4328e817928650b50f1e011c048c45dcecbcad094e3bc63f2a06ad24ad8868b",
-    "aarch64-linux" => "d365c375d3de478d27d08c947bedee9377127bc8bd311e220372cfc0fe8e2ad4",
-    "aarch64-linux-musl" => "de66e234540e6af734d678bec49b0c1fdb23bc925b9e051e605e559e0a97e981",
-    "aarch64-darwin" => "f747dd6a934869a4a5865a3051b1ade9588ef3a73026376c043ac114876c0b12"
+    "x86-linux" => "0690d63cb7e249e3d74ad66a86bd886d75fb98650e3e2b029345c9b69d0931b2",
+    "x86_64-linux" => "dc97213f8f2aa86278dd8d239db3253ecd95d5daaafa5e825d8dfffa52033177",
+    "x86_64-linux-musl" => "963fc2515e3d91b80e2066d28c60ceabf40b88eec976eefa9c57f6be02e75b82",
+    "x86_64-darwin" => "79c16cfe98a5c0088175df8936eeeb46ee13fec2c9ecb0294d2622cb3c838666",
+    "x86_64-freebsd" => "be2e6d29f343a4c3dc90fc7d4a945fca67eaa062d35bcbca32ce130b022a2ba1",
+    "aarch64-linux" => "a3e5c72bbed189138c4350884cb59420deb9b68d0337340b6c2a7e4154e8d41a",
+    "aarch64-linux-musl" => "58282d7a638c8144aaee9ad5cb96ae667ea6f981a8ddbef566c8a618d7b82f8c",
+    "aarch64-darwin" => "fc4135413cda6130610e7a9c72b2a7af3e9db37107839b0bce7929b2ba55264b"
   }.freeze
 }.freeze
 

data/ext/skylight_native.c

@@ -55,22 +55,22 @@ STR2BUF(VALUE str) {
     }                                             \
   } while(0)
 
-#define My_Struct(name, Type, msg)                \
-  Get_Struct(name, self, Type, msg);              \
+#define Get_Struct(name, obj, Type, data_type, msg)   \
+  TypedData_Get_Struct((obj), Type, data_type, name); \
+  if (name == NULL) {                                 \
+    rb_raise(rb_eRuntimeError, "%s", msg);            \
+  }                                                   \
 
-#define Transfer_My_Struct(name, Type, msg)       \
-  My_Struct(name, Type, msg);                     \
-  DATA_PTR(self) = NULL;                          \
+#define My_Struct(name, Type, data_type, msg)   \
+  Get_Struct(name, self, Type, data_type, msg); \
 
-#define Transfer_Struct(name, obj, Type, msg)     \
-  Get_Struct(name, obj, Type, msg);               \
-  DATA_PTR(obj) = NULL;                           \
+#define Transfer_My_Struct(name, Type, data_type, msg) \
+  My_Struct(name, Type, data_type, msg);               \
+  DATA_PTR(self) = NULL;                               \
 
-#define Get_Struct(name, obj, Type, msg)          \
-  Data_Get_Struct(obj, Type, name);               \
-  if (name == NULL) {                             \
-    rb_raise(rb_eRuntimeError, "%s", msg);        \
-  }
+#define Transfer_Struct(name, obj, Type, data_type, msg) \
+  Get_Struct(name, obj, Type, data_type, msg);           \
+  DATA_PTR(obj) = NULL;                                  \
 
 /**
  * Ruby GVL helpers
@@ -106,6 +106,40 @@ static const char* no_instrumenter_msg =
 static const char* consumed_trace_msg =
   "Trace objects cannot be used once it has been submitted to the instrumenter";
 
+size_t sky_trace_dsize(const void *ptr) {
+    const sky_trace_t *trace = ptr;
+    return sizeof(trace);
+}
+
+size_t sky_instrumenter_dsize(const void *ptr) {
+    const sky_instrumenter_t *instrumenter = ptr;
+    return sizeof(instrumenter);
+}
+
+static void local_sky_trace_free(void *ptr) {
+    sky_trace_free(ptr);
+}
+
+static void local_sky_instrumenter_free(void *ptr) {
+  sky_instrumenter_free(ptr);
+}
+
+static const rb_data_type_t sky_rb_trace_t = {
+    .wrap_struct_name = "sk_rb_trace",
+    .function = {
+      .dfree = local_sky_trace_free, // free
+      .dsize = sky_trace_dsize, // memsize
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+static const rb_data_type_t sky_rb_instrumenter_t = {
+    .wrap_struct_name = "sk_rb_instrumenter",
+    .function = {
+      .dfree = local_sky_instrumenter_free,
+      .dsize = sky_instrumenter_dsize
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
 
 static VALUE
 load_libskylight(VALUE klass, VALUE path) {
@@ -176,7 +210,7 @@ instrumenter_new(VALUE klass, VALUE rb_uuid, VALUE rb_env) {
       sky_instrumenter_new(STR2BUF(rb_uuid), env, envc, &instrumenter),
       "Instrumenter#native_new");
 
-  return Data_Wrap_Struct(klass, NULL, sky_instrumenter_free, instrumenter);
+  return TypedData_Wrap_Struct(klass, &sky_rb_instrumenter_t, instrumenter);
 }
 
 static void*
@@ -199,7 +233,7 @@ static VALUE
 instrumenter_start(VALUE self) {
   sky_instrumenter_t* instrumenter;
 
-  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
+  My_Struct(instrumenter, sky_instrumenter_t, &sky_rb_instrumenter_t, no_instrumenter_msg);
 
   return (VALUE) WITHOUT_GVL(instrumenter_start_nogvl, instrumenter);
 }
@@ -208,7 +242,7 @@ static VALUE
 instrumenter_stop(VALUE self) {
   sky_instrumenter_t* instrumenter;
 
-  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
+  My_Struct(instrumenter, sky_instrumenter_t, &sky_rb_instrumenter_t, no_instrumenter_msg);
 
   CHECK_FFI(
       sky_instrumenter_stop(instrumenter),
@@ -224,8 +258,8 @@ instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
   sky_instrumenter_t* instrumenter;
   sky_trace_t* trace;
 
-  My_Struct(instrumenter, sky_instrumenter_t, no_instrumenter_msg);
-  Transfer_Struct(trace, rb_trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(instrumenter, sky_instrumenter_t, &sky_rb_instrumenter_t, no_instrumenter_msg);
+  Transfer_Struct(trace, rb_trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_instrumenter_submit_trace(instrumenter, trace),
@@ -234,6 +268,19 @@ instrumenter_submit_trace(VALUE self, VALUE rb_trace) {
   return Qnil;
 }
 
+static VALUE
+instrumenter_flush(VALUE self) {
+  sky_instrumenter_t* instrumenter;
+
+  My_Struct(instrumenter, sky_instrumenter_t, &sky_rb_instrumenter_t, no_instrumenter_msg);
+
+  CHECK_FFI(
+      sky_instrumenter_flush(instrumenter),
+      "native Instrumenter#flush failed");
+
+  return Qnil;
+}
+
 /*
  *
  * class Skylight::Trace
@@ -256,7 +303,7 @@ trace_new(VALUE klass, VALUE start, VALUE uuid, VALUE endpoint, VALUE meta) {
 
   sky_clear_allocation_count();
 
-  return Data_Wrap_Struct(klass, NULL, sky_trace_free, trace);
+  return TypedData_Wrap_Struct(klass, &sky_rb_trace_t, trace);
 }
 
 static VALUE
@@ -264,7 +311,7 @@ trace_get_started_at(VALUE self) {
   uint64_t start;
   sky_trace_t* trace;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_start(trace, &start),
@@ -278,7 +325,7 @@ trace_get_endpoint(VALUE self) {
   sky_trace_t* trace;
   sky_buf_t endpoint;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_endpoint(trace, &endpoint),
@@ -292,7 +339,7 @@ trace_set_endpoint(VALUE self, VALUE endpoint) {
   sky_trace_t* trace;
 
   CHECK_TYPE(endpoint, T_STRING);
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_set_endpoint(trace, STR2BUF(endpoint)),
@@ -306,7 +353,7 @@ trace_get_component(VALUE self) {
   sky_trace_t* trace;
   sky_buf_t component;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_component(trace, &component),
@@ -320,7 +367,7 @@ trace_set_component(VALUE self, VALUE component) {
   sky_trace_t* trace;
 
   CHECK_TYPE(component, T_STRING);
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_set_component(trace, STR2BUF(component)),
@@ -333,7 +380,7 @@ static VALUE
 trace_use_pruning(VALUE self) {
   sky_trace_t* trace;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_use_pruning(trace),
@@ -354,7 +401,7 @@ trace_get_uuid(VALUE self) {
   sky_trace_t* trace;
   sky_buf_t uuid;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_FFI(
       sky_trace_uuid(trace, &uuid),
@@ -368,7 +415,7 @@ trace_start_span(VALUE self, VALUE time, VALUE category) {
   sky_trace_t* trace;
   uint32_t span;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_NUMERIC(time);
   CHECK_TYPE(category, T_STRING);
@@ -388,7 +435,7 @@ static VALUE
 trace_stop_span(VALUE self, VALUE span, VALUE time) {
   sky_trace_t* trace;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_NUMERIC(time);
   CHECK_TYPE(span, T_FIXNUM);
@@ -409,7 +456,7 @@ trace_span_get_category(VALUE self, VALUE span) {
   sky_trace_t* trace;
   sky_buf_t category;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
 
@@ -424,7 +471,7 @@ static VALUE
 trace_span_set_title(VALUE self, VALUE span, VALUE title) {
   sky_trace_t* trace;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
   CHECK_TYPE(title, T_STRING);
@@ -441,7 +488,7 @@ trace_span_get_title(VALUE self, VALUE span) {
   sky_trace_t* trace;
   sky_buf_t title;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
 
@@ -456,7 +503,7 @@ static VALUE
 trace_span_set_description(VALUE self, VALUE span, VALUE desc) {
   sky_trace_t* trace;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
   CHECK_TYPE(desc, T_STRING);
@@ -473,7 +520,7 @@ trace_span_set_meta(VALUE self, VALUE span, VALUE meta) {
   sky_trace_t* trace;
   VALUE rb_source_location;
 
-  My_Struct(trace, sky_trace_t, consumed_trace_msg);
+  My_Struct(trace, sky_trace_t, &sky_rb_trace_t, consumed_trace_msg);
 
   CHECK_TYPE(span, T_FIXNUM);
   CHECK_TYPE(meta, T_HASH);
@@ -545,4 +592,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_flush", instrumenter_flush, 0);
 }

data/lib/skylight/cli/merger.rb

@@ -1,4 +1,3 @@
-require "ostruct"
 require "skylight/util/http"
 require "thor"
 require "highline"
@@ -51,7 +50,7 @@ module Skylight
         @parents ||=
           begin
             a = (@apps + [{ name: STRINGS[:unlisted], components: [], unlisted: true }])
-            a.each_with_object({}).with_index { |(app, h), i| h[i + 1] = OpenStruct.new(app) }
+            a.each_with_object({}).with_index { |(app, h), i| h[i + 1] = wrap_hash(app) }
           end
 
         say "\nLet's begin!\n\n" \
@@ -175,6 +174,10 @@ module Skylight
 
       private
 
+      def wrap_hash(hash)
+        hash.each_with_object(ActiveSupport::OrderedOptions.new) { |(key, value), result| result[key] = value }
+      end
+
       def do_merge
         say "Merging..."
 
@@ -274,10 +277,10 @@ module Skylight
             @parents.each do |_, app|
               next if app == @parent_app
 
-              app.components.each { |component| yielder << OpenStruct.new({ app_name: app.name }.merge(component)) }
+              app.components.each { |component| yielder << wrap_hash({ app_name: app.name }.merge(component)) }
             end
 
-            yielder << OpenStruct.new(app_name: STRINGS[:unlisted], unlisted: true)
+            yielder << wrap_hash(app_name: STRINGS[:unlisted], unlisted: true)
           end
 
         ret = ret.each_with_object({}).with_index { |(c, r), i| r[i + 1] = c }

data/lib/skylight/config.rb

@@ -19,6 +19,10 @@ module Skylight
     # @api private
     MUTEX = Mutex.new
 
+    DEFAULT_IGNORED_ENDPOINTS = %w[
+      Rails::HealthController#show
+    ].freeze
+
     # Map environment variable keys with Skylight configuration keys
     ENV_TO_KEY = {
       # == Authentication ==
@@ -102,7 +106,8 @@ module Skylight
       -"HEROKU_DYNO_INFO_PATH" => :"heroku.dyno_info_path",
       # == Source Location ==
       -"SOURCE_LOCATION_IGNORED_GEMS" => :source_location_ignored_gems,
-      -"SOURCE_LOCATION_CACHE_SIZE" => :source_location_cache_size
+      -"SOURCE_LOCATION_CACHE_SIZE" => :source_location_cache_size,
+      -"STANDALONE_DAEMON" => :standalone_daemon
     }.freeze
 
     KEY_TO_NATIVE_ENV = {
@@ -143,7 +148,8 @@ module Skylight
             "daemon.lazy_start": true,
             hostname: Util::Hostname.default_hostname,
             report_max_spans_exceeded: false,
-            prune_large_traces: true
+            prune_large_traces: true,
+            standalone_daemon: false
           }
 
           ret[:"daemon.ssl_cert_path"] = Util::SSL.ca_cert_file_or_default unless Util::Platform::OS == -"darwin"
@@ -209,6 +215,7 @@ module Skylight
         daemon.ssl_cert_dir
         daemon.enable_tcp
         daemon.tcp_port
+        standalone_daemon
       ]
     end
 
@@ -490,7 +497,7 @@ module Skylight
 
           val = Array(get(:ignored_endpoint))
           val.concat(Array(ignored_endpoints))
-          val
+          val | DEFAULT_IGNORED_ENDPOINTS
         end
     end
 

data/lib/skylight/instrumenter.rb

@@ -95,6 +95,10 @@ module Skylight
       raise "not implemented"
     end
 
+    def native_flush
+      raise "not implemented"
+    end
+
     def native_track_desc(_endpoint, _description)
       raise "not implemented"
     end

data/lib/skylight/lambda.rb

@@ -0,0 +1,4 @@
+require "skylight"
+
+Skylight.probe(:lambda)
+Skylight.start!

data/lib/skylight/normalizers/graphql/base.rb

@@ -59,10 +59,34 @@ module Skylight::Normalizers::GraphQL
     register_graphql
   end
 
-  class ExecuteMultiplex < Base
+  class Execute < Base
     register_graphql
 
-    def normalize_after(trace, _span, _name, payload)
+    # This is a new, combined normalizer for execute_query and execute_multiplex,
+    # to be used for graphql >= 2.5
+    #
+    def normalize(trace, name, payload)
+      payload[:query] ? _execute_query_normalize(trace, name, payload) : [CAT, "graphql.#{key}", nil]
+    end
+
+    def normalize_after(trace, span, name, payload)
+      _execute_multiplex_normalize_after(trace, span, name, payload) if payload[:multiplex]
+    end
+
+    private
+
+    def _execute_query_normalize(trace, _name, payload)
+      query_name = extract_query_name(payload[:query])
+
+      meta = { mute_children: true } if query_name == ANONYMOUS
+      # This is probably always overriden by execute_multiplex#normalize_after,
+      # but in the case of a single query, it will be the same value anyway.
+      trace.endpoint = "graphql:#{query_name}"
+
+      [CAT, "graphql.#{key}: #{query_name}", nil, meta]
+    end
+
+    def _execute_multiplex_normalize_after(trace, _span, _name, payload)
       # This is in normalize_after because the queries may not have
       # an assigned operation name before they are executed.
       # For example, if you send a single query with a defined operation name, e.g.:
@@ -93,24 +117,18 @@ module Skylight::Normalizers::GraphQL
     end
   end
 
-  class AnalyzeQuery < Base
+  class ExecuteQuery < Execute
     register_graphql
   end
 
-  class ExecuteQuery < Base
+  class ExecuteMultiplex < Execute
     register_graphql
 
-    def normalize(trace, _name, payload)
-      query_name = extract_query_name(payload[:query])
-
-      meta = { mute_children: true } if query_name == ANONYMOUS
-
-      # This is probably always overriden by execute_multiplex#normalize_after,
-      # but in the case of a single query, it will be the same value anyway.
-      trace.endpoint = "graphql:#{query_name}"
+    # see behavior in Execute#_multiplex_normalize_after
+  end
 
-      [CAT, "graphql.#{key}: #{query_name}", nil, meta]
-    end
+  class AnalyzeQuery < Base
+    register_graphql
   end
 
   class ExecuteQueryLazy < ExecuteQuery

data/lib/skylight/probes/delayed_job.rb

@@ -8,21 +8,36 @@ module Skylight
       begin
         require "delayed/plugin"
 
+        UNKNOWN = "<Delayed::Job Unknown>"
+
         class Plugin < ::Delayed::Plugin
           callbacks do |lifecycle|
             lifecycle.around(:perform) { |worker, job, &block| sk_instrument(worker, job, &block) }
-
             lifecycle.after(:error) { |_worker, _job| Skylight.trace&.segment = "error" }
+            lifecycle.after(:failure) { |_worker, _job| Skylight.trace&.segment = "error" }
           end
 
           class << self
             include Skylight::Util::Logging
 
+            # This is called quite early in Delayed::Worker
+            #
+            # Typically, the `:perform` lifecycle hook is called before the
+            # `payload_object` has been deserialized, so we can't name the
+            # trace yet.
+            #
+            # If we call `payload_object` here, we would move the work of
+            # loading the object ahead of where it naturally happens, which
+            # means the database load time won't be instrumented. On the other
+            # hand, should the deserialization fail, we would have moved the
+            # timing of the error as well. Crucially – it would have moved it
+            # outside of the spot where these errors are normally caught and
+            # reported by the worker.
+            #
+            # See https://github.com/skylightio/skylight-ruby/issues/491
             def sk_instrument(_worker, job)
-              endpoint = Skylight::Probes::DelayedJob.handler_name(job)
-
               Skylight.trace(
-                endpoint,
+                UNKNOWN,
                 "app.delayed_job.worker",
                 "Delayed::Worker#run",
                 component: :worker,
@@ -41,15 +56,6 @@ module Skylight
         $stderr.puts "[SKYLIGHT] The delayed_job probe was requested, but Delayed::Plugin was not defined."
       end
 
-      UNKNOWN = "<Delayed::Job Unknown>"
-
-      def self.handler_name(job)
-        payload_object =
-          job.respond_to?(:payload_object_without_sk) ? job.payload_object_without_sk : job.payload_object
-
-        payload_object_name(payload_object)
-      end
-
       def self.payload_object_name(payload_object)
         if payload_object.is_a?(::Delayed::PerformableMethod)
           payload_object.display_name
@@ -77,18 +83,27 @@ module Skylight
 
       class InstrumentationProxy < SimpleDelegator
         def perform
-          source_meta = Skylight::Probes::DelayedJob.payload_object_source_meta(__getobj__)
-
-          opts = {
-            category: "app.delayed_job.job",
-            title: format_source(*source_meta),
-            meta: {
-              source_location_hint: source_meta
-            },
-            internal: true
-          }
-
-          Skylight.instrument(opts) { __getobj__.perform }
+          if (trace = Skylight.instrumenter&.current_trace)
+            if trace.endpoint == UNKNOWN
+              # At this point, deserialization was, by definition, successful.
+              # So it'd be safe to set the endpoint name based on the payload
+              # object here.
+              trace.endpoint = Skylight::Probes::DelayedJob.payload_object_name(__getobj__)
+            end
+
+            source_meta = Skylight::Probes::DelayedJob.payload_object_source_meta(__getobj__)
+
+            opts = {
+              category: "app.delayed_job.job",
+              title: format_source(*source_meta),
+              meta: {
+                source_location_hint: source_meta
+              },
+              internal: true
+            }
+
+            Skylight.instrument(opts) { __getobj__.perform }
+          end
         end
 
         # Used by Delayed::Backend::Base to determine Job#name

data/lib/skylight/probes/graphql.rb

@@ -35,6 +35,48 @@ module Skylight
           end
         end
 
+        # GraphQL versions >= 2.5 are missing this notification
+        module ExecuteQueryNotification
+          def execute_query(**metadata, &blk)
+            if @notifications_engine
+              @notifications_engine.instrument("execute_query.graphql", metadata, &blk)
+            elsif @notifications
+              @notifications.instrument("execute_query.graphql", metadata, &blk)
+            else
+              # safety fallback in case graphql's authors unexpectedly rename @notifications_engine or @notifications
+              super
+            end
+          end
+        end
+
+        # GraphQL versions >= 2.5 are missing this notification
+        module ExecuteQueryLazyNotification
+          def execute_query_lazy(**metadata, &blk)
+            if @notifications_engine
+              @notifications_engine.instrument("execute_query_lazy.graphql", metadata, &blk)
+            elsif @notifications
+              @notifications.instrument("execute_query_lazy.graphql", metadata, &blk)
+            else
+              # safety fallback in case graphql's authors unexpectedly rename @notifications_engine or @notifications
+              super
+            end
+          end
+        end
+
+        # GraphQL versions >= 2.5 are missing this notification
+        module AnalyzeQueryNotification
+          def analyze_query(**metadata, &blk)
+            if @notifications_engine
+              @notifications_engine.instrument("analyze_query.graphql", metadata, &blk)
+            elsif @notifications
+              @notifications.instrument("analyze_query.graphql", metadata, &blk)
+            else
+              # safety fallback in case graphql's authors unexpectedly rename @notifications_engine or @notifications
+              super
+            end
+          end
+        end
+
         module ClassMethods
           def new_trace(*, **)
             unless @__sk_instrumentation_installed
@@ -44,6 +86,18 @@ module Skylight
                 trace_with(ExecuteMultiplexNotification)
               end
 
+              unless ::GraphQL::Tracing::ActiveSupportNotificationsTrace.instance_methods.include?(:execute_query)
+                trace_with(ExecuteQueryNotification)
+              end
+
+              unless ::GraphQL::Tracing::ActiveSupportNotificationsTrace.instance_methods.include?(:execute_query_lazy)
+                trace_with(ExecuteQueryLazyNotification)
+              end
+
+              unless ::GraphQL::Tracing::ActiveSupportNotificationsTrace.instance_methods.include?(:analyze_query)
+                trace_with(AnalyzeQueryNotification)
+              end
+
               @__sk_instrumentation_installed = true
             end
 

data/lib/skylight/probes/lambda.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Skylight
+  module Probes
+    module Lambda
+      AWS_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME"
+
+      module Common
+        private
+
+        def sk_lambda_function_name
+          ENV.fetch(AWS_LAMBDA_FUNCTION_NAME, "<unknown>")
+        end
+      end
+
+      # NOTE: there are two modalities to probing the lambda wrappers:
+      # - The default runtime is implemented as a plain set of nested loops; LambdaHandler is a top-level constant
+      #   in this context.
+      # - AWS also publishes the aws_lambda_ric gem as an alternate Dockerfile entrypoint; this runs largely
+      #   the same code, but encapsulated in the LambdaRunner.
+      #
+      # The `run_user_code` is by all measures a better method to probe, as it includes the time spent to deliver
+      # the response back to the lambda server, and we can flush the internal buffer here without affecting response time.
+      module Runner
+        class Probe
+          def install
+            if defined?(::AwsLambdaRuntimeInterfaceClient::LambdaRunner)
+              ::AwsLambdaRuntimeInterfaceClient::LambdaRunner.prepend(Instrumentation)
+            end
+          end
+        end
+
+        module Instrumentation
+          def run_user_code(request)
+            Skylight.trace(sk_lambda_function_name, "other", "lambda handler") { super }
+          ensure
+            Skylight.instrumenter&.native_flush
+          end
+
+          include Common
+        end
+      end
+
+      module Handler
+        class Probe
+          def install
+            LambdaHandler.prepend(Instrumentation) if defined?(LambdaHandler)
+          end
+        end
+
+        module Instrumentation
+          def call_handler(request:, **)
+            if Skylight.trace
+              Skylight.instrument(sk_instrument_opts(request)) { super }
+            else
+              Skylight.trace(sk_lambda_function_name, "other", "lambda handler") do
+                Skylight.instrument(sk_instrument_opts(request)) { super }
+              end
+            end
+          end
+
+          include Common
+
+          private
+
+          def sk_instrument_opts(request)
+            {
+              category: "app.lambda.handler",
+              title: sk_handler_method_name,
+              description: sk_lambda_function_arn(request)
+            }
+          end
+
+          def sk_handler_method_name
+            [@handler_file_name, @handler_class, @handler_method_name].compact.join(".")
+          end
+
+          def sk_lambda_function_arn(request)
+            request["Lambda-Runtime-Invoked-Function-Arn"]
+          rescue StandardError
+            nil
+          end
+        end
+      end
+    end
+
+    register(
+      :lambda_runner,
+      "AwsLambdaRuntimeInterfaceClient::LambdaRunner",
+      "aws_lambda_ric",
+      Lambda::Runner::Probe.new
+    )
+
+    # NOTE: this require hook is unlikely to be invoked; the actual default lambda runtime loads this file
+    # via a require_relative.
+    register(:lambda_handler, "LambdaHandler", "lambda_handler", Lambda::Handler::Probe.new)
+  end
+end

data/lib/skylight/trace.rb

@@ -328,7 +328,7 @@ module Skylight
     end
 
     def resolve_component(component)
-      config.components[component].to_encoded_s
+      config.components[component].to_s
     end
 
     def component=(component)

data/lib/skylight/version.rb

@@ -3,5 +3,5 @@ module Skylight
   # for compatibility with semver when it is parsed by the rust agent.
   # This string will be transformed in the gemspec to "5.0.0.alpha"
   # to conform with rubygems.
-  VERSION = "6.1.0-beta".freeze
+  VERSION = "7.0.0-beta".freeze
 end

data/lib/skylight.rb

@@ -129,7 +129,7 @@ module Skylight
     end
 
     # Start a trace
-    def trace(endpoint = nil, cat = nil, title = nil, meta: nil, segment: nil, component: nil)
+    def trace(endpoint = nil, cat = nil, title = nil, desc = nil, meta: nil, segment: nil, component: nil)
       unless instrumenter
         return yield if block_given?
 
@@ -146,11 +146,11 @@ module Skylight
       cat ||= DEFAULT_CATEGORY
 
       if block_given?
-        instrumenter.trace(endpoint, cat, title, nil, meta: meta, segment: segment, component: component) do |tr|
+        instrumenter.trace(endpoint, cat, title, desc, meta: meta, segment: segment, component: component) do |tr|
           yield tr
         end
       else
-        instrumenter.trace(endpoint, cat, title, nil, meta: meta, segment: segment, component: component)
+        instrumenter.trace(endpoint, cat, title, desc, meta: meta, segment: segment, component: component)
       end
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 6.1.0.beta
+  version: 7.0.0.beta
 platform: ruby
 authors:
 - Tilde, Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.70.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.70.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +205,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - engineering@tilde.io
 executables:
@@ -242,6 +240,7 @@ files:
 - lib/skylight/gc.rb
 - lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
+- lib/skylight/lambda.rb
 - lib/skylight/middleware.rb
 - lib/skylight/native.rb
 - lib/skylight/native_ext_fetcher.rb
@@ -307,6 +306,7 @@ files:
 - lib/skylight/probes/faraday.rb
 - lib/skylight/probes/graphql.rb
 - lib/skylight/probes/httpclient.rb
+- lib/skylight/probes/lambda.rb
 - lib/skylight/probes/middleware.rb
 - lib/skylight/probes/mongo.rb
 - lib/skylight/probes/mongoid.rb
@@ -384,7 +384,6 @@ licenses:
 - Nonstandard
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -392,15 +391,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Skylight is a smart profiler for Rails, Sinatra, and other Ruby apps.
 test_files: []