fluent-plugin-out-http 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad31d6d8e6d5c91ed3d8de4001209423ac88ab0b4874ff20ca2ad6fc4da1eb61
-  data.tar.gz: 5b51d999c640acc0e8bdae3dc4f057648ccbb76bcc79e8b10d96dfacf5ea7c8f
+  metadata.gz: fc6b6a32252a6bd023ff50a7785ad1c761f0e0de88fd791cf80a03b4e03313c3
+  data.tar.gz: 35f04c05e359cc78d9a2305a8b157439c930254d23ad032c5a57496506d21a84
 SHA512:
-  metadata.gz: c26560e9256fdd166b1a909b5b166c5fe5a7d14f5b9ebc01c8a125bd74c6feb859ee744853a3e3925e7ad6e58175c3be7e45d991eca54716f1a62d10981fad5b
-  data.tar.gz: acb1c8e0131912640da47d2e632f91cd7c4986327878a60ea224905c52eb4d545e5e1d8cab6c2abe22a3030764733d9dba22ba6443845319c4850f7bf150407b
+  metadata.gz: 14be9f2277907f3cf48a5388568b80a4a91f5daa6a0af8e0b24fd19510fdf0c0bad5c51dcc6338a2a61058907bffa9c5c95bf333a15d6a7ef5bc99a955c7e051
+  data.tar.gz: 27ae799e130b2469947cee7f603477fba5fdd80cffa5041929cb7bfaa4948ce656d90cd349ccdf8884c8616758f79b2263e158b00dc8831a926462e8ce5757b2

data/.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Test
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '3.0', '3.1' ]
+        os:
+          - ubuntu-latest
+          - macOS-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: unit testing
+        run: |
+          bundle exec rake test
+
+  gem:
+    name: Gem test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+      - name: Install
+        run: |
+          rake install
+          gem install test-unit webrick
+      - name: Test
+        run: |
+          mkdir -p tmp
+          cd tmp
+          cp -a ../test/ ./
+          ../run_test.rb

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## 1.3.4
+* Add debug log about chunk writing
+* Tweak CI
+
+## 1.3.3
+* Revert x-ndjson format payload behavior
 
 ## 1.3.2
 * Fix invalid x-ndjson payload format

data/README.md

@@ -2,8 +2,38 @@
 
 A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint.
 
+**NOTE:** This plugin name is overlapped from Fluentd core plugin which name is `out_http`. But core plugin does not provide buffered/non-buffered switch and batch/non-batch request switch. If you want to use these switch features. Please consider to use this plugin.
+
 [![Build Status](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-out-http.svg?branch=master)](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-out-http)
 
+## Installation
+
+### For bundler
+
+Write the following line in Gemfile:
+
+```gemfile
+gem "fluent-plugin-out-http"
+```
+
+and then,
+
+```console
+$ bundle install
+```
+
+### for fluentd
+
+```console
+$ fluent-gem install fluent-plugin-out-http
+```
+
+### For td-agent
+
+```console
+$ td-agent-gem install fluent-plugin-out-http
+```
+
 ## Configuration options
 
     <match *>
@@ -45,3 +75,11 @@ Heavily based on [fluent-plugin-growthforecast][2]
   [1]: http://fluentd.org/
   [2]: https://github.com/tagomoris/fluent-plugin-growthforecast
   [3]: https://github.com/sabottenda/fluent-plugin-bufferize
+
+## How to release
+
+1. Update `gem.version` of the `gemspec` file.
+1. Update `CHANGELOG.md`.
+1. Commit them.
+1. `$ bundle exec rake release`
+    * It will add and push the tag, and publish the gem.

data/fluent-plugin-out-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http"
-  gem.version       = "1.3.2"
+  gem.version       = "1.3.4"
   gem.authors       = ["Marica Odagaki"]
   gem.email         = ["ento.entotto@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint}
@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit", ">= 3.1.0"
+  gem.add_development_dependency "webrick"
 end

data/lib/fluent/plugin/out_http.rb

@@ -174,7 +174,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   end
 
   def set_bulk_body(req, data)
-    req.body = Yajl.dump(data)
+    req.body = data.to_s
     req['Content-Type'] = 'application/x-ndjson'
     compress_body(req, req.body)
   end
@@ -302,6 +302,9 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   def write(chunk)
     tag = chunk.metadata.tag
     @endpoint_url = extract_placeholders(@endpoint_url, chunk)
+
+    log.debug { "#{@http_method.capitalize} data to #{@endpoint_url} with chunk(#{dump_unique_id_hex(chunk.unique_id)})" }
+
     if @bulk_request
       time = Fluent::Engine.now
       handle_records(tag, time, chunk)

data/run_test.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+Dir.glob("test/**/test_*.rb") do |test_rb|
+  require File.expand_path(test_rb)
+end

data/test/plugin/test_out_http.rb

@@ -471,21 +471,21 @@ class HTTPOutputTest < HTTPOutputTestBase
       assert_equal 1, @posts.size
       record = @posts[0]
 
-      expected = [
-        Yajl.dump({
+      expected =[
+        {
+          "binary"     => "\u3042",
           "field1"     => 50,
           "field2"     => 20,
           "field3"     => 10,
-          "otherfield" => 1,
+          "otherfield" => 1
+        },
+        {
           "binary"     => "\u3042",
-        }) + "\n" +
-        Yajl.dump({
           "field1"     => 70,
           "field2"     => 30,
           "field3"     => 20,
-          "otherfield" => 2,
-          "binary"     => "\u3042",
-        }) + "\n"
+          "otherfield" => 2
+        }
       ]
 
       assert_equal expected, record[:x_ndjson]
@@ -503,21 +503,21 @@ class HTTPOutputTest < HTTPOutputTestBase
       assert_equal 1, @posts.size
       record = @posts[0]
 
-      expected = [
-        Yajl.dump({
+      expected =[
+        {
+          "binary"     => "\u3042",
           "field1"     => 50,
           "field2"     => 20,
           "field3"     => 10,
-          "otherfield" => 1,
+          "otherfield" => 1
+        },
+        {
           "binary"     => "\u3042",
-        }) + "\n" +
-        Yajl.dump({
           "field1"     => 70,
           "field2"     => 30,
           "field3"     => 20,
-          "otherfield" => 2,
-          "binary"     => "\u3042",
-        }) + "\n"
+          "otherfield" => 2
+        }
       ]
 
       assert_equal expected, record[:x_ndjson]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Marica Odagaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A generic Fluentd output plugin to send logs to an HTTP endpoint
 email:
 - ento.entotto@gmail.com
@@ -93,8 +107,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - ISSUE_TEMPLATE.md
@@ -104,6 +118,7 @@ files:
 - fluent-plugin-out-http.gemspec
 - lib/fluent/plugin/out_http.rb
 - lib/fluent/test/http_output_test.rb
+- run_test.rb
 - test/plugin/script/plugin/formatter_test.rb
 - test/plugin/test_out_http.rb
 homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-out-http
@@ -125,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A generic Fluentd output plugin to send logs to an HTTP endpoint

data/.travis.yml

@@ -1,25 +0,0 @@
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
-  - ruby-head
-
-os:
-  - linux
-  - osx
-
-dist: trusty
-
-gemfile:
-  - Gemfile
-
-before_install:
-  - gem update --system=2.7.8
-
-script: bundle exec rake test
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head