lib/skylight/messages/trace.rb in skylight-0.1.8 vs lib/skylight/messages/trace.rb in skylight-0.2.0.beta.1

@@ -49,33 +49,37 @@
           annot = args.pop if Hash === args
           title = args.shift
           desc  = args.shift
           now   = adjust_for_skew(Util::Clock.micros)
 
+          desc = @instrumenter.limited_description(desc)
+
           sp = span(now - gc_time, cat, title, desc, annot)
           inc_children
           @spans << sp.build(0)
 
           nil
         end
 
         def instrument(cat, *args)
-          annot = args.pop if Hash === args
+          annot = args.pop if Hash === args.last
           title = args.shift
           desc  = args.shift
           now   = adjust_for_skew(Util::Clock.micros)
 
+          desc = @instrumenter.limited_description(desc)
+
           start(now - gc_time, cat, title, desc, annot)
         end
 
         def done(span)
           return unless span
           stop(span, adjust_for_skew(Util::Clock.micros) - gc_time)
         end
 
         def release
-          return unless Instrumenter.current_trace == self
-          Instrumenter.current_trace = nil
+          return unless @instrumenter.current_trace == self
+          @instrumenter.current_trace = nil
         end
 
         def submit
           return if @submitted