logstash-logger 0.26.1 → 1.1.0

data/spec/logger_spec.rb

@@ -58,14 +58,14 @@ describe LogStashLogger do
 
     expect(listener_event['severity']).to eql('INFO')
     expect(listener_event['message']).to eq(message)
-    expect(listener_event['host']).to eq(hostname)
+    expect(listener_event['host']['hostname']).to eq(hostname)
   end
 
   it 'takes a logstash-formatted json string as input and writes out a logstash event' do
     logger.info(logstash_event.to_json)
 
     expect(listener_event['message']).to eq(logstash_event['message'])
-    expect(listener_event['host']).to eq(hostname)
+    expect(listener_event['host']['hostname']).to eq(hostname)
   end
 
   it 'takes a LogStash::Event as input and writes it out intact' do
@@ -74,7 +74,7 @@ describe LogStashLogger do
     expect(listener_event['message']).to eq(logstash_event['message'])
     expect(listener_event['severity']).to eq(logstash_event['severity'])
     expect(listener_event['@timestamp'].iso8601).to eq(logstash_event.timestamp.iso8601)
-    expect(listener_event['host']).to eq(hostname)
+    expect(listener_event['host']['hostname']).to eq(hostname)
   end
 
   it 'takes a data hash as input and writes out a logstash event' do
@@ -89,7 +89,7 @@ describe LogStashLogger do
     expect(listener_event['message']).to eq(data["message"])
     expect(listener_event['severity']).to eq(data['severity'])
     expect(listener_event['foo']).to eq(data['foo'])
-    expect(listener_event['host']).to eq(hostname)
+    expect(listener_event['host']['hostname']).to eq(hostname)
     expect(listener_event['@timestamp']).to_not be_nil
   end
 
@@ -99,7 +99,7 @@ describe LogStashLogger do
     logger.info(message)
 
     expect(listener_event['message']).to eq(message.inspect)
-    expect(listener_event['host']).to eq(hostname)
+    expect(listener_event['host']['hostname']).to eq(hostname)
     expect(listener_event['severity']).to eq('INFO')
   end
 

data/spec/multi_logger_spec.rb

@@ -56,4 +56,20 @@ describe LogStashLogger::MultiLogger do
       logger.info 'test'
     end
   end
+
+  it "can call .reset on each logger" do
+    subject.loggers.each do |logger|
+      expect(logger).to receive(:reset).and_call_original
+    end
+
+    subject.reset
+  end
+
+  it "delegates #log to loggers" do
+    subject.loggers.each do |logger|
+      expect(logger).to receive(:add).with(::Logger::DEBUG, "test", nil)
+    end
+
+    subject.log(::Logger::DEBUG, "test")
+  end
 end

data/spec/spec_helper.rb

@@ -2,11 +2,12 @@ require 'pry'
 require 'securerandom'
 
 require 'simplecov'
+require 'simplecov-cobertura'
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::CoberturaFormatter
+]
 SimpleCov.start
-if ENV['CI']=='true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
 
 RSpec.configure do |config|
   config.order = "random"
@@ -53,6 +54,7 @@ RSpec.shared_context 'device' do
   let(:tcp_device) { LogStashLogger::Device.new(type: :tcp, port: port, sync: true) }
   let(:ssl_tcp_device) { LogStashLogger::Device.new(type: :tcp, port: port, ssl_enable: true, sync: true) }
   let(:unix_device) { LogStashLogger::Device.new(type: :unix, path: '/tmp/logstash', sync: true) }
+  let(:http_device) { LogStashLogger::Device.new(type: :http, url: 'http://localhost', sync: true) }
 
   let(:file) { Tempfile.new('test') }
   let(:file_device) { LogStashLogger::Device.new(type: :file, path: file.path)}
@@ -83,7 +85,7 @@ RSpec.shared_context 'device' do
   let(:unix_uri) { "unix:///some/path/to/socket" }
   let(:file_uri) { "file://#{file.path}" }
   let(:redis_uri) { "redis://localhost:6379" }
-  let(:kafka_uri) { "kafka://localhost:9092" }
+  let(:kafka_uri) { "kafka://localhost:9092/logstash" }
   let(:stdout_uri) { "stdout://localhost" }
   let(:stderr_uri) { "stderr://localhost" }
 

data/spec/support/tls_helper.rb

@@ -0,0 +1,30 @@
+require 'openssl'
+require 'tempfile'
+
+# Builds throwaway self-signed certificates for TLS specs. Nothing is written
+# outside Tempfile, and the keys never leave the test process.
+module TLSHelper
+  def self.self_signed(common_name: 'localhost', dns: ['localhost'], ips: ['127.0.0.1'])
+    key = OpenSSL::PKey::RSA.new(2048)
+    cert = OpenSSL::X509::Certificate.new
+    cert.version = 2
+    cert.serial = rand(2**64)
+    cert.subject = cert.issuer = OpenSSL::X509::Name.parse("/CN=#{common_name}")
+    cert.public_key = key.public_key
+    cert.not_before = Time.now - 60
+    cert.not_after = Time.now + 3600
+    ef = OpenSSL::X509::ExtensionFactory.new(cert, cert)
+    cert.add_extension(ef.create_extension('basicConstraints', 'CA:TRUE', true))
+    sans = dns.map { |d| "DNS:#{d}" } + ips.map { |i| "IP:#{i}" }
+    cert.add_extension(ef.create_extension('subjectAltName', sans.join(','))) unless sans.empty?
+    cert.sign(key, OpenSSL::Digest.new('SHA256'))
+    [cert, key]
+  end
+
+  def self.cert_file(cert)
+    Tempfile.new(['logstash-logger-test', '.crt']).tap do |f|
+      f.write(cert.to_pem)
+      f.flush
+    end
+  end
+end

data/spec/support/unserializable_value.rb

@@ -0,0 +1,10 @@
+# A value whose JSON conversion always raises, with or without ActiveSupport
+class UnserializableValue
+  def to_json(*)
+    raise JSON::GeneratorError, 'cannot serialize'
+  end
+
+  def as_json(*)
+    raise JSON::GeneratorError, 'cannot serialize'
+  end
+end

data/spec/tagged_logging_spec.rb

@@ -28,5 +28,20 @@ describe LogStashLogger do
 
       logger.info(message)
     end
+
+    context 'when tag is an integer' do
+      let(:tag) { 10 }
+
+      it "puts the integer into the tags array on the logstash event" do
+        expect(logdev).to receive(:write) do |event_string|
+          event = JSON.parse(event_string)
+          expect(event['tags']).to match_array([10])
+        end
+
+        logger.tagged(tag) do
+          logger.info(message)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 1.1.0
 platform: ruby
 authors:
 - David Butler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2026-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poseidon
+  name: ruby-kafka
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: syslog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: rubocop-rails
+  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: rubocop-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: rubocop-rspec
+  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: Ruby logger that writes directly to LogStash
 email:
 - dwbutler@ucla.edu
@@ -185,22 +255,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
+- docs/buffering.md
+- docs/customization.md
+- docs/outputs.md
+- docs/rails.md
+- docs/ssl.md
+- docs/troubleshooting.md
+- docs/usage.md
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/logstash-logger.rb
 - lib/logstash-logger/buffer.rb
 - lib/logstash-logger/configuration.rb
@@ -211,6 +284,7 @@ files:
 - lib/logstash-logger/device/connectable.rb
 - lib/logstash-logger/device/file.rb
 - lib/logstash-logger/device/firehose.rb
+- lib/logstash-logger/device/http.rb
 - lib/logstash-logger/device/io.rb
 - lib/logstash-logger/device/kafka.rb
 - lib/logstash-logger/device/kinesis.rb
@@ -247,10 +321,12 @@ files:
 - samples/unix.conf
 - spec/configuration_spec.rb
 - spec/constructor_spec.rb
+- spec/device/aws_stream_limits_spec.rb
 - spec/device/balancer_spec.rb
 - spec/device/connectable_spec.rb
 - spec/device/file_spec.rb
 - spec/device/firehose_spec.rb
+- spec/device/http_spec.rb
 - spec/device/io_spec.rb
 - spec/device/kafka_spec.rb
 - spec/device/kinesis_spec.rb
@@ -260,12 +336,14 @@ files:
 - spec/device/stderr_spec.rb
 - spec/device/stdout_spec.rb
 - spec/device/tcp_spec.rb
+- spec/device/tcp_tls_integration_spec.rb
 - spec/device/udp_spec.rb
 - spec/device/unix_spec.rb
 - spec/device_spec.rb
 - spec/formatter/base_spec.rb
 - spec/formatter/cee_spec.rb
 - spec/formatter/cee_syslog_spec.rb
+- spec/formatter/framing_spec.rb
 - spec/formatter/json_lines_spec.rb
 - spec/formatter/json_spec.rb
 - spec/formatter/logstash_event_spec.rb
@@ -275,13 +353,15 @@ files:
 - spec/rails_spec.rb
 - spec/silenced_logging_spec.rb
 - spec/spec_helper.rb
+- spec/support/tls_helper.rb
+- spec/support/unserializable_value.rb
 - spec/syslog_spec.rb
 - spec/tagged_logging_spec.rb
 homepage: http://github.com/dwbutler/logstash-logger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -289,25 +369,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: LogStash Logger for ruby
 test_files:
 - spec/configuration_spec.rb
 - spec/constructor_spec.rb
+- spec/device/aws_stream_limits_spec.rb
 - spec/device/balancer_spec.rb
 - spec/device/connectable_spec.rb
 - spec/device/file_spec.rb
 - spec/device/firehose_spec.rb
+- spec/device/http_spec.rb
 - spec/device/io_spec.rb
 - spec/device/kafka_spec.rb
 - spec/device/kinesis_spec.rb
@@ -317,12 +398,14 @@ test_files:
 - spec/device/stderr_spec.rb
 - spec/device/stdout_spec.rb
 - spec/device/tcp_spec.rb
+- spec/device/tcp_tls_integration_spec.rb
 - spec/device/udp_spec.rb
 - spec/device/unix_spec.rb
 - spec/device_spec.rb
 - spec/formatter/base_spec.rb
 - spec/formatter/cee_spec.rb
 - spec/formatter/cee_syslog_spec.rb
+- spec/formatter/framing_spec.rb
 - spec/formatter/json_lines_spec.rb
 - spec/formatter/json_spec.rb
 - spec/formatter/logstash_event_spec.rb
@@ -332,5 +415,7 @@ test_files:
 - spec/rails_spec.rb
 - spec/silenced_logging_spec.rb
 - spec/spec_helper.rb
+- spec/support/tls_helper.rb
+- spec/support/unserializable_value.rb
 - spec/syslog_spec.rb
 - spec/tagged_logging_spec.rb

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-dist: trusty
-sudo: false
-cache: bundler
-before_install:
-  - gem update --system
-  - gem install bundler
-after_success:
-  bundle exec codeclimate-test-reporter
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - 2.5.0
-  - jruby-9.1.5.0
-  - rubinius-3
-gemfile:
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-matrix:
-  allow_failures:
-    - rvm: rubinius-3
-addons:
-  code_climate:
-    repo_token: 4d712355fa2863c0f33f413eeede4e52cc221c4bc989a692d97574b1f6010b69

data/gemfiles/rails_3.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", :require => false, :group => :test
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "rails", "~> 3.2.18"
-
-gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", require: false, group: :test
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 4.0.0"
-
-gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", require: false, group: :test
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 4.1.1"
-
-gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", require: false, group: :test
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 4.2.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", require: false, group: :test
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "codecov", require: false, group: :test
-gem "codeclimate-test-reporter", group: :test, require: nil
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"