gitlab-fluent-plugin-redis-slowlog 0.0.0 → 0.0.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fc7a7afc37728bd3e9ae94eeaa408103bf28f00a87c6e931a4568f675bab927
-  data.tar.gz: 3e7fc4b3bc8dbb082f84f211f4de09ceb9b415b2d9d7c0c59b67316498586730
+  metadata.gz: d8104bc9262ab90f07e653d801a21ed7384f8d53a3bbc7644d3f568c9cd2a0be
+  data.tar.gz: cb9da92f38150d81e5927b0ffb9710de9eb9dfff1b9a5b9233fa42dc40e508c2
 SHA512:
-  metadata.gz: 4e315c9db4c5d3b70c196fcb9dd912304ea8619766f8d9bbc8c00eeb1d4389f96fd37f1279f061e1c3d977944a972209763cadf417bb1dc18c98b12aceeeb9c9
-  data.tar.gz: 59f9771844039b0a250c9f6bcbf342ea42163d2710d79b9121f222c39736d3cb8f40e2978cf40a2e86496b507ef1da549fdfbeadea47098c9c6dc86efffb8739
+  metadata.gz: ae18b72578831c8ba6d58a6c82df91c75a9c9dca51ed5c6546765afba1193090dc4583999fa30be0d508611e414cc1f5cffa1ebe3e6cc927434dede4ba06ec95
+  data.tar.gz: c33ebe9e818ea120eac6f900c62c1bc61c91fe5d9dde5a367b84f65f45895bc19c673337b184ffe3ca9f8f62c56d63dec9c227a2f6e7bc0e19d01dfabd8e9c9e

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    gitlab-fluent-plugin-redis-slowlog (0.0.0)
+    gitlab-fluent-plugin-redis-slowlog (0.0.1.pre)
       fluentd (>= 0.14.10, < 2)
       redis (>= 4.1.3, < 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (3.2.22.5)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
     ast (2.4.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
@@ -30,11 +33,14 @@ GEM
       rubocop-rails (~> 2.0)
       rubocop-rspec (~> 1.36)
     http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     method_source (0.9.2)
     msgpack (1.3.3)
+    multi_json (1.14.1)
     parallel (1.19.1)
-    parser (2.7.1.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     power_assert (1.1.3)
     pry (0.12.2)
@@ -68,10 +74,11 @@ GEM
       rubocop (>= 0.51)
     rubocop-performance (1.4.1)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.5.2)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    rubocop-rspec (1.37.0)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     serverengine (2.2.1)

data/README.md

@@ -94,40 +94,3 @@ Default value: `128`.
 The time in seconds to wait between `SLOWLOG` commands.
 
 Default value: `10`.
-
-## Development
-
-After checking out the repository, run `bundle install` to install all
-dependencies.
-
-After that, you can run `bundle exec rake` to run all lints and
-specs.
-
-Other rake tasks:
-
-```
-rake build                # Build gitlab-fluent-plugin-redis-slowlog-0.gem into the pkg directory
-rake clean                # Remove any temporary products
-rake clobber              # Remove any generated files
-rake console              # Start an interactive console with the gem loaded
-rake install              # Build and install gitlab-fluent-plugin-redis-slowlog-0.gem into system gems
-rake install:local        # Build and install gitlab-fluent-plugin-redis-slowlog-0.gem into system gems without network access
-rake release[remote]      # Create tag v0 and build and push gitlab-fluent-plugin-redis-slowlog-0.gem to rubygems.org
-rake spec                 # Run RSpec code examples
-rake verify               # Run RuboCop
-rake verify:auto_correct  # Auto-correct RuboCop offenses
-```
-
-
-### Releasing a new version
-
-Releasing a new version can be done by pushing a new tag, or creating
-it from the
-[interface](https://gitlab.com/gitlab-org/fluent-plugin-redis-slowlog/-/tags).
-
-A new changelog will automatically be added to the release on Gitlab.
-
-The new version will automatically be published to
-[rubygems](https://rubygems.org/gems/gitlab-labkit) when the pipeline
-for the tag completes. It might take a few minutes before the update
-is available.

data/Rakefile

@@ -1,17 +1,12 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:verify)
+require "rake/testtask"
 
-desc "Start an interactive console with the gem loaded"
-task :console do
-  require "pry"
-  require "fluent/env"
-  require "fluent/plugin/in_redis_slowlog"
-
-  Pry.start
+Rake::TestTask.new(:test) do |t|
+  t.libs.push("lib", "test")
+  t.test_files = FileList["test/**/test_*.rb"]
+  t.verbose = true
+  t.warning = true
 end
 
-task default: [:verify, :spec]
+task default: [:test]

data/gitlab-fluent-plugin-redis-slowlog.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "gitlab-fluent-plugin-redis-slowlog"
-  spec.version = "0.0.0" # `git describe --tags`.chomp.gsub(/^v/, "")
+  spec.version = "0.0.1.pre" # `git describe --tags`.chomp.gsub(/^v/, "")
   spec.metadata = { "source_code_uri" => "https://gitlab.com/gitlab-org/fluent-plugin-redis-slowlog" }
   spec.authors = ["Bob Van Landuyt"]
   spec.email   = ["bob@gitlab.com"]

data/test/helper.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
+require "test-unit"
+require "fluent/test"
+require "fluent/test/driver/input"
+require "fluent/test/helpers"
+
+Test::Unit::TestCase.include(Fluent::Test::Helpers)
+Test::Unit::TestCase.extend(Fluent::Test::Helpers)

data/test/plugin/test_in_redis_slowlog.rb

@@ -0,0 +1,18 @@
+require "helper"
+require "fluent/plugin/in_redis_slowlog.rb"
+
+class RedisSlowlogInputTest < Test::Unit::TestCase
+  setup do
+    Fluent::Test.setup
+  end
+
+  test "failure" do
+    flunk
+  end
+
+  private
+
+  def create_driver(conf)
+    Fluent::Test::Driver::Input.new(Fluent::Plugin::RedisSlowlogInput).configure(conf)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fluent-plugin-redis-slowlog
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1.pre
 platform: ruby
 authors:
 - Bob Van Landuyt
@@ -142,8 +142,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitlab-ci.yml"
-- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -151,10 +149,8 @@ files:
 - Rakefile
 - gitlab-fluent-plugin-redis-slowlog.gemspec
 - lib/fluent/plugin/in_redis_slowlog.rb
-- spec/fluent/plugin/redis_slowlog_input_spec.rb
-- spec/spec_helper.rb
-- tools/deploy-rubygem.sh
-- tools/update-changelog.rb
+- test/helper.rb
+- test/plugin/test_in_redis_slowlog.rb
 homepage: http://gitlab.com/gitlab-org/gitlab-fluent-plugin-redis-slowlog
 licenses:
 - MIT
@@ -171,14 +167,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Emit redis slowlog entries into fluentd
 test_files:
-- spec/fluent/plugin/redis_slowlog_input_spec.rb
-- spec/spec_helper.rb
+- test/helper.rb
+- test/plugin/test_in_redis_slowlog.rb

data/.gitlab-ci.yml

@@ -1,21 +0,0 @@
-test:
-  image: ruby:2.6
-  stage: test
-  script:
-    - gem install bundler
-    - bundle install
-    - bundle exec rake
-
-deploy:
-  stage: deploy
-  script:
-    - tools/deploy-rubygem.sh
-  only:
-    - tags
-
-release:
-  stage: deploy
-  script:
-    - tools/update-changelog.rb "${CI_COMMIT_TAG}"
-  only:
-    - tags

data/.rubocop.yml

@@ -1,17 +0,0 @@
-inherit_gem:
-  gitlab-styles:
-    - rubocop-default.yml
-
-AllCops:
-  TargetRubyVersion: 2.6
-
-# Let's just pick something from the beginning
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-# This isn't Rails, so diable these
-Rails/RakeEnvironment:
-  Enabled: false
-CodeReuse/ActiveRecord:
-  Enabled: false

data/spec/fluent/plugin/redis_slowlog_input_spec.rb

@@ -1,119 +0,0 @@
-require "spec_helper"
-
-describe Fluent::Plugin::RedisSlowlogInput do
-  let(:config) do
-    { tag: "redis.slowlog" }
-  end
-
-  let(:plugin) { driver.instance }
-  let(:slowlog) { [] }
-  let(:fake_redis) { instance_double(Redis, ping: "PONG", quit: "OK", slowlog: slowlog) }
-
-  subject(:driver) do
-    config_string = config.map { |key, value| "#{key} #{value}" }.join("\n")
-    Fluent::Test::Driver::Input.new(described_class).configure(config_string)
-  end
-
-  before do
-    Fluent::Test.setup
-  end
-
-  context "when redis can't be reached" do
-    it "raises an error" do
-      expect { driver.run }.to raise_error(Redis::CannotConnectError)
-    end
-  end
-
-  context "when specifying redis connection attributes" do
-    let(:config) do
-      { tag: "redis.slowlog",
-        url: "redis://:p4ssw0rd@10.0.1.1:6380/15",
-        path: "/path/to/redis.sock",
-        host: "localhost",
-        port: 1234,
-        password: "5iveL!fe" }
-    end
-
-    it "delegates all of them to redis-rb" do
-      redis_params = [:url, :path, :host, :port, :password]
-
-      expect(Redis).to receive(:new).with(config.slice(*redis_params)).and_return(fake_redis)
-
-      driver.run
-    end
-  end
-
-  context "when redis is available" do
-    let(:config) do
-      {
-        tag: "redis.slowlog",
-        interval: 0,
-        logsize: 10
-      }
-    end
-
-    before do
-      allow(plugin).to receive(:redis).and_return(fake_redis)
-    end
-
-    after do
-      # Wait for the thread polling redis to finish
-      plugin.__send__(:watcher).join
-    end
-
-    it "does not raise errors" do
-      expect { driver.run }.not_to raise_error
-    end
-
-    it "polls the slowlog at with the configured interval and size" do
-      expect(plugin).to receive(:sleep).with(0).ordered
-      expect(fake_redis).to receive(:slowlog).with("get", 10).ordered
-      expect(plugin).to receive(:sleep).with(0).ordered
-      expect(fake_redis).to receive(:slowlog).with("get", 10).ordered
-
-      # Limit to 2 cycles
-      allow(plugin).to receive(:watching).thrice.and_return(true, true, false)
-
-      driver.run
-    end
-
-    context "when the slowlog returns entries" do
-      let(:slowlog) do
-        [
-          [25640, 1590522258, 1, %w[ping]],
-          [25639, 1590522249, 1, %w[ping]],
-          [25638, 1590522208, 5, %w[SCAN 0]]
-        ]
-      end
-
-      let(:expected_entries) do
-        slowlog.map(&method(:log_entry)).sort_by { |event| event["id"] }
-      end
-
-      let(:emitted_entries) { driver.events.map(&:last) }
-
-      it "emits an event for each slowlog in reverse order" do
-        driver.run(expect_emits: 3)
-
-        expect(driver.events.size).to eq(3)
-        expect(emitted_entries).to eq(expected_entries)
-      end
-
-      it "does not log the same event twice" do
-        expect(fake_redis).to receive(:slowlog).and_return(slowlog.last(1), slowlog)
-
-        driver.run(expect_emits: 3)
-
-        expect(driver.events.size).to eq(3)
-        expect(emitted_entries).to eq(expected_entries)
-      end
-    end
-  end
-
-  def log_entry(slowlog_entry)
-    { "id" => slowlog_entry.first,
-      "timestamp" => Time.at(slowlog_entry[1]),
-      "exec_time" => slowlog_entry[2],
-      "command" => slowlog_entry.last }
-  end
-end

data/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-require "rspec"
-require "fluent/test"
-require "fluent/test/driver/input"
-require "fluent/test/helpers"
-require "pry"
-
-Dir.glob(File.expand_path("../lib/**/*.rb", __dir__)).each(&method(:require))
-
-# Test::Unit is required for fluent/test, but we don't want it to autorun when
-# required
-Test::Unit::AutoRunner.need_auto_run = false
-
-RSpec.configure do |config|
-  config.include Fluent::Test::Helpers
-end

data/tools/deploy-rubygem.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-mkdir -p ~/.gem/
-temp_file=$(mktemp)
-
-# Revert change the credentials file
-function revert_gem_cred_switch {
-  mv "$temp_file" ~/.gem/credentials
-}
-
-if [[ -f ~/.gem/credentials ]]; then
-  echo "Temporarily moving existing credentials to $temp_file"
-  mv ~/.gem/credentials "$temp_file"
-  trap revert_gem_cred_switch EXIT
-fi
-
-cat <<EOD > ~/.gem/credentials
----
-:rubygems_api_key: $RUBYGEMS_API_KEY
-EOD
-chmod 600 ~/.gem/credentials
-
-set -x
-rm -rf pkg/
-mkdir -p pkg/
-bundle install
-bundle exec rake verify build
-gem push pkg/*.gem

data/tools/update-changelog.rb

@@ -1,106 +0,0 @@
-#!/usr/bin/env ruby
-
-require "uri"
-require "net/http"
-require "openssl"
-require "json"
-require "optparse"
-
-GitlabError = Class.new(StandardError)
-GitlabClientError = Class.new(GitlabError)
-
-def gitlab_client(path, method, body = nil)
-  url = URI("https://gitlab.com#{path}")
-
-  http = Net::HTTP.new(url.host, url.port)
-  http.use_ssl = true
-
-  request = case method
-            when :get
-              Net::HTTP::Get.new(url)
-            when :post
-              Net::HTTP::Post.new(url)
-            when :put
-              Net::HTTP::Put.new(url)
-            else
-              raise "Unknown method: #{method}"
-            end
-
-  request["content-type"] = "application/json"
-  request["PRIVATE-TOKEN"] = ENV["GITLAB_TOKEN"]
-  request.body = JSON.dump(body) if body
-
-  response = http.request(request)
-
-  case response
-  when Net::HTTPSuccess
-    JSON.parse(response.read_body)
-  when Net::HTTPClientError
-    raise GitlabClientError, "HTTP #{response.code} for #{method} #{url}: #{response.read_body}"
-  else
-    raise GitLabError, "HTTP #{response.code} for #{method} #{url}: #{response.read_body}"
-  end
-end
-
-def list_commits_for_tag(tag)
-  commits = `git rev-list --no-merges $(git describe --tags --abbrev=0 #{tag}^)..#{tag}`.lines
-  commits.map(&:chomp)
-end
-
-def get_mrs_for_commit(commit_id)
-  gitlab_client("/api/v4/projects/gitlab-org%2ffluent-plugin-redis-slowlog/repository/commits/#{commit_id}/merge_requests", :get)
-end
-
-def create_release_for_tag(tag, description)
-  req_body = { tag_name: tag, description: description }
-  gitlab_client("/api/v4/projects/gitlab-org%2ffluent-plugin-redis-slowlog/releases", :post, req_body)
-end
-
-def update_release_for_tag(tag, description)
-  req_body = { description: description }
-  gitlab_client("/api/v4/projects/gitlab-org%2ffluent-plugin-redis-slowlog/releases/#{tag}", :put, req_body)
-end
-
-def get_unique_mrs_for_tag(tag)
-  commit_ids = list_commits_for_tag(tag)
-  dup_mrs = commit_ids.map { |commit_id| get_mrs_for_commit(commit_id) }.flatten
-  uniq_mrs = dup_mrs.uniq { |mr| mr["iid"] }
-
-  uniq_mrs.sort { |mr| mr["iid"] }.reverse
-end
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: update-changelog.rb [options] tag"
-
-  opts.on("-d", "--[no-]dry-run", "Display only. Do not update release notes.") do |d|
-    options[:dry_run] = d
-  end
-end.parse!
-
-# Check required conditions
-unless ARGV.length == 1
-  puts optparse
-  exit(-1)
-end
-
-tag = ARGV.first
-
-changelog = get_unique_mrs_for_tag(tag).map { |mr| "* #{mr['web_url']}: #{mr['title']}" }.join("\n")
-
-raise "No new changes found" if changelog.empty?
-
-changelog = "## Changes in #{tag}\n\n" + changelog
-
-if options[:dry_run]
-  puts changelog
-  exit
-end
-
-begin
-  create_release_for_tag(tag, changelog)
-  puts "Created release: https://gitlab.com/gitlab-org/fluent-plugin-redis-slowlog/-/releases##{tag}"
-rescue GitlabClientError
-  update_release_for_tag(tag, changelog)
-  puts "Updated release: https://gitlab.com/gitlab-org/fluent-plugin-redis-slowlog/-/releases##{tag}"
-end