From 43fc00a8319a159f28380865b72a868e5cd1618d Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Mon, 10 Feb 2025 20:32:48 +0100 Subject: [PATCH 1/4] T-4821 Use ingestion_* options, update outdated naming --- example-project/README.md | 2 +- example-project/config.ru | 2 +- logtail-ruby-rack.gemspec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example-project/README.md b/example-project/README.md index ef20c3a..29ad9b4 100644 --- a/example-project/README.md +++ b/example-project/README.md @@ -15,7 +15,7 @@ This will install all dependencies listed in the `Gemfile.lock` file. Then replace `` and `` in `config.ru` with your actual source token and ingesting host which you can find by going to [Better Stack Telemetry](https://teleemetry.betterstack.com/dashboard) -> Source -> Configure. ```ruby -http_io_device = Logtail::LogDevices::HTTP.new("", logtail_host: "") +http_io_device = Logtail::LogDevices::HTTP.new("", ingesting_host: "") ``` ## Run the example project diff --git a/example-project/config.ru b/example-project/config.ru index 495fbe1..df8b47d 100644 --- a/example-project/config.ru +++ b/example-project/config.ru @@ -7,7 +7,7 @@ use Logtail::Integrations::Rack::HTTPEvents use Logtail::Integrations::Rack::ErrorEvent # HTTP IO device sends logs to Better Stack, replace and with your real source token and ingesting host -http_io_device = Logtail::LogDevices::HTTP.new("", logtail_host: "") +http_io_device = Logtail::LogDevices::HTTP.new("", ingesting_host: "") # STDOUT IO device sends logs to console output stdout_io_device = STDOUT diff --git a/logtail-ruby-rack.gemspec b/logtail-ruby-rack.gemspec index d419710..5816983 100644 --- a/logtail-ruby-rack.gemspec +++ b/logtail-ruby-rack.gemspec @@ -5,8 +5,8 @@ require "logtail-rack/version" Gem::Specification.new do |spec| spec.name = "logtail-rack" spec.version = Logtail::Integrations::Rack::VERSION - spec.authors = ["Logtail"] - spec.email = ["hi@logtail.com"] + spec.authors = ["Better Stack"] + spec.email = ["hello@betterstack.com"] spec.summary = %q{Logtail integration for Rack} spec.homepage = "https://github.com/logtail/logtail-ruby-rack" From 481cc2814ed645d03f81ab8240ab297ae8f6b83b Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 13:47:43 +0100 Subject: [PATCH 2/4] update CI --- .github/workflows/main.yml | 77 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f92127..90e9a18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,47 +15,50 @@ jobs: fail-fast: false matrix: ruby-version: - - 3.2 - - 3.1 - - 3.0 - - 2.7 - - 2.6 - - 2.5 - - 2.4 - - 2.3 - - jruby-9.4.3.0 - - jruby-9.2.14.0 - - truffleruby-23.0.0 - - truffleruby-22.1.0 + - "3" + - "3.4" + - "3.3" + - "3.2" + - "3.1" + - "3.0" + - "2.7" + - "2.6" + - "2.5" + - "2.4" + - "2.3" + - "jruby-9.4.3.0" + - "jruby-9.2.14.0" + - "truffleruby-23.0.0" + - "truffleruby-22.1.0" rack-version: - - # default Rack version + - "" # default Rack version include: - - ruby-version: 2.7 - rack-version: ~>1.2.0 - - ruby-version: 2.7 - rack-version: ~>1.2 - - ruby-version: 2.7 - rack-version: ~>2.0.0 - - ruby-version: 2.7 - rack-version: ~>2.0 - - ruby-version: 2.7 - rack-version: ~>3.0 - - ruby-version: 2.7 - rack-version: ~>3.0.0 + - ruby-version: "2.7" + rack-version: "~>1.2.0" + - ruby-version: "2.7" + rack-version: "~>1.2" + - ruby-version: "2.7" + rack-version: "~>2.0.0" + - ruby-version: "2.7" + rack-version: "~>2.0" + - ruby-version: "2.7" + rack-version: "~>3.0" + - ruby-version: "2.7" + rack-version: "~>3.0.0" - - ruby-version: 3.2 - rack-version: ~>1.2.0 - - ruby-version: 3.2 - rack-version: ~>1.2 - - ruby-version: 3.2 - rack-version: ~>2.0.0 - - ruby-version: 3.2 - rack-version: ~>2.0 - - ruby-version: 3.2 - rack-version: ~>3.0 - - ruby-version: 3.2 - rack-version: ~>3.0.0 + - ruby-version: "3.2" + rack-version: "~>1.2.0" + - ruby-version: "3.2" + rack-version: "~>1.2" + - ruby-version: "3.2" + rack-version: "~>2.0.0" + - ruby-version: "3.2" + rack-version: "~>2.0" + - ruby-version: "3.2" + rack-version: "~>3.0" + - ruby-version: "3.2" + rack-version: "~>3.0.0" steps: - uses: actions/checkout@v2 From c96760c69ad0d711736838045509cc9cb8f25084 Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 13:51:12 +0100 Subject: [PATCH 3/4] =?UTF-8?q?explicitly=20require=20base64=20for=20Ruby?= =?UTF-8?q?=20=E2=89=A5=203.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index b4e2a20..82cfbfb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ source "https://rubygems.org" gemspec + +gem "base64" if RUBY_VERSION >= "3.4.0" From c4f495db0aa0fb2560a1fffe9bfc661181efea5f Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 11 Feb 2025 13:58:14 +0100 Subject: [PATCH 4/4] bump version to 0.2.6 --- example-project/Gemfile | 2 +- example-project/Gemfile.lock | 14 ++++++-------- lib/logtail-rack/version.rb | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/example-project/Gemfile b/example-project/Gemfile index 5517a84..4d28d65 100644 --- a/example-project/Gemfile +++ b/example-project/Gemfile @@ -4,4 +4,4 @@ gem "rack", "~> 3.0" gem "rackup", "~> 2.1" -gem "logtail-rack", "~> 0.2.5" +gem "logtail-rack", "~> 0.2.6" diff --git a/example-project/Gemfile.lock b/example-project/Gemfile.lock index ddaff05..3e66c69 100644 --- a/example-project/Gemfile.lock +++ b/example-project/Gemfile.lock @@ -1,23 +1,21 @@ GEM remote: https://rubygems.org/ specs: - logtail (0.1.13) + logtail (0.1.15) msgpack (~> 1.0) - logtail-rack (0.2.5) + logtail-rack (0.2.6) logtail (~> 0.1) rack (>= 1.2, < 4.0) - msgpack (1.7.2) - rack (3.0.0) - rackup (2.1.0) + msgpack (1.8.0) + rack (3.1.9) + rackup (2.2.1) rack (>= 3) - webrick (~> 1.8) - webrick (1.8.1) PLATFORMS arm64-darwin-22 DEPENDENCIES - logtail-rack (~> 0.2.5) + logtail-rack (~> 0.2.6) rack (~> 3.0) rackup (~> 2.1) diff --git a/lib/logtail-rack/version.rb b/lib/logtail-rack/version.rb index 9dd493c..78be720 100755 --- a/lib/logtail-rack/version.rb +++ b/lib/logtail-rack/version.rb @@ -1,7 +1,7 @@ module Logtail module Integrations module Rack - VERSION = "0.2.5" + VERSION = "0.2.6" end end end