logstash-output-honeycomb_json_batch 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e766e09300c1d2d2edd9b61f711365717c1325bc
-  data.tar.gz: e2ce01c2e02807d5d45576c92a063993a0dbc04b
+  metadata.gz: cd4babd428730a8950b2d8b8131b37b45ee328d6
+  data.tar.gz: 9bee1624e1a2c1214a8c4bb254bdea46b6dbaf76
 SHA512:
-  metadata.gz: 7bed196cb2b70be12e3d7a72a00b70008682dd385e786853023e5f7465e722285bf9380f938093e54bcf609cd9bd5869b132b5daa88a850d755755957d5f5b02
-  data.tar.gz: 56bec4d327e7bd3745967839e54e91ca7151a4322b51595b166b40ab41186e186ebe46f7f5860e1aedba9ccf8dfd59f6b14effae944c005ba94cdec0f40b820b
+  metadata.gz: b9f1d82542dbbaa01a1dadcc192a56fcd6c9f12fbbb9fda3f50dc5bbb5b11c33a643c48d81298d9c77aa5eb3fdc54e0daf3dbf84ce798fc99032cfba9a68288a
+  data.tar.gz: d25d0687c8ef9a0f3b6440a1b5c30a0eec8039c8e68a37ce09224f96cfa8ff07361e7efa9a7c5243bf1923ee8f6b9fa1a02d00e5f6e0d8535549500476062cfe

data/LICENSE

@@ -1,14 +1,201 @@
-Copyright (c) 2017 Hound Technology, Inc <https://honeycomb.io>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -92,3 +92,13 @@ And install it into your local logstash instance:
 ```
 logstash-plugin install ./path/to/logstash-output-honeycomb_json_batch-VERSION.gem
 ```
+
+## Releasing a new version
+
+Travis will upload tagged releases to Rubygems. To release a new version
+
+1. Bump the value of `VERSION` in `lib/logstash/outputs/honeycomb_json_batch.rb`
+2. Bump the version in `logstash-output-honeycomb_json_batch.gemspec`
+3. Commit changes and run `git tag v0.3.2` (for example)
+4. `git push --follow-tags`
+5. Make sure the build succeeds.

data/lib/logstash/outputs/honeycomb_json_batch.rb

@@ -28,7 +28,7 @@ class LogStash::Outputs::HoneycombJSONBatch < LogStash::Outputs::Base
 
   config :pool_max, :validate => :number, :default => 10
 
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
   def register
     @total = 0
@@ -69,9 +69,9 @@ class LogStash::Outputs::HoneycombJSONBatch < LogStash::Outputs::Base
   private
 
   def make_request(documents)
-    body = LogStash::Json.dump({ @dataset => documents })
+    body = LogStash::Json.dump(documents)
 
-    url = "#{@api_host}/1/batch"
+    url = "#{@api_host}/1/batch/#{@dataset}"
     request = client.post(url, {
       :body => body,
       :headers => request_headers

data/logstash-output-honeycomb_json_batch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-honeycomb_json_batch'
-  s.version         = '0.2.1'
+  s.version         = '0.3.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "This output lets you `POST` batches of events to the Honeycomb.io API endpoint"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/outputs/honeycomb_json_batch_spec.rb

@@ -33,7 +33,7 @@ describe LogStash::Outputs::HoneycombJSONBatch do
 
   it "should receive a single post request" do
     expect(client).to receive(:post).
-                        with("#{ api_host }/1/batch", hash_including(:body, :headers)).
+                        with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body, :headers)).
                         once.
                         and_call_original
 
@@ -42,7 +42,7 @@ describe LogStash::Outputs::HoneycombJSONBatch do
 
   it "should attach the right headers for Honeycomb ingestion" do
     expect(client).to receive(:post).
-                        with("#{ api_host }/1/batch", hash_including(:headers => {
+                        with("#{ api_host }/1/batch/#{DATASET}", hash_including(:headers => {
                           "Content-Type" => "application/json",
                           "X-Honeycomb-Team" => WRITE_KEY,
                           "X-Plugin-Version" => LogStash::Outputs::HoneycombJSONBatch::VERSION
@@ -56,9 +56,9 @@ describe LogStash::Outputs::HoneycombJSONBatch do
     data = event.to_hash()
     data.delete("@timestamp")
     expect(client).to receive(:post).
-                        with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
-                          DATASET => [ { "time" => event.timestamp.to_s, "data" => data } ]
-                        }))).once.
+                        with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
+                          [ { "time" => event.timestamp.to_s, "data" => data } ]
+                        ))).once.
                         and_call_original
     @honeycomb.multi_receive([event])
   end
@@ -71,9 +71,9 @@ describe LogStash::Outputs::HoneycombJSONBatch do
     data.delete("@samplerate")
 
     expect(client).to receive(:post).
-                        with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
-                          DATASET => [ { "time" => with_samplerate.timestamp.to_s, "data" => data, "samplerate" => 17 } ]
-                        }))).once.
+                        with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
+                          [ { "time" => with_samplerate.timestamp.to_s, "data" => data, "samplerate" => 17 } ]
+                        ))).once.
                         and_call_original
 
     @honeycomb.multi_receive([with_samplerate])
@@ -85,13 +85,13 @@ describe LogStash::Outputs::HoneycombJSONBatch do
     event3 = LogStash::Event.new("gamma" => 3.0)
 
     expect(client).to receive(:post).
-                        with("#{ api_host }/1/batch", hash_including(:body => LogStash::Json.dump({
-                          DATASET => [
+                        with("#{ api_host }/1/batch/#{DATASET}", hash_including(:body => LogStash::Json.dump(
+                          [
                             { "time" => event1.timestamp.to_s, "data" => { "alpha" => 1.0, "@version" => "1" } },
                             { "time" => event2.timestamp.to_s, "data" => { "@version" => "1", "beta" => 2.0 } },
                             { "time" => event3.timestamp.to_s, "data" => { "@version" => "1", "gamma" => 3.0 } }
                           ]
-                        }))).once.
+                        ))).once.
                         and_call_original
 
     @honeycomb.multi_receive([event1, event2, event3])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-honeycomb_json_batch
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Honeycomb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api