fluent-plugin-formatter-protobuf 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e212013e4ca4c6d50c19b1d2296e06626750039cb0b22f80ea255be37cd4d9f
-  data.tar.gz: 30a007dba4d306d022d45cd5cc7230b7c3b9ba3edbb512b9e3924407588af03c
+  metadata.gz: ab1edaa0c55c3e7c3174c18c682aa96a6a07056d6017dc5180cea1c988a03189
+  data.tar.gz: 8a10cffebdd8e605465f61ba8e30dbcf6da7b332ecb44f8bd08b60cf2dbf4539
 SHA512:
-  metadata.gz: e3c804a6a7cf38e50fb273e17437c7b14a57351f7e63483a24873b82c78adc7307de33f17c1f33504ac361a9b5b32488aabfcabb157b26c5214a9851f054d234
-  data.tar.gz: 21adce1af4c987ddb7b3fbde52e3599cb98a925656550627ae625a8c962c88d67122db3ca55ba0c22a8875e86e7d8b9d6f49dc1d87acf311f6f380eec9c3aad0
+  metadata.gz: 6d0a30cb1342b7fdcbe7057d223dacd150dba565d11c29ff2b4395fb35347e76f21463d23af5bbbe6b27882cbbd700ee4b1e5a5eb82d153093c37be812428752
+  data.tar.gz: 9865e62b40999dcbfcb82d30ab2363f8f704d2f0b8f07612f42165b633da83b3f2adc6df1a948321d75e182fa16abbb0b610da9dbba81a9f5a089376488e0ac9

data/.github/workflows/build-and-test.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,49 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '18 11 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -42,7 +42,7 @@ jobs:
     needs:
       - lint
       - test
-    name: Build + Publish
+    name: Build + Publish to GPR
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -67,22 +67,11 @@ jobs:
           GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
           OWNER: ${{ github.repository_owner }}
 
-      - name: Publish to RubyGems
-        run: |
-          mkdir -p $HOME/.gem
-          touch $HOME/.gem/credentials
-          chmod 0600 $HOME/.gem/credentials
-          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-          gem build *.gemspec
-          gem push *.gem
-        env:
-          GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-
   publish-to-ruby-gems:
     needs:
       - lint
       - test
-    name: Build + Publish
+    name: Build + Publish to RubyGems
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -90,7 +79,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 2.5
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

data/.gitignore

@@ -1 +1,2 @@
-*.gem
+*.gem
+Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.5.0

data/README.md

@@ -8,16 +8,33 @@
 
 ### RubyGems
 
-```
+```shell
 $ gem install fluent-plugin-formatter-protobuf
 ```
 
-### Bundler
+### GitHub RubyGems Registry
+
+```shell
+$ gem install \
+  fluent-plugin-formatter-protobuf \
+  --version "<version>" \
+  --source "https://rubygems.pkg.github.com/fluent-plugins-nursery"
+```
+
+### Bundler (RubyGems)
 
 Add following line to your Gemfile:
 
 ```ruby
-gem "fluent-plugin-formatter-protobuf"
+gem "fluent-plugin-formatter-protobuf", "<version>"
+```
+
+### Bundler (GitHub RubyGems Registry),
+
+```shell
+source "https://rubygems.pkg.github.com/fluent-plugins-nursery" do
+  gem "fluent-plugin-formatter-protobuf", "<version>"
+end
 ```
 
 And then execute:
@@ -26,16 +43,20 @@ And then execute:
 $ bundle
 ```
 
-## Not so quick start
+## Quick start
 
 1. Generate the protobuf ruby methods
    1. e.g `protoc --proto_path=. --ruby_out=. ./log.proto`
-2. Modify the `<format>` section to include `message_name`, which is your Protobuf message name, and `include_paths`, the path where the generated Ruby types are stored
+2. Modify the `<format>` section to include `class_name`, which is your Protobuf message name, and `include_paths`, the path where the generated Ruby types are stored
+   1. Given protobuf class `Your::Protobuf::Class::Name` class should be given as `Your.Protobuf.Class.Name` in `class_name`. The exact name can be found in the generated Ruby files
+
+## Note
 
+This plugin only supports Protobuf v3.
 
 ## Example
 
-```fluentd
+```aconf
 <source>
     @type tcp
     tag tcp.events
@@ -47,17 +68,19 @@ $ bundle
 </source>
 
 <match tcp.events>
-    @type file
-
-    path /opt/fluent-plugin-formatter-protobuf/out
+    @type kafka2
+    
+    brokers "#{BROKER_ENDPOINTS}"
+    compression_codec lz4
 
-    <buffer>
+    <buffer topic>
         @type memory
+        flush_interval 5s
     </buffer>
 
     <format>
         @type protobuf
-        message_name "Log"
+        class_name "Log"
         include_paths ["/opt/fluent-plugin-formatter-protobuf/log_pb.rb"]
     </format>
 </match>
@@ -65,16 +88,54 @@ $ bundle
 
 ## Configuration
 
-You can generate configuration template:
+|parameter| type               | description                                                                                                                                                                                                                                                                 | default   |
+|---|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|
+|class_name| string (required)  | Ruby Protobuf class name. Used to encode into Protobuf binary                                                                                                                                                                                                               ||
+|decode_json| boolean (optional) | Serializes record from canonical proto3 JSON mapping (https://developers.google.com/protocol-buffers/docs/proto3#json) into binary                                                                                                                                          | `false`   |
+|include_paths| array (required)   | Generated Ruby Protobuf class files path                                                                                                                                                                                                                                    | `[]`      |
+|require_method| string (optional)  | Determine how to bring the generated Ruby Protobuf class files into scope. If your generated Ruby Protobuf class files are provided by a Ruby Gem, you may want to use 'require'. If you are providing the generated files as files, you may want to use 'require_relative' | `require` |
+
+## Tips
+
+#### 1. I have multiple `_pb.rb` files and they depend on one another. When I use this plugin, I'm getting a `LoadError`.
+
+This happens because the plugin currently loads paths in `include_paths` sequentially. You can either sort the files in correct dependency order (which is cumbersome), or add to Ruby's `$LOAD_PATH`.
+
+For example, you have 2 generated ruby files, `a_pb.rb` and `b_pb.rb`, and both `a_pb.rb` depends on `b_pb.rb`.
+
+You can either order them in appropriate dependency order, such as
+
+```aconf
+<format>
+  @type protobuf
+  class_name "SomePackage.A"
+  include_paths ["/some/path/b_pb.rb", "/some/path/a_pb.rb"]
+</format>
 
 ```
-$ fluent-plugin-config-format formatter formatter-protobuf
+
+or you can put the generated files in a directory say `/some/path/`, and add to Ruby's `$LOAD_PATH` via the `RUBYLIB` environment variable.
+
+e.g.
+
+```aconf
+<format>
+  @type protobuf
+  class_name "SomePackage.A"
+  include_paths ["/some/path/a_pb.rb"]
+</format>
+
 ```
 
-You can copy and paste generated documents here.
+```shell
+
+export RUBYLIB="${RUBYLIB}:/some/path/"
+fluentd \
+  --gemfile "/some/other/path/Gemfile" \
+  --config "/some/other/path/fluent.conf"
+
+```
 
-## Copyright
+## License
 
-* Copyright(c) 2021 - Ray Tung
-* License
-  * Apache License, Version 2.0
+[Apache License, Version 2.0](./LICENSE)

data/RELEASE.md

@@ -3,7 +3,7 @@
 ## Instructions
 To release the gem to Github package manager and Ruby Gems,
 
-1. Update `lib/fluent/version.rb`
-2. Update `Gemfile.lock`
-3. Create a pull request and merge it into `main`
-4. Manually creating a release on Github with a tag indicating the new version number e.g. `vMAJOR.MINOR.PATCH`
+1. Update `lib/fluent/plugin/version.rb`
+2. Create a pull request and merge it into `main`
+3. Manually creating a release on Github with a tag indicating the new version number e.g. `vMAJOR.MINOR.PATCH`
+4. GitHub Actions will automatically run and publish to RubyGems and GitHub repository

data/fluent-plugin-formatter-protobuf.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |spec|
   spec.version = Fluent::Plugin::VERSION
   spec.authors = ['Ray Tung']
   spec.email = ['code@raytung.net']
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.summary = 'Protobuf formatter for Fluentd'
   spec.description = 'This is a Fluentd formatter plugin designed to convert Protobuf JSON into Protobuf binary'
   spec.homepage = 'https://github.com/raytung/fluent-plugin-formatter-protobuf'
   spec.license = 'Apache-2.0'
-  spec.required_ruby_version = Gem::Requirement.new('>=2.7.1')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/raytung/fluent-plugin-formatter-protobuf'
@@ -28,11 +29,12 @@ Gem::Specification.new do |spec|
   spec.test_files = test_files
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.2.22'
-  spec.add_development_dependency 'rake', '~> 13.0.3'
-  spec.add_development_dependency 'rubocop', '~> 1.22.1'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  spec.add_development_dependency 'test-unit', '~> 3.3.7'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 1.22'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6'
+  spec.add_development_dependency 'test-unit', '~> 3.3'
   spec.add_runtime_dependency 'fluentd', ['>= 1.0', '< 2']
   spec.add_runtime_dependency 'google-protobuf', ['~> 3.18']
+  spec.add_runtime_dependency 'oj', '~> 3.13'
 end

data/lib/fluent/plugin/formatter_protobuf.rb

@@ -22,6 +22,7 @@ require 'google/protobuf'
 
 require 'fluent/env'
 require 'fluent/time'
+require 'oj'
 
 module Fluent
   module Plugin
@@ -29,11 +30,30 @@ module Fluent
     class ProtobufFormatter < Fluent::Plugin::Formatter
       Fluent::Plugin.register_formatter('protobuf', self)
 
-      # Absolute paths to the generated Ruby protobuf files
-      config_param :include_paths, :array, default: []
-
-      # Protobuf message name
-      config_param :message_name, :string
+      config_param :class_name,
+                   :string,
+                   desc: 'Ruby Protobuf class name. Used to encode into Protobuf binary'
+
+      config_param :decode_json,
+                   :bool,
+                   default: false,
+                   desc: <<~DESC
+                     Serializes record from canonical proto3 JSON mapping (https://developers.google.com/protocol-buffers/docs/proto3#json) into binary'
+                   DESC
+
+      config_param :include_paths,
+                   :array,
+                   default: [],
+                   desc: 'Generated Ruby Protobuf class files path'
+
+      config_param :require_method,
+                   :string,
+                   default: 'require',
+                   desc: <<~DESC
+                     Determine how to bring the generated Ruby Protobuf class files into scope. If your generated Ruby Protobuf class files
+                     are provided by a Ruby Gem, you would want to use \'require\'. If you are providing the generated files as files, you
+                     may want to use \'require_relative\''
+                   DESC
 
       def configure(conf)
         super(conf)
@@ -42,10 +62,10 @@ module Fluent
 
         @include_paths.each { |path| require_proto!(path) } unless @include_paths.empty?
 
-        message_lookup = Google::Protobuf::DescriptorPool.generated_pool.lookup(@message_name)
-        raise Fluent::ConfigError, "message name '#{@message_name}' not found" if message_lookup.nil?
+        class_lookup = Google::Protobuf::DescriptorPool.generated_pool.lookup(@class_name)
+        raise Fluent::ConfigError, "class name '#{@class_name}' not found" if class_lookup.nil?
 
-        @protobuf_class = message_lookup.msgclass
+        @protobuf_class = class_lookup.msgclass
       end
 
       def formatter_type
@@ -53,26 +73,14 @@ module Fluent
       end
 
       def format(_tag, _time, record)
-        protobuf_msg = @protobuf_class.new(record)
+        protobuf_msg = @decode_json ? @protobuf_class.decode_json(Oj.dump(record)) : @protobuf_class.new(record)
         @protobuf_class.encode(protobuf_msg)
       end
 
-      # @param [string] filename
-      # @return [void]
       def require_proto!(filename)
-        unless filename.end_with?('.rb')
-          raise Fluent::ConfigError, "Unable to load file '#{filename}'. It is not a Ruby file"
-        end
-
-        unless Pathname.new(filename).absolute?
-          raise Fluent::ConfigError, "Unable to load file '#{filename}'. Please provide absolute paths"
-        end
-
-        begin
-          require filename
-        rescue LoadError => e
-          raise Fluent::ConfigError, "Unable to load file '#{filename}'. Reason: #{e.inspect}"
-        end
+        Kernel.method(@require_method.to_sym).call(filename)
+      rescue LoadError => e
+        raise Fluent::ConfigError, "Unable to load file '#{filename}'. Reason: #{e.message}"
       end
     end
   end

data/lib/fluent/plugin/version.rb

@@ -2,6 +2,6 @@
 
 module Fluent
   module Plugin
-    VERSION = '0.0.4'
+    VERSION = '0.2.0'
   end
 end

data/test/integration/Gemfile

@@ -2,5 +2,5 @@
 
 source 'https://rubygems.org'
 
-gem 'fluentd', '1.14.1'
-gem 'fluent-plugin-formatter-protobuf', '0.0.3'
+gem 'fluentd', '1.14.2'
+gem 'fluent-plugin-formatter-protobuf', '0.1.0'

data/test/integration/Gemfile.lock

@@ -3,23 +3,23 @@ GEM
   specs:
     concurrent-ruby (1.1.9)
     cool.io (1.7.1)
-    fluent-plugin-formatter-protobuf (0.0.3)
+    fluent-plugin-formatter-protobuf (0.1.0)
       fluentd (>= 1.0, < 2)
       google-protobuf (~> 3.18)
-    fluentd (1.14.1)
+    fluentd (1.14.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
+      strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
-    google-protobuf (3.18.1)
-    google-protobuf (3.18.1-x86_64-linux)
+    google-protobuf (3.19.1)
+    google-protobuf (3.19.1-x86_64-linux)
     http_parser.rb (0.7.0)
     msgpack (1.4.2)
     serverengine (2.2.4)
@@ -28,7 +28,7 @@ GEM
     strptime (0.2.5)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.3)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     webrick (1.7.0)
     yajl-ruby (1.4.1)
@@ -38,8 +38,8 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  fluent-plugin-formatter-protobuf (= 0.0.3)
-  fluentd (= 1.14.1)
+  fluent-plugin-formatter-protobuf (= 0.1.0)
+  fluentd (= 1.14.2)
 
 BUNDLED WITH
    2.2.29

data/test/integration/fluent.conf

@@ -19,7 +19,7 @@
 
     <format>
         @type protobuf
-        message_name "Log"
+        class_name "Log"
         include_paths ["/opt/fluent-plugin-formatter-protobuf/log_pb.rb"]
     </format>
 </match>

data/test/plugin/test_formatter_protobuf.rb

@@ -8,38 +8,94 @@ class ProtobufFormatterTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
-  VALID_INCLUDE_PATHS = [File.expand_path(File.join(__dir__, '..', 'proto', 'addressbook_pb.rb'))].freeze
+  VALID_INCLUDE_PATHS_ABSOLUTE = [File.expand_path(File.join(__dir__, '..', 'proto', 'addressbook_pb.rb'))].freeze
 
+  # Relative to the plugin file
+  VALID_INCLUDE_PATHS_RELATIVE = '../../../test/proto/addressbook_pb.rb'
+
+  # rubocop:disable Metrics/BlockLength
   sub_test_case 'configure' do
     test 'fail if include_paths is empty' do
       assert_raise(Fluent::ConfigError) do
-        create_driver({ message_name: '', include_paths: [] })
+        create_driver({ class_name: '', include_paths: [] })
+      end
+    end
+
+    test 'fail if ruby files not found in the provided include paths' do
+      assert_raise(Fluent::ConfigError) do
+        create_driver({ class_name: 'tutorial.AddressBook', include_paths: ['some/random/path'] })
       end
     end
 
-    test 'fail if no protobuf class can be found with message_name' do
+    test 'fail if no protobuf class can be found with class_name' do
       assert_raise(Fluent::ConfigError) do
-        create_driver({ message_name: 'Some.Name', include_paths: VALID_INCLUDE_PATHS })
+        create_driver({ class_name: 'Some.Name', include_paths: VALID_INCLUDE_PATHS_ABSOLUTE })
+      end
+    end
+
+    test 'success if given valid relative paths in include paths' do
+      assert_nothing_raised do
+        create_driver({
+                        class_name: 'tutorial.AddressBook',
+                        include_paths: [VALID_INCLUDE_PATHS_RELATIVE],
+                        require_method: 'require_relative'
+                      })
       end
     end
 
     test 'passes on valid configuration' do
       assert_nothing_raised do
-        create_driver({ message_name: 'tutorial.AddressBook', include_paths: VALID_INCLUDE_PATHS })
+        create_driver({ class_name: 'tutorial.AddressBook', include_paths: VALID_INCLUDE_PATHS_ABSOLUTE })
       end
     end
   end
+  # rubocop:enable Metrics/BlockLength
 
+  stub_ruby_hash = { people: [{ name: 'Masahiro', id: 1337,
+                                email: 'repeatedly _at_ gmail.com',
+                                last_updated: {
+                                  seconds: 1_638_489_505,
+                                  nanos: 318_000_000
+                                } }] }
+  # rubocop:disable Metrics/BlockLength
   sub_test_case 'format' do
     test 'encodes into Protobuf binary' do
-      formatter = create_formatter({ message_name: 'tutorial.AddressBook', include_paths: VALID_INCLUDE_PATHS })
+      formatter = create_formatter({ class_name: 'tutorial.AddressBook',
+                                     include_paths: VALID_INCLUDE_PATHS_ABSOLUTE })
+
+      formatted = formatter.format('some-tag', 1234,
+                                   { people: [{ name: 'Masahiro', id: 1337, email: 'repeatedly _at_ gmail.com',
+                                                last_updated: { seconds: 1_638_489_505, nanos: 318_000_000 } }] })
+      address_book = Tutorial::AddressBook.new(stub_ruby_hash)
+      assert_equal(Tutorial::AddressBook.encode(address_book), formatted)
+    end
+
+    test 'encodes Protobuf JSON format into Protobuf binary if config_param decode_json is true' do
+      formatter = create_formatter({ class_name: 'tutorial.AddressBook',
+                                     decode_json: true,
+                                     include_paths: VALID_INCLUDE_PATHS_ABSOLUTE })
 
       formatted = formatter.format('some-tag', 1234,
-                                   { people: [{ name: 'Masahiro', id: 1337, email: 'repeatedly _at_ gmail.com' }] })
-      golden_file = File.binread(File.expand_path(File.join(__dir__, '..', 'proto', 'addressbook.bin')))
-      assert_equal(golden_file, formatted)
+                                   { people: [{ name: 'Masahiro', id: 1337, email: 'repeatedly _at_ gmail.com',
+                                                last_updated: '2021-12-02T23:58:25.318Z' }] })
+
+      address_book = Tutorial::AddressBook.new(stub_ruby_hash)
+      assert_equal(Tutorial::AddressBook.encode(address_book), formatted)
+    end
+
+    test 'encodes Ruby hash into Protobuf binary if generated files are provided by a Gem' do
+      formatter = create_formatter({
+                                     class_name: 'google.protobuf.Duration',
+                                     # Provided by the google-protobuf gem
+                                     include_paths: ['google/protobuf/duration_pb'],
+                                     require_method: 'require'
+                                   })
+      formatted = formatter.format('some-tag', 1234, { seconds: 1, nanos: 340_012 })
+      duration = Google::Protobuf::Duration.new({ seconds: 1, nanos: 340_012 })
+      assert_equal(Google::Protobuf::Duration.encode(duration), formatted)
     end
   end
+  # rubocop:enable Metrics/BlockLength
 
   private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-formatter-protobuf
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ray Tung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-16 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.1
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.18'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: This is a Fluentd formatter plugin designed to convert Protobuf JSON
   into Protobuf binary
 email:
@@ -123,12 +137,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/build-and-test.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - RELEASE.md
@@ -148,14 +162,13 @@ files:
 - test/integration/run.sh
 - test/plugin/test_formatter_protobuf.rb
 - test/proto/README.md
-- test/proto/addressbook
-- test/proto/addressbook.bin
 - test/proto/addressbook.proto
 - test/proto/addressbook_pb.rb
 homepage: https://github.com/raytung/fluent-plugin-formatter-protobuf
 licenses:
 - Apache-2.0
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/raytung/fluent-plugin-formatter-protobuf
   source_code_uri: https://github.com/raytung/fluent-plugin-formatter-protobuf
   changelog_uri: https://github.com/raytung/fluent-plugin-formatter-protobuf/blob/main/CHANGELOG.md
@@ -167,14 +180,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.1
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Protobuf formatter for Fluentd
@@ -189,7 +203,5 @@ test_files:
 - test/integration/run.sh
 - test/plugin/test_formatter_protobuf.rb
 - test/proto/README.md
-- test/proto/addressbook
-- test/proto/addressbook.bin
 - test/proto/addressbook.proto
 - test/proto/addressbook_pb.rb

data/Gemfile.lock

@@ -1,77 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-formatter-protobuf (0.0.4)
-      fluentd (>= 1.0, < 2)
-      google-protobuf (~> 3.18)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    concurrent-ruby (1.1.9)
-    cool.io (1.7.1)
-    fluentd (1.14.1)
-      bundler
-      cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.8.0)
-      msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.2.2, < 3.0.0)
-      sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (>= 1.0, < 3.0)
-      tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
-      yajl-ruby (~> 1.0)
-    google-protobuf (3.18.1-x86_64-linux)
-    http_parser.rb (0.7.0)
-    msgpack (1.4.2)
-    parallel (1.21.0)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    power_assert (2.0.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.22.1)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
-    serverengine (2.2.4)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    strptime (0.2.5)
-    test-unit (3.3.9)
-      power_assert
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.3)
-      tzinfo (>= 1.0.0)
-    unicode-display_width (2.1.0)
-    webrick (1.7.0)
-    yajl-ruby (1.4.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  bundler (~> 2.2.22)
-  fluent-plugin-formatter-protobuf!
-  rake (~> 13.0.3)
-  rubocop (~> 1.22.1)
-  rubocop-rake (~> 0.6.0)
-  test-unit (~> 3.3.7)
-
-BUNDLED WITH
-   2.2.29

data/test/proto/addressbook

@@ -1 +0,0 @@
-people: [{name:"Masahiro", id: 1337, email: "repeatedly _at_ gmail.com"}]

data/test/proto/addressbook.bin

@@ -1,4 +0,0 @@
-
-(
-Masahiro�
-repeatedly _at_ gmail.com