wavefront-sdk 5.4.1 → 6.0.0

data/spec/wavefront-sdk/writers/socket_spec.rb

@@ -6,24 +6,23 @@ require 'spy'
 require 'spy/integration'
 require 'socket'
 require 'logger'
+require_relative '../resources/dummy_points'
 require_relative '../../spec_helper'
 require_relative '../../../lib/wavefront-sdk/write'
-require_relative '../resources/dummy_points'
+require_relative '../../../spec/support/mocket'
+
+UNIX_SOCK = '/tmp/testsock'
 
-# rubocop:disable Style/MutableConstant
-WS_CREDS = { proxy: 'wavefront-proxy' }
-# rubocop:enable Style/MutableConstant
+WU_CREDS = { socket: UNIX_SOCK }.freeze
 
-# It's not straightforward to test the Writer::Socket class on its
-# own. It makes far more sense to test the Write interface which
-# calls it.
+# Test UNIX Datagram socket writing
 #
-class WavefrontWriterSocketTest < MiniTest::Test
+class WavefrontWriterUnixTest < MiniTest::Test
   attr_reader :wf, :wf_noop
 
   def setup
-    @wf = Wavefront::Write.new(WS_CREDS, writer: :socket)
-    @wf_noop = Wavefront::Write.new(WS_CREDS, writer: :socket, noop: true)
+    @wf = Wavefront::Write.new(WU_CREDS, writer: :socket)
+    @wf_noop = Wavefront::Write.new(WU_CREDS, writer: :socket, noop: true)
   end
 
   def test_writer_class
@@ -32,16 +31,16 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_openclose
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf.write(POINT)
     assert mocket_spy.has_been_called?
   end
 
   def test_write_noop
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf_noop.open
     wf_noop.write(POINT, false)
     refute mocket_spy.has_been_called?
@@ -49,16 +48,16 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_noop_openclose
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf_noop.write(POINT)
     refute mocket_spy.has_been_called?
   end
 
   def test_write
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf.open
     wf.write(POINT, false)
     assert mocket_spy.has_been_called?
@@ -66,8 +65,8 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_write_array
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf.open
     wf.write(POINT_A, false)
     assert mocket_spy.has_been_called?
@@ -75,35 +74,58 @@ class WavefrontWriterSocketTest < MiniTest::Test
 
   def test_noop_send_point
     mocket = Mocket.new
-    Spy.on(TCPSocket, :new).and_return(mocket)
-    mocket_spy = Spy.on(mocket, :puts)
+    Spy.on(UNIXSocket, :new).and_return(mocket)
+    mocket_spy = Spy.on(mocket, :write)
     wf_noop.open
     wf_noop.send_point(POINT_L)
     refute mocket_spy.has_been_called?
   end
 
   def test_open
-    tcp_spy = Spy.on(TCPSocket, :new)
+    tcp_spy = Spy.on(UNIXSocket, :new)
     wf.open
     assert tcp_spy.has_been_called?
-    assert_equal(['wavefront-proxy', 2878], tcp_spy.calls.first.args)
+    assert_equal([UNIX_SOCK], tcp_spy.calls.first.args)
   end
 
   def test_noop_open
-    tcp_spy = Spy.on(TCPSocket, :new)
+    tcp_spy = Spy.on(UNIXSocket, :new)
     log_spy = Spy.on(wf_noop.logger, :log)
     wf_noop.open
     refute tcp_spy.has_been_called?
-    assert_equal(['No-op requested. Not opening connection to proxy.'],
+    assert_equal(['No-op requested. Not opening socket connection.'],
                  log_spy.calls.last.args)
     assert_equal(1, log_spy.calls.size)
   end
 
   def test_noop_close
-    tcp_spy = Spy.on(TCPSocket, :new)
+    tcp_spy = Spy.on(UNIXSocket, :new)
     log_spy = Spy.on(wf_noop.logger, :log)
     wf_noop.close
     refute tcp_spy.has_been_called?
     refute log_spy.has_been_called?
   end
+
+  def test_validate_credentials
+    assert(Wavefront::Write.new(WU_CREDS, writer: :socket))
+
+    assert_instance_of(Wavefront::Write,
+                       Wavefront::Write.new(WU_CREDS, writer: :socket))
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({}, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ endpoint: 'wavefront.com' }, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ token: 'abcdef' }, writer: :socket)
+    end
+
+    assert_raises(Wavefront::Exception::CredentialError) do
+      Wavefront::Write.new({ proxy: nil }, writer: :socket)
+    end
+  end
 end

data/wavefront-sdk.gemspec

@@ -7,7 +7,6 @@ require_relative 'lib/wavefront-sdk/defs/version'
 Gem::Specification.new do |gem|
   gem.name          = 'wavefront-sdk'
   gem.version       = WF_SDK_VERSION
-  gem.date          = Date.today.to_s
 
   gem.summary       = 'SDK for Wavefront API v2'
   gem.description   = 'SDK for Wavefront (wavefront.com) API v2 '
@@ -29,11 +28,14 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'minitest', '~> 5.14'
   gem.add_development_dependency 'rake', '~> 13.0'
-  gem.add_development_dependency 'rubocop', '1.0'
+  gem.add_development_dependency 'rubocop', '~> 1.17'
+  gem.add_development_dependency 'rubocop-minitest', '~> 0.10'
+  gem.add_development_dependency 'rubocop-performance', '~> 1.3'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.5'
   gem.add_development_dependency 'simplecov', '~> 0.18'
   gem.add_development_dependency 'spy', '1.0.0'
   gem.add_development_dependency 'webmock', '~> 3.9'
   gem.add_development_dependency 'yard', '~> 0.9'
 
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-sdk
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -98,16 +98,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -171,10 +213,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
-- ".github/workflows/ruby.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -206,6 +248,7 @@ files:
 - lib/wavefront-sdk/message.rb
 - lib/wavefront-sdk/metric.rb
 - lib/wavefront-sdk/metric_helper.rb
+- lib/wavefront-sdk/metricspolicy.rb
 - lib/wavefront-sdk/notificant.rb
 - lib/wavefront-sdk/paginator/base.rb
 - lib/wavefront-sdk/paginator/delete.rb
@@ -241,9 +284,9 @@ files:
 - lib/wavefront-sdk/writers/api.rb
 - lib/wavefront-sdk/writers/core.rb
 - lib/wavefront-sdk/writers/http.rb
+- lib/wavefront-sdk/writers/proxy.rb
 - lib/wavefront-sdk/writers/socket.rb
 - lib/wavefront-sdk/writers/summary.rb
-- lib/wavefront-sdk/writers/unix.rb
 - lib/wavefront_sdk.rb
 - spec/.rubocop.yml
 - spec/constants.rb
@@ -276,6 +319,7 @@ files:
 - spec/wavefront-sdk/message_spec.rb
 - spec/wavefront-sdk/metric_helper_spec.rb
 - spec/wavefront-sdk/metric_spec.rb
+- spec/wavefront-sdk/metricspolicy_spec.rb
 - spec/wavefront-sdk/misc_spec.rb
 - spec/wavefront-sdk/notificant_spec.rb
 - spec/wavefront-sdk/paginator/base_spec.rb
@@ -315,6 +359,7 @@ files:
 - spec/wavefront-sdk/writers/api_spec.rb
 - spec/wavefront-sdk/writers/core_spec.rb
 - spec/wavefront-sdk/writers/http_spec.rb
+- spec/wavefront-sdk/writers/proxy_spec.rb
 - spec/wavefront-sdk/writers/socket_spec.rb
 - spec/wavefront-sdk/writers/summary_spec.rb
 - wavefront-sdk.gemspec
@@ -330,14 +375,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: SDK for Wavefront API v2
@@ -373,6 +418,7 @@ test_files:
 - spec/wavefront-sdk/message_spec.rb
 - spec/wavefront-sdk/metric_helper_spec.rb
 - spec/wavefront-sdk/metric_spec.rb
+- spec/wavefront-sdk/metricspolicy_spec.rb
 - spec/wavefront-sdk/misc_spec.rb
 - spec/wavefront-sdk/notificant_spec.rb
 - spec/wavefront-sdk/paginator/base_spec.rb
@@ -412,5 +458,6 @@ test_files:
 - spec/wavefront-sdk/writers/api_spec.rb
 - spec/wavefront-sdk/writers/core_spec.rb
 - spec/wavefront-sdk/writers/http_spec.rb
+- spec/wavefront-sdk/writers/proxy_spec.rb
 - spec/wavefront-sdk/writers/socket_spec.rb
 - spec/wavefront-sdk/writers/summary_spec.rb

data/.github/workflows/ruby.yml

@@ -1,32 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: [2.4.10, 2.5.8, 2.6.6, 2.7.2]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with: 
-        ruby-version: ${{ matrix.ruby-version }}     
-        bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.9
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-before_install: gem install bundler --no-document
-deploy:
-  provider: rubygems
-  api_key:
-    secure: dfmL5JwBn+u3cUmyAaDsApDa7ljGajGNz3GDcKd2J8FOt7+a758/lmL8EQ34sDT1ZFotrxn/y1RbgXlaDxAE1XDfrZbjckmx7a6wa2sqR3kBraJ2tx7CiXodbw3Z8XZf9WLb0kYGmlLtI73GNcuunMt/9f1cobqWISRLHw6b7amlO7GW2ZBZgzRS+N8TSS2dicIvKMo5HoMYU+uWLM4zDFBPnGNcMiWxh8ysLzJoKqA9kbBUyCVEZ03MlV7G71ObvWCLasKnZ3W5U+K1NbgU7mgMYfl9KIcA4y9hQ9hUCijk40SmT7ffy3P2gq8zblC/4x5Eefpau9X/bdLwXoRCIzqk05t4f45wstj2auHGK0HJwOYRtx8apdaLSgyJ5lQpGcbCRu40WR9mDkaM8m9n3u2o6GJmftCg3AN1QtsourmQB84x67LEbHzValMaokrbCol4XeWqlC+dCNLPixemQRBvcNfI3V9C6RqVGfjpoGlSTI+RkQqwm01PcxpeqIVfdMd1wnfUuAOywUO6UpvtK9TZaxg0NnVElXpPseQbtzulLwZ7R5Y3A4Ss8Z7w43c1KHxTkg54FWUOp065ItjAc4lmyORXq/2+F7sMvRN6dtCLaXTUlkYuU3cjFLIPlLGFYgqq4T4xQa+e5NEK1XW7nghv+IRfKfyVeZsB0WpY+uc=
-  gem: wavefront-sdk
-  on:
-    tags: true
-    repo: snltd/wavefront-sdk
-    ruby: 2.6.6
-notifications:
-  email: false
-  slack:
-    secure: cTG5e5NsnfZCNF6mUbnz8rdxmiPvrihJJN/7vEltO6rSCR4ew+9dfga9n7N5wCu7nae3lEysbRw7vPw605VVkZrfA4gn+HUsoHbKzaKNOB6AV9a8kkbjC4y6MH7EWSD2qsUWeeINP7dNs80cqvEwU2tgtIiBWNAP+e/eCjTEQCq4UIXnEB0f0UIP4bvl3w7/fSd0iFykBiVTiXvGBWKkqbetSAcAvsV5wxbPGqrhBp5AQQ9izm0Uh/P/hv8gaqMariFYA6rIpunWmwxPCHf3B87CTdl6T8uC5bi4bfgb3mFbQUiP9TTblz2XTI3Q9tRDbcFcr4BGpjB1Lyfdy1puRi3QzP5VME5AXvDTr9GVgi9TS6EWqy7P4HC//qZziWllTLlst6R9r/NlagTsiDB/mcnxkJBvOBYAvmzXS5ID6DfNxx/xCfCZuQzp5ISoWawGCvuGHBSOlzZZXKD4AAT8/69SIVybM23Hj/YBPKVvR9brpCmIlK4YXi14SA5sInjD4zn20u/p22vlEybjlnM8td7ryuhmCYm1ptk8y0tZ4oRoK2fBNo2VTD73aXq6P2q3AKuT6A9hRbypEJgawNgOAKJEWDHdu29LfeJIUnm25MzaFzx145it2hDU2/hOUlpFq9QKsmR2pAiI17sAMgHJ15cgaeOv1soWaYJsMOZil74=

data/lib/wavefront-sdk/writers/unix.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'socket'
-require_relative 'core'
-
-module Wavefront
-  module Writer
-    #
-    # Everything specific to writing points to a Unix datagram
-    # socket.
-    #
-    class Unix < Core
-      # Make a connection to a Unix datagram socket, putting the
-      # descriptor in instance variable @conn.
-      # This requires the name of the socket file in creds[:socket]
-      # @return [UnixSocket]
-      #
-      def open
-        if opts[:noop]
-          logger.log('No-op requested. Not opening socket connection.')
-          return true
-        end
-
-        logger.log("Connecting to #{creds[:socket]}.", :debug)
-        open_socket(creds[:socket])
-      end
-
-      def close
-        return if opts[:noop]
-
-        logger.log('Closing socket connection.', :debug)
-        conn.close
-      end
-
-      def validate_credentials(creds)
-        return true if creds.key?(:socket)
-
-        raise(Wavefront::Exception::CredentialError,
-              'creds must contain socket file path')
-      end
-
-      private
-
-      def open_socket(socket)
-        @conn = UNIXSocket.new(socket)
-      rescue StandardError => e
-        logger.log(e, :error)
-        raise Wavefront::Exception::InvalidEndpoint
-      end
-
-      # @param point [String] point or points in native Wavefront
-      # format.
-      #
-      def _send_point(point)
-        conn.write(point)
-      end
-    end
-  end
-end