signalfx 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4d9b5d2fd10a70d0b431b6e6d4200e3f4634ff5
-  data.tar.gz: 711835760cb429f574c776435eba20a46b45afa1
+SHA256:
+  metadata.gz: b8b01a2cdfd8bd9e820a2bfb1d845c9d1af39b314b704e052290ff84c0876346
+  data.tar.gz: 5b599549b6d52997743531c659ab3404e1d588bdf5f44f79e15e93ecf60f98ca
 SHA512:
-  metadata.gz: c9ab6fa6dc20607bb4516534e674206af91bb8ffd7304e2b579a36cbcb1cd85dc23e0b2e25620bec371738b90d4dedb00bc5af22bf7871370167b8470d74f739
-  data.tar.gz: 9f3d726b842f389cc7e5732b3124d376898cd5639fe657133420c6633bf3ee811c82d139ea4261726f7440842fc98a421819ca3bcd343f6382a21d388212168b
+  metadata.gz: 5636901c170b49a99d96f1481bfdd68619f478efbd8c39d653cfd5c1f98e9ac8d9e3fa7cd65c7f9581df09106cbaa0fa0f1ab631409ccc7048fd629ab1d0a2d0
+  data.tar.gz: 92dcd3035dc09284d36bba8818bdec676455d9fdbc45ef2f6c0beb87f23035a76df683e12aa760543ba8517734bd48be1eeb24443820714ce24748eeb54b6c00

data/.travis.yml

@@ -1,6 +1,11 @@
-sudo: required
 language: ruby
-dist: trusty
+dist: xenial
+os: linux
+
+# See: https://docs.travis-ci.com/user/languages/ruby/#bundler-20
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 
 rvm:
   - 2.2.3

data/Gemfile.lock

@@ -2,15 +2,17 @@ PATH
   remote: .
   specs:
     signalfx (2.1.0)
-      activesupport (>= 3.2)
+      activesupport (>= 3.2, < 6)
+      faye-websocket (~> 0.10.7)
+      i18n (= 1.1.0)
       protobuf (>= 3.5.1)
       rest-client (~> 2.0)
-      websocket-client-simple (~> 0.3.0)
+      thor (= 0.20.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -18,20 +20,20 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     daemons (1.2.4)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.3.1)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    event_emitter (0.2.6)
     eventmachine (1.2.5)
-    faye-websocket (0.10.7)
+    faye-websocket (0.10.9)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     hashdiff (0.3.7)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.1.0)
@@ -39,12 +41,12 @@ GEM
     json (2.1.0)
     method_source (0.8.2)
     middleware (0.1.0)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    minitest (5.11.3)
+    mime-types-data (3.2019.1009)
+    minitest (5.13.0)
     netrc (0.11.0)
-    protobuf (3.8.4)
+    protobuf (3.10.3)
       activesupport (>= 3.2)
       middleware
       thor
@@ -56,23 +58,24 @@ GEM
     public_suffix (3.0.2)
     rack (2.0.3)
     rake (10.4.2)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     safe_yaml (1.0.4)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -86,29 +89,24 @@ GEM
       rack (>= 1, < 3)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket (1.2.8)
-    websocket-client-simple (0.3.0)
-      event_emitter
-      websocket
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.10)
-  faye-websocket (~> 0.10.7)
+  bundler (~> 1.17.3)
   pry
   rake (~> 10.0)
   rspec (~> 3.3)
@@ -118,4 +116,4 @@ DEPENDENCIES
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

data/README.md

@@ -31,9 +31,33 @@ installing a more recent gem.  Building and installing signalfx from source will
 
 ## Usage
 
-### API access token
 
-To use this library, you need a SignalFx API access token, which can be obtained from the SignalFx organization you want to report data into.
+### Configuring your endpoints
+
+In order to send your data to the correct realm, you may need to configure your 
+endpoints. If no endpoints are set manually, this library uses the ``us0`` realm by default. 
+If you are not in this realm, you will need to explicitly set the
+endpoint config options below. To determine if you are in a different realm and need to
+explicitly set the endpoints, check your profile page in the SignalFx 
+web application. 
+
+```ruby
+require('signalfx')
+# Create client with alternate ingest endpoint
+client = SignalFx.new('ORG_TOKEN', ingest_endpoint: 'https://ingest.{REALM}.signalfx.com',
+                      stream_endpoint: 'https:/stream.{REALM}.signalfx.com')
+
+```
+
+### Access tokens
+
+To use this library, you will also need to specify an access token when requesting
+one of those clients. For the ingest client, you need to specify your
+organization access token (which can be obtained from the
+SignalFx organization you want to report data into). For the SignalFlow client, either an
+organization access token or a user access token may be used. For more
+information on access tokens, see the API's [authentication documentation](https://developers.signalfx.com/basics/authentication.html).
+
 
 ### Create client
 
@@ -105,6 +129,11 @@ actually make it to SignalFx).
 To send data through a HTTP proxy, set the environment variable `http_proxy`
 with the proxy URL.
 
+The SignalFlow client by default will use the proxy set in the `http_proxy`
+envvar by default. To send SignalFlow websocket data through a separate proxy,
+set the `proxy_url` keyword arg on the `client.signalflow` call.
+
+
 ### Sending multi-dimensional data
 
 Reporting dimensions for the data is also optional, and can be
@@ -174,9 +203,23 @@ sending events.
 
 You can run SignalFlow computations as well.  This library supports all of the
 functionality described in our [API docs for
-SignalFlow](https://developers.signalfx.com/reference#signalflowconnect). Right
+SignalFlow](https://developers.signalfx.com/signalflow_reference.html). Right
 now, the only supported transport mechanism is WebSockets.
 
+#### Configure the SignalFlow client endpoint
+
+By default, this library connects to the `us0` stream endpoint.
+If you are not in this realm, you will need to explicitly set the
+endpoint config options below when creating the client. 
+To determine if you are in a different realm and need to
+explicitly set the endpoints, check your profile page in the SignalFx web application.
+
+```ruby
+client = SignalFx.new('ORG_TOKEN', ingest_endpoint: 'https://ingest.{REALM}.signalfx.com',
+                      stream_endpoint: 'https:/stream.{REALM}.signalfx.com')
+```
+
+
 To create a new SignalFlow client instance from an existing SignalFx client:
 
 ```ruby

data/lib/signalfx/signal_fx_client.rb

@@ -171,8 +171,11 @@ class SignalFxClient
   #
   # @return [SignalFlowClient] a newly instantiated client, configured with the
   #   api token and endpoints from this class
-  def signalflow
-    SignalFlowClient.new(@api_token, @stream_endpoint)
+  def signalflow(proxy_url: nil, debug: false)
+    if ENV["http_proxy"] and proxy_url == nil
+      proxy_url = ENV["http_proxy"]
+    end
+    SignalFlowClient.new(@api_token, @stream_endpoint, proxy_url: proxy_url, debug: debug)
   end
 
   protected

data/lib/signalfx/signalflow/client.rb

@@ -19,8 +19,8 @@ require_relative "./websocket"
 # our API reference for SignalFlow}.  Hash keys will be symbols instead of
 # strings.
 class SignalFlowClient
-  def initialize(api_token, stream_endpoint)
-    @transport = SignalFlowWebsocketTransport.new(api_token, stream_endpoint)
+  def initialize(api_token, stream_endpoint, proxy_url = nil)
+    @transport = SignalFlowWebsocketTransport.new(api_token, stream_endpoint, proxy_url)
   end
 
   # Start a computation and attach to its output. If using WebSockets (the

data/lib/signalfx/signalflow/websocket.rb

@@ -2,12 +2,18 @@
 
 require 'json'
 require 'thread'
-require 'websocket-client-simple'
+require 'faye/websocket'
 
 require_relative './binary'
 require_relative './channel'
 require_relative './computation'
 
+class WebsocketError < StandardError
+  def initialize(ws_err)
+    super ws_err.message
+  end
+end
+
 
 # A WebSocket transport for SignalFlow.  This should not be used directly by
 # end-users.
@@ -17,14 +23,17 @@ class SignalFlowWebsocketTransport
   # A lower bound on the amount of time to wait for a computation to start
   COMPUTATION_START_TIMEOUT_SECONDS = 30
 
-  def initialize(api_token, stream_endpoint, logger: Logger.new(STDOUT, progname: "signalfx"))
+  def initialize(api_token, stream_endpoint, proxy_url: nil, logger: Logger.new(STDOUT, progname: "signalfx"), debug: false)
     @api_token = api_token
     @stream_endpoint = stream_endpoint
     @logger = logger
     @compress = true
+    @proxy_url = proxy_url
+    @debug = debug
 
     @lock = Mutex.new
     @close_reason = nil
+    @last_error = nil
     reinit
   end
 
@@ -188,6 +197,9 @@ class SignalFlowWebsocketTransport
           # The socket will be closed by the server if auth isn't successful
           # within 5 seconds so no point in waiting longer
           if Time.now - start_time > 5 || @close_reason
+            if @last_error
+              raise WebsocketError.new(@last_error)
+            end
             raise "Could not authenticate to SignalFlow WebSocket: #{@close_reason}"
           end
           sleep 0.1
@@ -200,7 +212,11 @@ class SignalFlowWebsocketTransport
   private :send_msg
 
   def on_close(msg)
-    @close_reason = "(#{msg.code}, #{msg.data})"
+    if @debug
+      @logger.info("Websocket on_close: #{msg}")
+    end
+
+    @close_reason = "(#{msg.code}, #{msg.reason})"
     @chan_callbacks.keys.each do |channel_name|
       invoke_callback_for_channel({ :event => "CONNECTION_CLOSED" }, channel_name)
     end
@@ -208,21 +224,31 @@ class SignalFlowWebsocketTransport
     reinit
   end
 
+  def on_error(e)
+    @logger.error("ERROR #{e.inspect}")
+    @last_error = e
+  end
+
+
   def on_message(m)
-    begin
-      return if m.type == :ping
-      if m.type == :close
-        on_close(m)
-        return
-      end
+    if @debug
+      @logger.info("Websocket on_message: #{m}")
+    end
 
-      message_received(m.data, m.type == :text)
+    is_text = m.data.kind_of?(String)
+
+    begin
+      message_received(m.data, is_text)
     rescue Exception => e
       @logger.error("Error processing SignalFlow message: #{e.backtrace.first}: #{e.message} (#{e.class})")
     end
   end
 
   def on_open
+    if @debug
+      @logger.info("Websocket on_open")
+    end
+
     @ws.send({
       :type => "authenticate",
       :token => @api_token,
@@ -233,26 +259,38 @@ class SignalFlowWebsocketTransport
   # reactor.
   def startup_client
     this = self
-    WebSocket::Client::Simple.connect("#{@stream_endpoint}/v2/signalflow/connect",
-                                      # Verification is disabled by default so this is essential
-                                      {verify_mode: OpenSSL::SSL::VERIFY_PEER}) do |ws|
-      @ws = ws
-      ws.on :error do |e|
-        @logger.error("ERROR #{e.inspect}")
-      end
 
-      ws.on :close do |e|
-        this.on_close(e)
-      end
+    options = {
+      :tls => {
+        :verify_peer => true,
+      }
+    }
+    if @proxy_url
+      options[:proxy] = {
+       :origin  => @proxy_url,
+      }
+    end
+    Thread.new {
+      EM.run {
+        @ws = Faye::WebSocket::Client.new("#{@stream_endpoint}/v2/signalflow/connect", [], options)
+        @ws.on :error do |e|
+          this.on_error(e)
+        end
 
-      ws.on :message do |m|
-        this.on_message(m)
-      end
+        @ws.on :close do |e|
+          this.on_close(e)
+          EM.stop_event_loop
+        end
 
-      ws.on :open do
-        this.on_open
-      end
-    end
+        @ws.on :message do |m|
+          this.on_message(m)
+        end
+
+        @ws.on :open do
+          this.on_open
+        end
+      }
+    }
   end
   private :startup_client
 
@@ -294,7 +332,8 @@ class SignalFlowWebsocketTransport
     if is_text
       JSON.parse(raw_msg, {:symbolize_names => true})
     else
-      BinaryMessageParser.parse(raw_msg)
+      # Convert the byte array to a string
+      BinaryMessageParser.parse(raw_msg.pack("c*"))
     end
   end
   private :parse_message

data/lib/signalfx/version.rb

@@ -1,8 +1,8 @@
-# Copyright (C) 2015-2016 SignalFx, Inc. All rights reserved.
+# Copyright (C) 2015-2020 SignalFx, Inc. All rights reserved.
 
 module SignalFx
   module Version
-    VERSION = '2.1.0'
+    VERSION = '3.0.0'
     NAME = 'signalfx-ruby-client'
   end
 end

data/signalfx.gemspec

@@ -29,20 +29,22 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.17.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "webmock", "~> 2.3.1"
   spec.add_development_dependency "thin", "~> 1.7"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "faye-websocket", "~> 0.10.7"
 
   # protobuf enforces this check but builds with a newer Ruby version so it's not enabled.
   # Incorporating here to allow 2.2.0-1 users to successfully build and install signalfx.
-  active_support_max_version = "< 5" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
+  active_support_max_version = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2") ? "<5" : "<6"
   spec.add_dependency "activesupport", '>= 3.2', active_support_max_version
 
   spec.add_dependency "protobuf", ">= 3.5.1"
   spec.add_dependency "rest-client", "~> 2.0"
-  spec.add_dependency 'websocket-client-simple', "~> 0.3.0"
+  spec.add_dependency "faye-websocket", "~> 0.10.7"
+  spec.add_dependency "i18n", "= 1.1.0"
+  spec.add_dependency "thor", "= 0.20.0"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - SignalFx, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +101,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,6 +111,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -151,19 +143,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.10.7
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 description: This is a programmatic interface in Ruby for SignalFx's metadata and
   ingest APIs. It is meant to provide a base for communicating with SignalFx APIs
   that can be easily leveraged by scripts and applications to interact with SignalFx
@@ -217,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby client library for SignalFx