libhoney 1.14.5 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c56fa15226ad661c0d1a4e3d2f461a7f0037f0b1b1abe536d88592e998974b
-  data.tar.gz: f2b08f84d02ada29ee8d546a7afb6c95a911e717ee3e799c7682715b018b13f1
+  metadata.gz: 9034a56adcdd87d45a5d7602caa9add401b713cb52ba258d0383835b30304ef5
+  data.tar.gz: 4db352186d89946e6121ace449f69d869175ce99cb3910084b35491bbbbc26a8
 SHA512:
-  metadata.gz: b9d152b6ec888487e465e3e2dab280859104c73be09ff600983999896db866e050a0047348008042d1a08bda2d96921236d0720b44ba2a420662d4cd06bba7ff
-  data.tar.gz: a95954263471061d71ad2b367bb515561a124e9ae8bc25096343dc992897b414ffeaa5a8a5612da44e697ff38fb2cb5390f46dd1d184861c2926ec65fb978fb7
+  metadata.gz: fce68faca7e1353f8d01bc2329fcb9d3157cdb38cedbdd75f451b2c2896d8119f2651b68eebcf8b5961b696c53f00f6a6a855d40fabfa9039d07e948a5a70683
+  data.tar.gz: 3e9433a4e07bf24f0db174c87f2b8074cd51c1dacedfb5cf3bb403ed444f0403b81aa66ae9f3c2401f119a39edfebc53aba89246c3361719be7265cf0eabd5ca

data/.circleci/config.yml

@@ -1,67 +1,63 @@
-version: 2.0
+version: 2.1
 
-test_steps: &test_steps
-  - checkout
-  - run:
-      name: Force Bundler Version
-      command: |
-        sudo gem update --system
-        echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-        source $BASH_ENV
-        gem install bundler
-  - restore_cache:
-      keys:
-        - v1-dependencies-{{ checksum "Gemfile.lock" }}
-        # fallback to using the latest cache if no exact match is found
-        - v1-dependencies-
-  - run:
-      name: install dependencies
-      command: |
-        bundle install --jobs=4 --retry=3 --path vendor/bundle
-  - save_cache:
-      paths:
-        - ./vendor/bundle
-      key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-  - run:
-      name: run rubocop
-      command: bundle exec rake rubocop
-  - run:
-      name: run tests
-      command: bundle exec rake test
+# YAML Anchors to reduce copypasta
 
-# required as all of the jobs need to have a tag filter for some reason
-tag_filters: &tag_filters
+# This is necessary for job to run when a tag is created
+filters_always: &filters_always
   filters:
-      tags:
-        only: /.*/
+    tags:
+      only: /.*/
 
-jobs:
-  ruby-2.3:
-    docker:
-      - image: circleci/ruby:2.3
-    steps: *test_steps
-  ruby-2.4:
-    docker:
-      - image: circleci/ruby:2.4
-    steps: *test_steps
-  ruby-2.5:
-    docker:
-      - image: circleci/ruby:2.5
-    steps: *test_steps
-  ruby-2.6:
-    docker:
-      - image: circleci/ruby:2.6
-    steps: *test_steps
-  ruby-2.7:
+# Restrict running to only be on tags starting with vNNNN
+filters_publish: &filters_publish
+  filters:
+    tags:
+      only: /^v[0-9].*/
+    branches:
+      ignore: /.*/
+
+matrix_rubyversions: &matrix_rubyversions
+  matrix:
+    parameters:
+      rubyversion: ["2.2", "2.3", "2.4", "2.5", "2.6", "2.7"]
+
+# Default version of ruby to use for lint and publishing
+default_rubyversion: &default_rubyversion "2.7"
+
+executors:
+  ruby:
+    parameters:
+      rubyversion:
+        type: string
+        default: *default_rubyversion
     docker:
-      - image: circleci/ruby:2.7
-    steps: *test_steps
-  publish:
+      - image: circleci/ruby:<< parameters.rubyversion >>
+  github:
     docker:
-      # Just randomly pick one recent ruby version
-      - image: circleci/ruby:2.7
-    working_directory: ~/repo
+      - image: cibuilds/github:0.13.0
+
+commands:
+  publish_github:
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: "Artifacts being published"
+          command: |
+            echo "about to publish to tag ${CIRCLE_TAG}"
+            ls -l ~/artifacts/*
+      - run:
+          name: "GHR Draft"
+          command: ghr -draft -n ${CIRCLE_TAG} -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} ~/artifacts
+  publish_rubygems:
     steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: "Artifacts being published"
+          command: |
+            echo "about to publish to tag ${CIRCLE_TAG}"
+            ls -l ~/artifacts/*
       - checkout
       - run:
           name: Setup Rubygems
@@ -69,11 +65,66 @@ jobs:
       - run:
           name: Publish to Rubygems
           command: |
-            gem build libhoney.gemspec
-            gem push "libhoney-$(git describe --tags | cut -d "v" -f 2).gem"
+            gem push ~/artifacts/*.gem
+
+jobs:
+  test:
+    parameters:
+      rubyversion:
+        type: string
+        default: *default_rubyversion
+    executor:
+      name: ruby
+      rubyversion: "<< parameters.rubyversion >>"
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "libhoney.gemspec" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "libhoney.gemspec" }}
+      - run:
+          name: run rubocop
+          command: bundle exec rake rubocop
+      - run:
+          name: run tests
+          command: bundle exec rake test
+
+  build_artifacts:
+    executor:
+      name: ruby
+    steps:
+      - checkout
+      - run: mkdir -p ~/artifacts
+      - run: gem build libhoney.gemspec
+      - run: cp libhoney-*.gem ~/artifacts/
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - artifacts
+      - store_artifacts:
+          path: ~/artifacts
+
+  publish_github:
+    executor: github
+    steps:
+      - publish_github
+
+  publish_rubygems:
+    executor:
+      name: ruby
+    steps:
+      - publish_rubygems
 
 workflows:
-  version: 2
   nightly:
     triggers:
       - schedule:
@@ -83,27 +134,24 @@ workflows:
               only:
                 - main
     jobs:
-      - ruby-2.3: *tag_filters
-      - ruby-2.4: *tag_filters
-      - ruby-2.5: *tag_filters
-      - ruby-2.6: *tag_filters
-      - ruby-2.7: *tag_filters
+      - test:
+          <<: *matrix_rubyversions
   build:
     jobs:
-      - ruby-2.3: *tag_filters
-      - ruby-2.4: *tag_filters
-      - ruby-2.5: *tag_filters
-      - ruby-2.6: *tag_filters
-      - ruby-2.7: *tag_filters
-      - publish:
+      - test:
+          <<: *filters_always
+          <<: *matrix_rubyversions
+      - build_artifacts:
+          <<: *filters_always
           requires:
-            - ruby-2.3
-            - ruby-2.4
-            - ruby-2.5
-            - ruby-2.6
-            - ruby-2.7
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/
+            - test
+      - publish_github:
+          <<: *filters_publish
+          context: Honeycomb Secrets
+          requires:
+            - build_artifacts
+      - publish_rubygems:
+          <<: *filters_publish
+          context: Honeycomb Secrets
+          requires:
+            - build_artifacts

data/.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_size = 4
+trim_trailing_whitespace = false

data/.gitignore

@@ -52,3 +52,5 @@ build-iPhoneSimulator/
 # vim stuff
 *.swp
 *.swo
+
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+# libhoney-rb changelog
+
+## 1.16.0
+
+### Fixes:
+
+- Don't moneypatch Class (#70)
+
+### Maintenance:
+
+- Add lockfile to gitignore (#71)
+
+## 1.15.0
+
+### Improvements:
+
+- Do not attempt to send invalid events (#67)
+
+### Maintenance:
+
+- Modernize circle, include github publishing (#64)
+- Update .editorconfig to add new lines to end of files (#68)
+
+### Misc
+
+-   Added CHANGELOG.md
+-   Updates to CI configuration and documentation
+-   Updated version management.

data/README.md

@@ -4,8 +4,8 @@ Ruby gem for sending events to [Honeycomb](https://www.honeycomb.io), a service
 
 Requires Ruby 2.2 or greater.
 
-- [Usage and Examples](https://docs.honeycomb.io/sdk/ruby/)
-- [API Reference](https://www.rubydoc.info/gems/libhoney)
+-   [Usage and Examples](https://docs.honeycomb.io/sdk/ruby/)
+-   [API Reference](https://www.rubydoc.info/gems/libhoney)
 
 For tracing support and automatic instrumentation of Rails, Sinatra, Rack, ActiveRecord, and other frameworks, check out our [Beeline for Ruby](https://github.com/honeycombio/beeline-ruby).
 
@@ -20,8 +20,11 @@ All contributions will be released under the Apache License 2.0.
 ### Releasing a new version
 
 CircleCI will automatically upload tagged releases to Rubygems. To release a new
-version, run
+version, update the version using `bump`.
+
 ```
-bump patch --tag   # Or bump minor --tag, etc.
-git push --follow-tags
+bump patch # Or bump minor, etc.
 ```
+
+Then, after the version change has been merged into `main`, follow our usual instructions
+for tagging and updating the github release.

data/lib/libhoney/client.rb

@@ -1,31 +1,10 @@
 require 'time'
 require 'json'
 require 'http'
+require 'forwardable'
 
 require 'libhoney/null_transmission'
 
-# Define a few additions that proxy access through Client's builder. Makes Client much tighter.
-class Class
-  def builder_attr_accessor(*args)
-    args.each do |arg|
-      class_eval("def #{arg};@builder.#{arg};end", __FILE__, __LINE__)
-      class_eval("def #{arg}=(val);@builder.#{arg}=val;end", __FILE__, __LINE__)
-    end
-  end
-
-  def builder_attr_reader(*args)
-    args.each do |arg|
-      class_eval("def #{arg};@builder.#{arg};end", __FILE__, __LINE__)
-    end
-  end
-
-  def builder_attr_writer(*args)
-    args.each do |arg|
-      class_eval("def #{arg}=(val);@builder.#{arg}=val;end", __FILE__, __LINE__)
-    end
-  end
-end
-
 module Libhoney
   ##
   # This is a library to allow you to send events to Honeycomb from within your
@@ -52,6 +31,8 @@ module Libhoney
   #   evt.send
   #
   class Client
+    extend Forwardable
+
     API_HOST = 'https://api.honeycomb.io/'.freeze
 
     # Instantiates libhoney and prepares it to send events to Honeycomb.
@@ -124,19 +105,12 @@ module Libhoney
       @proxy_config           = proxy_config
     end
 
-    builder_attr_accessor :writekey, :dataset, :sample_rate, :api_host
-
     attr_reader :block_on_send, :block_on_responses, :max_batch_size,
                 :send_frequency, :max_concurrent_batches,
                 :pending_work_capacity, :responses
 
-    def event
-      @builder.event
-    end
-
-    def builder(fields = {}, dyn_fields = {})
-      @builder.builder(fields, dyn_fields)
-    end
+    def_delegators :@builder, :event, :writekey, :writekey=, :dataset, :dataset=,
+                   :sample_rate, :sample_rate=, :api_host, :api_host=, :builder
 
     # Nuke the queue and wait for inflight requests to complete before returning.
     # If you set drain=false, all queued requests will be dropped on the floor.
@@ -229,7 +203,7 @@ module Libhoney
           proxy_config: @proxy_config
         }
 
-        @transmission ||= TransmissionClient.new(transmission_client_params)
+        @transmission ||= TransmissionClient.new(**transmission_client_params)
       end
 
       @transmission.add(event)

data/lib/libhoney/transmission.rb

@@ -40,6 +40,8 @@ module Libhoney
     end
 
     def add(event)
+      return unless event_valid(event)
+
       begin
         @batch_queue.enq(event, !@block_on_send)
       rescue ThreadError
@@ -49,6 +51,26 @@ module Libhoney
       ensure_threads_running
     end
 
+    def event_valid(event)
+      invalid = []
+      invalid.push('api host') if event.api_host.nil? || event.api_host.empty?
+      invalid.push('write key') if event.writekey.nil? || event.writekey.empty?
+      invalid.push('dataset') if event.dataset.nil? || event.dataset.empty?
+
+      unless invalid.empty?
+        e = StandardError.new("#{self.class.name}: nil or empty required fields (#{invalid.join(', ')})"\
+          '. Will not attempt to send.')
+        Response.new(error: e).tap do |error_response|
+          error_response.metadata = event.metadata
+          enqueue_response(error_response)
+        end
+
+        return false
+      end
+
+      true
+    end
+
     def send_loop
       http_clients = build_http_clients
 

data/lib/libhoney/version.rb

@@ -1,3 +1,3 @@
 module Libhoney
-  VERSION = '1.14.5'.freeze
+  VERSION = '1.16.0'.freeze
 end

data/libhoney.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '< 0.69'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'sinatra-contrib'
-  spec.add_development_dependency 'spy'
+  spec.add_development_dependency 'spy', '1.0.0'
   spec.add_development_dependency 'webmock', '~> 3.4'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'yardstick', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libhoney
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.16.0
 platform: ruby
 authors:
 - The Honeycomb.io Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -112,16 +112,16 @@ dependencies:
   name: spy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -206,13 +206,14 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".circleci/setup-rubygems.sh"
+- ".editorconfig"
 - ".github/CODEOWNERS"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NOTICE
 - README.md
@@ -252,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: send data to Honeycomb

data/Gemfile.lock

@@ -1,103 +0,0 @@
-PATH
-  remote: .
-  specs:
-    libhoney (1.14.5)
-      addressable (~> 2.0)
-      http (>= 2.0, < 5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    backports (3.16.0)
-    bump (0.8.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.13.1)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    hashdiff (1.0.0)
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
-    jaro_winkler (1.5.4)
-    minitest (5.14.0)
-    multi_json (1.14.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    public_suffix (4.0.3)
-    rack (2.1.4)
-    rack-protection (2.0.8.1)
-      rack
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rubocop (0.68.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    safe_yaml (1.0.5)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
-      tilt (~> 2.0)
-    sinatra-contrib (2.0.8.1)
-      backports (>= 2.8.2)
-      multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.0.8.1)
-      sinatra (= 2.0.8.1)
-      tilt (~> 2.0)
-    spy (1.0.0)
-    tilt (2.0.10)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.5.0)
-    webmock (3.8.1)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.24)
-    yardstick (0.9.9)
-      yard (~> 0.8, >= 0.8.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump (~> 0.5)
-  bundler
-  libhoney!
-  minitest (~> 5.0)
-  rake (~> 12.3)
-  rubocop (< 0.69)
-  sinatra
-  sinatra-contrib
-  spy
-  webmock (~> 3.4)
-  yard
-  yardstick (~> 0.9)
-
-BUNDLED WITH
-   2.1.4