fluent-plugin-kubernetes_metadata_filter 2.13.0 → 3.8.0

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 3.8.0
 platform: ruby
 authors:
 - OpenShift Cluster Logging
 - Jimmi Dyson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -20,7 +19,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +51,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: lru_redux
+  name: sin_lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -65,146 +64,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bump
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: copyright-header
-  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'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: vcr
-  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'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  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: Filter plugin to add Kubernetes metadata
 email:
 - team-logging@redhat.com
@@ -213,52 +72,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- fluent-plugin-kubernetes_metadata_filter.gemspec
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/cpu.png
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/latency.png
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/loss.png
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/mem.png
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/readme.md
+- doc/benchmark/5m-1-2500lps-256b-baseline-01/results.html
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/cpu.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/latency.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/loss.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/mem.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/readme.md
+- doc/benchmark/5m-1-2500lps-256b-kube-01-01/results.html
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/cpu.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/latency.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/loss.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/mem.png
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/readme.md
+- doc/benchmark/5m-1-2500lps-256b-kube-01-marshal-02/results.html
 - lib/fluent/plugin/filter_kubernetes_metadata.rb
 - lib/fluent/plugin/kubernetes_metadata_cache_strategy.rb
 - lib/fluent/plugin/kubernetes_metadata_common.rb
 - lib/fluent/plugin/kubernetes_metadata_stats.rb
 - lib/fluent/plugin/kubernetes_metadata_test_api_adapter.rb
-- lib/fluent/plugin/kubernetes_metadata_util.rb
 - lib/fluent/plugin/kubernetes_metadata_watch_namespaces.rb
 - lib/fluent/plugin/kubernetes_metadata_watch_pods.rb
 - release_notes.md
-- test/cassettes/invalid_api_server_config.yml
-- test/cassettes/kubernetes_docker_metadata_annotations.yml
-- test/cassettes/kubernetes_docker_metadata_dotted_slashed_labels.yml
-- test/cassettes/kubernetes_get_api_v1.yml
-- test/cassettes/kubernetes_get_api_v1_using_token.yml
-- test/cassettes/kubernetes_get_namespace_default.yml
-- test/cassettes/kubernetes_get_namespace_default_using_token.yml
-- test/cassettes/kubernetes_get_pod.yml
-- test/cassettes/kubernetes_get_pod_container_init.yml
-- test/cassettes/kubernetes_get_pod_using_token.yml
-- test/cassettes/metadata_from_tag_and_journald_fields.yml
-- test/cassettes/metadata_from_tag_journald_and_kubernetes_fields.yml
-- test/cassettes/valid_kubernetes_api_server.yml
-- test/cassettes/valid_kubernetes_api_server_using_token.yml
-- test/helper.rb
-- test/plugin/test.token
-- test/plugin/test_cache_stats.rb
-- test/plugin/test_cache_strategy.rb
-- test/plugin/test_filter_kubernetes_metadata.rb
-- test/plugin/test_utils.rb
-- test/plugin/test_watch_namespaces.rb
-- test/plugin/test_watch_pods.rb
-- test/plugin/watch_test.rb
-homepage: https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter
+homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-kubernetes_metadata_filter
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/fluent-plugins-nursery/fluent-plugin-kubernetes_metadata_filter/issues
+  source_code_uri: https://github.com/fluent-plugins-nursery/fluent-plugin-kubernetes_metadata_filter
 rdoc_options: []
 require_paths:
 - lib
@@ -266,15 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata
 test_files: []

data/.circleci/config.yml

@@ -1,53 +0,0 @@
-version: 2.1
-
-install: &install
-  name: Install bundle
-  command: |
-            gem install bundler
-            bundle config set --local path vendor/bundle
-            bundle install
-
-missingdeps: &missingdeps
-  name: Install missing dependecies
-  command: |
-            cat /etc/os-release
-            printf "deb http://deb.debian.org/debian buster main\ndeb http://security.debian.org buster/updates main\ndeb-src http://security.debian.org buster/updates main" > /tmp/sources.list
-            sudo cp /tmp/sources.list /etc/apt/sources.list
-            sudo apt-get --allow-releaseinfo-change update
-            sudo apt-get install cmake libicu-dev libssl-dev
-
-test: &test
-  name: Test bundle
-  command: bundle exec rake test --trace
-
-executors:
-  ruby-2-6:
-    docker:
-      - image: circleci/ruby:2.6.3
-  ruby-2-7:
-    docker:
-      - image: circleci/ruby:2.7.1
-jobs:
-  "ruby-test":
-    parameters:
-      ruby-version:
-        type: executor
-    executor: << parameters.ruby-version >>
-    working_directory: ~/fluent-plugin-kubernetes_metadata_filter
-    steps:
-      - run: *missingdeps
-      - checkout
-      - run: *install
-      - run: *test
-      - store_test_results:
-            path: coverage
-      - store_artifacts:
-            path: coverage
-
-workflows:
-  "test_multiple_ruby_versions":
-    jobs:
-      - ruby-test:
-          ruby-version: ruby-2-6
-      - ruby-test:
-          ruby-version: ruby-2-7

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-vendor/
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea/
-*.iml

data/.rubocop.yml

@@ -1,57 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.5 # keep in sync with .circleci/config.yml and gemspec
-  NewCops: enable
-
-Style/EmptyMethod:
-  Enabled: false
-
-Metrics:
-  Enabled: false
-
-# not safe ... needs require 'English'
-Style/SpecialGlobalVars:
-  Enabled: false
-
-Layout/LineLength:
-  Max: 205 # TODO: lower
-
-Style/Documentation:
-  Enabled: false
-
-Naming/AccessorMethodName:
-  Enabled: false
-
-Naming/MethodParameterName:
-  Enabled: false
-
-Style/IfInsideElse:
-  Enabled: false
-
-Style/GuardClause:
-  Enabled: false
-
-Lint/NestedMethodDefinition:
-  Enabled: false
-
-# TODO: fix
-Style/StringConcatenation:
-  Enabled: false
-
-Style/NumericPredicate:
-  EnforcedStyle: comparison
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# TODO: enable ... somehow breaks tests
-Style/HashEachMethods:
-  Enabled: false
-
-Style/WordArray:
-  EnforcedStyle: brackets
-
-Style/SymbolArray:
-  EnforcedStyle: brackets

data/Gemfile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'codeclimate-test-reporter', '<1.0.0', group: :test, require: nil
-gem 'rubocop'
-
-# Specify your gem's dependencies in fluent-plugin-add.gemspec
-gemspec

data/Gemfile.lock

@@ -1,158 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-kubernetes_metadata_filter (2.13.0)
-      fluentd (>= 0.14.0, < 1.16)
-      kubeclient (>= 4.0.0, < 5.0.0)
-      lru_redux
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    bump (0.10.0)
-    charlock_holmes (0.7.7)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.1.10)
-    cool.io (1.7.1)
-    copyright-header (1.0.22)
-      github-linguist
-    crack (0.4.5)
-      rexml
-    docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    escape_utils (1.2.2)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    fluentd (1.15.0)
-      bundler
-      cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.9.0)
-      msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.0, < 3.0.0)
-      sigdump (~> 0.2.2)
-      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)
-    github-linguist (7.21.0)
-      charlock_holmes (~> 0.7.7)
-      escape_utils (~> 1.2.0)
-      mini_mime (~> 1.0)
-      rugged (~> 1.0)
-    hashdiff (1.0.1)
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.8.0)
-    jsonpath (1.1.2)
-      multi_json
-    kubeclient (4.9.3)
-      http (>= 3.0, < 5.0)
-      jsonpath (~> 1.0)
-      recursive-open-struct (~> 1.1, >= 1.1.1)
-      rest-client (~> 2.0)
-    lru_redux (1.1.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_mime (1.1.2)
-    minitest (4.7.5)
-    msgpack (1.5.3)
-    multi_json (1.15.0)
-    netrc (0.11.0)
-    parallel (1.22.1)
-    parser (3.1.2.0)
-      ast (~> 2.4.1)
-    power_assert (2.0.1)
-    public_suffix (4.0.7)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    recursive-open-struct (1.1.3)
-    regexp_parser (2.5.0)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rexml (3.2.5)
-    rr (3.0.9)
-    rubocop (1.28.2)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    rugged (1.4.3)
-    serverengine (2.3.0)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    strptime (0.2.5)
-    test-unit (3.0.9)
-      power_assert
-    test-unit-rr (1.0.5)
-      rr (>= 1.1.1)
-      test-unit (>= 2.5.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.1)
-      tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
-    vcr (6.0.0)
-    webmock (3.14.0)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
-    yajl-ruby (1.4.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  bundler (~> 2.0)
-  codeclimate-test-reporter (< 1.0.0)
-  copyright-header
-  fluent-plugin-kubernetes_metadata_filter!
-  minitest (~> 4.0)
-  rake
-  rubocop
-  test-unit (~> 3.0.2)
-  test-unit-rr (~> 1.0.3)
-  vcr
-  webmock
-  yajl-ruby
-
-BUNDLED WITH
-   2.3.16

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-Gem::Specification.new do |gem|
-  gem.name          = 'fluent-plugin-kubernetes_metadata_filter'
-  gem.version       = '2.13.0'
-  gem.authors       = ['OpenShift Cluster Logging','Jimmi Dyson']
-  gem.email         = ['team-logging@redhat.com','jimmidyson@gmail.com']
-  gem.description   = 'Filter plugin to add Kubernetes metadata'
-  gem.summary       = 'Fluentd filter plugin to add Kubernetes metadata'
-  gem.homepage      = 'https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter'
-  gem.license       = 'Apache-2.0'
-
-  gem.files         = `git ls-files`.split($/)
-
-  gem.required_ruby_version = '>= 2.6.0'
-
-  gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.16']
-  gem.add_runtime_dependency 'kubeclient', ['>= 4.0.0', '< 5.0.0']
-  gem.add_runtime_dependency 'lru_redux'
-
-  gem.add_development_dependency 'bump'
-  gem.add_development_dependency 'bundler', '~> 2.0'
-  gem.add_development_dependency 'copyright-header'
-  gem.add_development_dependency 'minitest', '~> 4.0'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'test-unit', '~> 3.0.2'
-  gem.add_development_dependency 'test-unit-rr', '~> 1.0.3'
-  gem.add_development_dependency 'vcr'
-  gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'yajl-ruby'
-end

data/lib/fluent/plugin/kubernetes_metadata_util.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-#
-# Fluentd Kubernetes Metadata Filter Plugin - Enrich Fluentd events with
-# Kubernetes metadata
-#
-# Copyright 2021 Red Hat, Inc.
-#
-# 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 KubernetesMetadata
-  module Util
-    def create_time_from_record(record, internal_time)
-      time_key = @time_fields.detect { |ii| record.key?(ii) }
-      time = record[time_key]
-      if time.nil? || time.is_a?(String) && time.chop.empty?
-        # `internal_time` is a Fluent::EventTime, it can't compare with Time.
-        return Time.at(internal_time.to_f)
-      end
-
-      if ['_SOURCE_REALTIME_TIMESTAMP', '__REALTIME_TIMESTAMP'].include?(time_key)
-        timei = time.to_i
-        return Time.at(timei / 1_000_000, timei % 1_000_000)
-      end
-      return Time.at(time) if time.is_a?(Numeric)
-
-      Time.parse(time)
-    end
-  end
-end
-
-#https://stackoverflow.com/questions/5622435/how-do-i-convert-a-ruby-class-name-to-a-underscore-delimited-symbol
-class String
-  def underscore
-    word = self.dup
-    word.gsub!(/::/, '_')
-    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
-    word.downcase!
-    word
-  end
-end