wavefront-cli 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d7cbfa6e04c70f7c9c2af901ec42da4783b5b2f4aaa7552ebb53bf840395da
-  data.tar.gz: cef50e1684db66aa4a525c7ba91088a491bb790b8562c720437a12e7692b4390
+  metadata.gz: afeb72ce32ce32e70e1f405234608ce5109d039aa6045b89e73e8351d95e459f
+  data.tar.gz: 06b2ab6daedba6a696b9c63208bfe9465695f224f6fab58c49c9408051f81e3f
 SHA512:
-  metadata.gz: 3ec1eacceffa1fefad6050e42eb5c3891133da9e23bcb5e62de8ee558b9535d27936e95a3a66eb6eac616d4effe371b3f66334e6a652548d3ae0b06d39747853
-  data.tar.gz: 241a752fb0fd12225e8fa26a342380a15040d37d694fc90c23604bb96691e4ad54f97617cc1fcf688f495e8ed42f44ef0e60c9122ddaa9b2cbd7b13dbb86ac3e
+  metadata.gz: 75b2159704ea25f5f1dea58b16e9e968b9b3ba17668a6f014a0ff75ce63be91179601a5cc917ab526b281a36d3c4e254ec8dbe0af9ac57f21274a4fbeeb5faab
+  data.tar.gz: 672954a741cf305255820402b0a62bf9ac8facafb9e5fbf63c633a3355117516253cc50e68247fb019e7b1797f6117062acf32b3e30d012e995a55e37c0bb53f

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 8.2.0 (2020-10-06)
+* Display spans in human-readable query output.
+
 ## 8.1.0 (2020-10-04)
 * Display traces in human-readable query output.
 

data/lib/wavefront-cli/display/base.rb

@@ -33,6 +33,7 @@ module WavefrontDisplay
 
       @data = prioritize_keys(data, priority_keys)
       @options = options
+      @printer_opts = {}
     end
 
     # find the correct method to deal with the output of the user's
@@ -152,7 +153,8 @@ module WavefrontDisplay
         puts 'No data.'
       else
         require_relative 'printer/long'
-        puts WavefrontDisplayPrinter::Long.new(data, fields, modified_data)
+        puts WavefrontDisplayPrinter::Long.new(data, fields, modified_data,
+                                               @printer_opts)
         pagination_line
       end
     end

data/lib/wavefront-cli/display/printer/long.rb

@@ -29,11 +29,13 @@ module WavefrontDisplayPrinter
 
     # Default options. Can all be overridden by passing them in the
     # initializer options hash.
+    # After sep_depth indentations we do not print separator lines
     #
     def default_opts
       { indent: 2,
         padding: 2,
         separator: true,
+        sep_depth: 3,
         none: true }
     end
 
@@ -179,7 +181,8 @@ module WavefrontDisplayPrinter
       data.each.with_index(1) do |element, i|
         aggr = make_list(element, aggr, depth, last_key)
 
-        if opts[:separator] && element.is_a?(Hash) && i < data.size && depth < 3
+        if opts[:separator] && element.is_a?(Hash) && i < data.size &&
+           depth < opts[:sep_depth]
           aggr.<< ['', :separator, depth]
         end
       end

data/lib/wavefront-cli/display/query.rb

@@ -16,15 +16,18 @@ module WavefrontDisplay
             data[:errorMessage].split("\n").first)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def default_data_object
       { name: data.name,
         query: data.query,
         timeseries: mk_timeseries(data),
         traces: mk_traces(data),
+        spans: mk_spans(data),
         events: mk_events(data) }.tap do |d|
           d[:warnings] = data[:warnings] if show_warnings?
         end
     end
+    # rubocop:enable Metrics/AbcSize
 
     def show_warnings?
       data.key?(:warnings) && !options[:nowarn]
@@ -61,6 +64,12 @@ module WavefrontDisplay
       data[:traces].map { |t| humanize_trace(t) }
     end
 
+    def mk_spans(data)
+      return [] unless data.key?(:spans)
+
+      data[:spans].map { |t| humanize_span(t) }
+    end
+
     def do_run
       do_default
     end
@@ -107,17 +116,24 @@ module WavefrontDisplay
     end
 
     def humanize_trace(data)
+      @printer_opts[:sep_depth] = 3
+
       data.tap do |t|
         t[:start] = human_time(t[:start_ms])
         t[:end] = human_time(t[:end_ms])
         t.delete(:start_ms)
         t.delete(:end_ms)
         t.delete(:startMs)
-        t.spans = t.spans.map { |s| humanize_span(s) }
+        t.spans = t.spans.map { |s| humanize_trace_span(s) }
       end
     end
 
-    def humanize_span(span)
+    def humanize_span(data)
+      @printer_opts[:sep_depth] = 2
+      data
+    end
+
+    def humanize_trace_span(span)
       span.tap do |s|
         s[:startMs] = human_time(s[:startMs])
       end

data/lib/wavefront-cli/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WF_CLI_VERSION = '8.1.0'
+WF_CLI_VERSION = '8.2.0'

data/spec/wavefront-cli/display/printer/long_spec.rb

@@ -52,12 +52,14 @@ class TestWavefrontDisplayPrinterLong < MiniTest::Test
     assert_equal({ indent: 4,
                    padding: 3,
                    separator: true,
+                   sep_depth: 3,
                    none: true }, pr.opts)
 
     pr = WavefrontDisplayPrinter::Long.new({}, nil, nil, none: false)
     assert_equal({ indent: 2,
                    padding: 2,
                    separator: true,
+                   sep_depth: 3,
                    none: false }, pr.opts)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt