signalfx 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1cec7a5de514b8432cd66c22f331d2fb4fd14ed
-  data.tar.gz: bd426b759f14b86519cf7c932816fca1f54ff107
+  metadata.gz: f4d9b5d2fd10a70d0b431b6e6d4200e3f4634ff5
+  data.tar.gz: 711835760cb429f574c776435eba20a46b45afa1
 SHA512:
-  metadata.gz: edc96a9293d8d1361c8f6726bf7b44c3522c9a13d4d3d2dd9c1d583349bed2762589ab133e502d7e814ee5aec9c3712bd4f61b9bf2b45eba66590730cee67f2b
-  data.tar.gz: 436e10fdca7a8f89624ff59938af0ee226cd8a1d8f08f95ffdcf11435f48eafcd0916ba07eeb0678fb8a3cc1b87610287085c4a0e8e772e5e6808c2dcad0e2d2
+  metadata.gz: c9ab6fa6dc20607bb4516534e674206af91bb8ffd7304e2b579a36cbcb1cd85dc23e0b2e25620bec371738b90d4dedb00bc5af22bf7871370167b8470d74f739
+  data.tar.gz: 9f3d726b842f389cc7e5732b3124d376898cd5639fe657133420c6633bf3ee811c82d139ea4261726f7440842fc98a421819ca3bcd343f6382a21d388212168b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    signalfx (2.0.5)
+    signalfx (2.1.0)
       activesupport (>= 3.2)
       protobuf (>= 3.5.1)
       rest-client (~> 2.0)

data/README.md

@@ -55,7 +55,7 @@ Optional constructor parameters:
   deployed on Amazon AWS.
 + **ingest_endpoint** (string): to override the target ingest API
   endpoint.
-+ **api_endpoint** (string): to override the target REST API endpoint.
++ **stream_endpoint** (string): to override the target stream endpoint for SignalFlow.
 + **timeout** (number): timeout, in seconds, for requests to SignalFx.
 + **batch_size** (number): size of datapoint batches to send to
   SignalFx.

data/lib/signalfx.rb

@@ -16,31 +16,35 @@ module SignalFx
   #     and set it as `AWSUniqueId` dimension for each datapoint and event.
   #     Use this option only if your application deployed to Amazon
   # @param ingest_endpoint - string
-  # @param api_endpoint - string
+  # @param stream_endpoint - string
   # @param timeout - number
   # @param batch_size - number
   # @param user_agents - array
   def self.new(api_token,
                enable_aws_unique_id: false,
                ingest_endpoint: RbConfig::DEFAULT_INGEST_ENDPOINT,
+               stream_endpoint: RbConfig::DEFAULT_STREAM_ENDPOINT,
                timeout: RbConfig::DEFAULT_TIMEOUT,
                batch_size: RbConfig::DEFAULT_BATCH_SIZE,
-               user_agents: [])
+               user_agents: [],
+               logger: Logger.new(STDOUT, progname: "signalfx"))
     begin
       require_relative './proto/signal_fx_protocol_buffers.pb'
       ProtoBufSignalFx.new(api_token,
                            enable_aws_unique_id: enable_aws_unique_id,
                            ingest_endpoint: ingest_endpoint,
+                           stream_endpoint: stream_endpoint,
                            timeout: timeout,
                            batch_size: batch_size,
                            user_agents: user_agents)
 
     rescue Exception => e
-      puts "Protocol Buffers not installed properly. Switching to JSON.
-            #{e}"
+      logger.warn("Protocol Buffers not installed properly. Switching to JSON.
+            #{e}")
       JsonSignalFx.new(api_token,
                        enable_aws_unique_id: enable_aws_unique_id,
                        ingest_endpoint: ingest_endpoint,
+                       stream_endpoint: stream_endpoint,
                        timeout: timeout,
                        batch_size: batch_size,
                        user_agents: user_agents)

data/lib/signalfx/signal_fx_client.rb

@@ -31,19 +31,19 @@ class SignalFxClient
   def initialize(api_token,
                  enable_aws_unique_id: false,
                  ingest_endpoint: RbConfig::DEFAULT_INGEST_ENDPOINT,
-                 api_endpoint: RbConfig::DEFAULT_API_ENDPOINT,
                  stream_endpoint: RbConfig::DEFAULT_STREAM_ENDPOINT,
                  timeout: RbConfig::DEFAULT_TIMEOUT,
                  batch_size: RbConfig::DEFAULT_BATCH_SIZE,
-                 user_agents: [])
+                 user_agents: [],
+                 logger: Logger.new(STDOUT, progname: "signalfx"))
 
     @api_token = api_token
     @ingest_endpoint = ingest_endpoint
-    @api_endpoint = api_endpoint
     @stream_endpoint = stream_endpoint
     @timeout = timeout
     @batch_size = batch_size
     @user_agents = user_agents
+    @logger = logger
 
     @aws_unique_id = nil
 
@@ -55,9 +55,9 @@ class SignalFxClient
         if request != nil
           json_resp = JSON.parse(request.body)
           @aws_unique_id = json_resp['instanceId']+'_'+json_resp['region']+'_'+json_resp['accountId']
-          puts("AWS Unique ID loaded: #{@aws_unique_id}")
+          @logger.info("AWS Unique ID loaded: #{@aws_unique_id}")
         else
-          puts('Failed to retrieve AWS unique ID.')
+          @logger.warn('Failed to retrieve AWS unique ID.')
         end
       }
     end
@@ -172,7 +172,7 @@ class SignalFxClient
   # @return [SignalFlowClient] a newly instantiated client, configured with the
   #   api token and endpoints from this class
   def signalflow
-    SignalFlowClient.new(@api_token, @api_endpoint, @stream_endpoint)
+    SignalFlowClient.new(@api_token, @stream_endpoint)
   end
 
   protected
@@ -223,14 +223,14 @@ class SignalFxClient
               block.call(response)
             end
           else
-            puts "Failed to send datapoints. Response code: #{response.code}"
+            @logger.error("Failed to send datapoints. Response code: #{response.code}")
             if block
               block.call(nil)
             end
         end
       }
     rescue Exception => e
-      puts "Failed to send datapoints. Error: #{e}"
+      @logger.error("Failed to send datapoints. Error: #{e}")
       if block
         block.call(nil)
       end
@@ -246,12 +246,12 @@ class SignalFxClient
           when 200
             return block.call(response)
           else
-            puts "Failed to retrieve AWS unique ID. Response code: #{response.code}"
+            @logger.warn("Failed to retrieve AWS unique ID. Response code: #{response.code}")
             return block.call(nil)
         end
       }
     rescue Exception => e
-      puts "Failed to retrieve AWS unique ID. Error: #{e}"
+      @logger.warn("Failed to retrieve AWS unique ID. Error: #{e}")
       block.call(nil)
     end
   end

data/lib/signalfx/signalflow/client.rb

@@ -19,7 +19,7 @@ require_relative "./websocket"
 # our API reference for SignalFlow}.  Hash keys will be symbols instead of
 # strings.
 class SignalFlowClient
-  def initialize(api_token, api_endpoint, stream_endpoint)
+  def initialize(api_token, stream_endpoint)
     @transport = SignalFlowWebsocketTransport.new(api_token, stream_endpoint)
   end
 

data/lib/signalfx/signalflow/websocket.rb

@@ -17,9 +17,10 @@ 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)
+  def initialize(api_token, stream_endpoint, logger: Logger.new(STDOUT, progname: "signalfx"))
     @api_token = api_token
     @stream_endpoint = stream_endpoint
+    @logger = logger
     @compress = true
 
     @lock = Mutex.new
@@ -217,7 +218,7 @@ class SignalFlowWebsocketTransport
 
       message_received(m.data, m.type == :text)
     rescue Exception => e
-      puts "Error processing SignalFlow message: #{e.backtrace.first}: #{e.message} (#{e.class})"
+      @logger.error("Error processing SignalFlow message: #{e.backtrace.first}: #{e.message} (#{e.class})")
     end
   end
 
@@ -237,7 +238,7 @@ class SignalFlowWebsocketTransport
                                       {verify_mode: OpenSSL::SSL::VERIFY_PEER}) do |ws|
       @ws = ws
       ws.on :error do |e|
-        puts "ERROR #{e.inspect}"
+        @logger.error("ERROR #{e.inspect}")
       end
 
       ws.on :close do |e|

data/lib/signalfx/version.rb

@@ -2,7 +2,7 @@
 
 module SignalFx
   module Version
-    VERSION = '2.0.5'
+    VERSION = '2.1.0'
     NAME = 'signalfx-ruby-client'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signalfx
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - SignalFx, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby client library for SignalFx