T-4821 Use ingestion_* options, update outdated naming

.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

Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "base64" if RUBY_VERSION >= "3.4.0"

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"

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)
 

example-project/README.md

@@ -15,7 +15,7 @@ This will install all dependencies listed in the `Gemfile.lock` file.
 Then replace `<source_token>` and `<ingesting_host>` 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("<source_token>", logtail_host: "<ingesting_host>")
+http_io_device = Logtail::LogDevices::HTTP.new("<source_token>", ingesting_host: "<ingesting_host>")
 ```
 
 ## Run the example project

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 <source_token> and <ingesting_host> with your real source token and ingesting host
-http_io_device = Logtail::LogDevices::HTTP.new("<source_token>", logtail_host: "<ingesting_host>")
+http_io_device = Logtail::LogDevices::HTTP.new("<source_token>", ingesting_host: "<ingesting_host>")
 
 # STDOUT IO device sends logs to console output
 stdout_io_device = STDOUT

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

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"