fluentd 1.18.0 → 1.19.1

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -200,6 +199,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: zstd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: async-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.86'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.86'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -389,19 +436,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: async-http
+  name: console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '1.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '1.30'
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
@@ -463,6 +510,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".deepsource.toml"
+- ".rubocop.yml"
 - ADOPTERS.md
 - AUTHORS
 - CHANGELOG.md
@@ -712,9 +760,6 @@ files:
 - lib/fluent/plugin_helper/formatter.rb
 - lib/fluent/plugin_helper/http_server.rb
 - lib/fluent/plugin_helper/http_server/app.rb
-- lib/fluent/plugin_helper/http_server/compat/server.rb
-- lib/fluent/plugin_helper/http_server/compat/ssl_context_extractor.rb
-- lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb
 - lib/fluent/plugin_helper/http_server/methods.rb
 - lib/fluent/plugin_helper/http_server/request.rb
 - lib/fluent/plugin_helper/http_server/router.rb
@@ -797,8 +842,11 @@ files:
 homepage: https://www.fluentd.org/
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://www.fluentd.org/
+  source_code_uri: https://github.com/fluent/fluentd
+  changelog_uri: https://github.com/fluent/fluentd/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/fluent/fluentd/issues
 rdoc_options: []
 require_paths:
 - lib
@@ -806,15 +854,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Fluentd event collector
 test_files: []

data/lib/fluent/plugin_helper/http_server/compat/server.rb

@@ -1,92 +0,0 @@
-#
-# Fluentd
-#
-#    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.
-#
-
-require 'fluent/plugin_helper/http_server/methods'
-require 'fluent/plugin_helper/http_server/compat/webrick_handler'
-require 'fluent/plugin_helper/http_server/compat/ssl_context_extractor'
-
-module Fluent
-  module PluginHelper
-    module HttpServer
-      module Compat
-        class Server
-          # @param logger [Logger]
-          # @param default_app [Object] ignored option. only for compat
-          # @param tls_context [OpenSSL::SSL::SSLContext]
-          def initialize(addr:, port:, logger:, default_app: nil, tls_context: nil)
-            @addr = addr
-            @port = port
-            @logger = logger
-
-            config = {
-              BindAddress: @addr,
-              Port: @port,
-              Logger: WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
-              AccessLog: [],
-            }
-            if tls_context
-              require 'webrick/https'
-              @logger.warn('Webrick ignores given TLS version')
-              tls_opt = Fluent::PluginHelper::HttpServer::Compat::SSLContextExtractor.extract(tls_context)
-              config = tls_opt.merge(**config)
-            end
-
-            @server = WEBrick::HTTPServer.new(config)
-
-            # @example ["/example.json", :get, handler object]
-            @methods = []
-
-            if block_given?
-              yield(self)
-            end
-          end
-
-          def start(notify = nil)
-            build_handler
-            notify.push(:ready)
-            @logger.debug('Start webrick HTTP server listening')
-            @server.start
-          end
-
-          def stop
-            @server.shutdown
-            @server.stop
-          end
-
-          HttpServer::Methods::ALL.map { |e| e.downcase.to_sym }.each do |name|
-            define_method(name) do |path, app = nil, &block|
-              if (block && app) || (!block && !app)
-                raise 'You must specify either app or block in the same time'
-              end
-
-              # Do not build a handler class here to able to handle multiple methods for single path.
-              @methods << [path, name, app || block]
-            end
-          end
-
-          private
-
-          def build_handler
-            @methods.group_by(&:first).each do |(path, rest)|
-              klass = Fluent::PluginHelper::HttpServer::Compat::WebrickHandler.build(**Hash[rest.map { |e| [e[1], e[2]] }])
-              @server.mount(path, klass)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fluent/plugin_helper/http_server/compat/ssl_context_extractor.rb

@@ -1,52 +0,0 @@
-#
-# Fluentd
-#
-#    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.
-#
-
-module Fluent
-  module PluginHelper
-    module HttpServer
-      module Compat
-        # This class converts OpenSSL::SSL::SSLContext to Webrick SSL Config because webrick does not have interface to pass OpenSSL::SSL::SSLContext directory
-        # https://github.com/ruby/webrick/blob/v1.6.0/lib/webrick/ssl.rb#L67-L88
-        class SSLContextExtractor
-
-          #
-          # memo: https://github.com/ruby/webrick/blob/v1.6.0/lib/webrick/ssl.rb#L180-L205
-          # @param ctx [OpenSSL::SSL::SSLContext]
-          def self.extract(ctx)
-            {
-              SSLEnable: true,
-              SSLPrivateKey: ctx.key,
-              SSLCertificate: ctx.cert,
-              SSLClientCA: ctx.client_ca,
-              SSLExtraChainCert: ctx.extra_chain_cert,
-              SSLCACertificateFile: ctx.ca_file,
-              SSLCACertificatePath: ctx.ca_path,
-              SSLCertificateStore: ctx.cert_store,
-              SSLTmpDhCallback: ctx.tmp_dh_callback,
-              SSLVerifyClient: ctx.verify_mode,
-              SSLVerifyDepth: ctx.verify_depth,
-              SSLVerifyCallback: ctx.verify_callback,
-              SSLServerNameCallback: ctx.servername_cb,
-              SSLTimeout: ctx.timeout,
-              SSLOptions: ctx.options,
-              SSLCiphers: ctx.ciphers,
-            }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fluent/plugin_helper/http_server/compat/webrick_handler.rb

@@ -1,58 +0,0 @@
-#
-# Fluentd
-#
-#    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.
-#
-
-require 'webrick'
-require 'json'
-
-module Fluent
-  module PluginHelper
-    module HttpServer
-      module Compat
-        class WebrickHandler
-          # **opt is enough. but I wrote a signature explicitly for readability
-          def self.build(get: nil, head: nil, post: nil, put: nil, patch: nil, delete: nil, connect: nil, options: nil, trace: nil)
-            opt = { get: get, head: head, post: post, put: put, patch: patch, delete: delete, connect: connect, options: options, trace: trace }
-
-            Class.new(WEBrick::HTTPServlet::AbstractServlet) do
-              HttpServer::Methods::ALL.each do |name|
-                define_method("do_#{name}") do |request, response|
-                  code, headers, body =
-                                 if request.path_info != ''
-                                   render_json(404, 'message' => 'Not found')
-                                 else
-                                   begin
-                                     opt[name.downcase.to_sym].call(request)
-                                   rescue => _
-                                     render_json(500, 'message' => 'Something went wrong')
-                                   end
-                                 end
-
-                  response.status = code
-                  headers.each { |k, v| response[k] = v }
-                  response.body = body
-                end
-              end
-
-              def render_json(code, obj)
-                [code, { 'Content-Type' => 'application/json' }, obj.to_json]
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end