fluent-plugin-logtail 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812d8fea53a6dc3b81c07be27f454c178d9ff2ce9bc4d6bde6531dc12e92c0c4
-  data.tar.gz: 61a02d757f5e7623e5d556c3f0ab383942a640065857f745b4814771839de1fc
+  metadata.gz: 2a83c2cb26fd6a612aa976e939af1facf21807705c3b5011931894a20732ce73
+  data.tar.gz: 1315b1b244032c1980861a07b4d539b4ec857017f08f2fd0b5f564c76173b139
 SHA512:
-  metadata.gz: 615922ba184a54c595633a6c8ef0c99db5f4e2ebf4814e41c4b80315221063cf6a997ca31bc94df34cd2d0bdbcf400dc07b2d9d054df098b1867515569026eeb
-  data.tar.gz: 42a5b851381bd677dd2ce65a823b85e6ca9624c7631ee65a4ce05f52fd8a32939fa20c0589f33c1f84d8227c17b959d0e0c48994b03cc1d662ad1e6de227f6d1
+  metadata.gz: 7f8b843456204b4f98aebda01f051f60bcc15d4bec12f5df02c63a464139e119d32ef6c7f5db8bd677f576e6649f419c9c62fc679c8bfe744ce089c99b08c4d2
+  data.tar.gz: 95979f0ad965a2599799e6b15ecc4e34aee160bda95919f8b6a76b01d20fbe75a7181a6221c270ec2c5df0f9d2e61d6dc616139b4aa5198e49814efc18f7310b

data/.github/workflows/main.yml

@@ -1,23 +1,36 @@
 name: build
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main]
+  pull_request:
+  schedule:
+    - cron: '20 5 * * 1'
+  workflow_dispatch:
 
 jobs:
   test:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
+      fail-fast: false
+
       matrix:
         ruby-version:
-          - 3.0.0
-          - 2.7.2
-          - 2.6.6
-          - 2.5.8
-          - 2.4.10
+          - "4.0"
+          - "3"
+          - "3.4"
+          - "3.3"
+          - "3.2"
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+          - "2.4"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
 
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1

data/.github/workflows/no-closing-keywords.yml

@@ -0,0 +1,28 @@
+# Issues in this repo are synced with Linear. A GitHub closing keyword ("Closes #123",
+# "Fixes owner/repo#123") closes the issue the moment the PR merges, while Linear's PR
+# automation moves the linked Linear issue to Self QA at the same time. The two automations
+# then fight: the GitHub issue is closed, reopened, and the Linear issue lands in Triage.
+# Reference the issue with "Refs #123" instead and close it from Linear once the fix is
+# released.
+name: no closing keywords
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+permissions:
+  pull-requests: read
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Reject GitHub closing keywords in the PR description
+        env:
+          BODY: ${{ github.event.pull_request.body }}
+        run: |
+          pattern='\b(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\b:?[[:space:]]+(#[0-9]+|[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+#[0-9]+|https?://github\.com/[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+/issues/[0-9]+)'
+          if matches=$(printf '%s' "$BODY" | grep -inoE "$pattern"); then
+            echo "::error::The PR description contains a GitHub closing keyword, which would close the issue on merge and desync it from Linear:"
+            echo "$matches"
+            echo "Use 'Refs #123' instead and close the issue from Linear once the fix is released."
+            exit 1
+          fi
+          echo "No closing keywords found."

data/.github/workflows/release.yml

@@ -0,0 +1,215 @@
+# Publishes the gem to RubyGems.org from GitHub Actions with trusted publishing (OIDC), the way
+# logtail-js releases the @logtail/* packages to npm. No RubyGems.org API key exists anywhere:
+# the gem on rubygems.org trusts exactly this workflow file, run from this repository in the
+# "rubygems" environment, and the shared account's multi-factor authentication stays as it is.
+#
+# One-time setup on rubygems.org, signed in as the gem's owner: the gem's page → Trusted publishers
+# → GitHub Actions, with the repository owner "logtail", this repository's name, the workflow
+# "release.yml" and the environment "rubygems".
+#
+# Repository settings this relies on: the "rubygems" environment with deployment branches limited
+# to main and no required reviewers (add reviewers there if releases should need an approval; a
+# job that references a missing environment would create it WITHOUT protection), and the GitHub
+# Actions app among the actors allowed to bypass the pull request requirement of main, which the
+# version commit needs.
+#
+# Release: Actions → Release → Run workflow from main, pick patch or minor. The workflow runs the
+# tests, bumps the version in lib/*/version.rb, builds the gem, commits "vX.Y.Z", tags it, pushes
+# both, pushes the gem to RubyGems.org and creates a GitHub release with auto-generated notes for
+# the tag; edit the notes afterwards if needed.
+#
+# Retry: if a release failed after the version commit was pushed, run "retry" from main. It bumps
+# nothing, checks out the tag of the version in lib/*/version.rb and rebuilds that commit, pushes
+# the gem if RubyGems.org is still missing it and creates the GitHub release if it is still
+# missing. Running patch or minor again would release the next version instead.
+#
+# Dry run: bumps in place without committing, builds the gem and, on main, exchanges the
+# workflow's OIDC token with RubyGems.org, which proves that the trusted publisher matches this
+# workflow. Nothing is pushed. Every push that touches this file is a dry run, so a change to the
+# workflow proves itself on its pull request before it reaches main, and the push that merges it
+# performs the token exchange as well, because the "rubygems" environment only admits main. A dry
+# run can also be dispatched from any branch.
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release:
+        description: "patch or minor: bump, tag and publish. retry: finish a release that failed halfway."
+        type: choice
+        options: [patch, minor, retry]
+        required: true
+      dry_run:
+        description: "Dry run: bump and build, verify RubyGems.org accepts this workflow, publish nothing"
+        type: boolean
+        default: false
+  push:
+    paths:
+      - .github/workflows/release.yml
+
+permissions:
+  contents: read
+
+concurrency:
+  group: release
+  cancel-in-progress: false
+
+env:
+  DRY_RUN: ${{ github.event_name == 'push' || inputs.dry_run }}
+  RELEASE: ${{ inputs.release || 'patch' }}
+
+jobs:
+  verify:
+    name: Test
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec
+
+  build:
+    name: Bump and build
+    needs: verify
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # pushes the version commit and the tag
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      gem: ${{ steps.build.outputs.gem }}
+
+    steps:
+      - name: Releases run from main only
+        if: ${{ env.DRY_RUN != 'true' && github.ref != 'refs/heads/main' }}
+        run: |
+          echo "::error::Dispatch the release from main, not from $GITHUB_REF_NAME."
+          exit 1
+
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0 # the version check looks at the tags on HEAD
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+
+      - name: Bump version
+        id: version
+        run: |
+          ruby - <<'EOF'
+          release, dry_run = ENV.fetch("RELEASE"), ENV["DRY_RUN"] == "true"
+          path = Dir["lib/**/version.rb"].fetch(0)
+          source = File.read(path)
+          current = source[/VERSION = "(\d+\.\d+\.\d+)"/, 1] || abort("no VERSION constant in #{path}")
+          tagged = `git tag --points-at HEAD`.split.include?("v#{current}")
+
+          if release == "retry"
+            # main may have moved on since the version commit, so build what the tag points at
+            abort("retry only finishes a release whose version v#{current} is tagged") unless system("git", "rev-parse", "-q", "--verify", "refs/tags/v#{current}", out: File::NULL)
+            system("git", "checkout", "-q", "v#{current}") || abort("could not check out v#{current}")
+            version = current
+          else
+            abort("HEAD is already released as v#{current}, there is nothing new to release") if tagged && !dry_run
+            major, minor, patch = current.split(".").map(&:to_i)
+            version = release == "minor" ? "#{major}.#{minor + 1}.0" : "#{major}.#{minor}.#{patch + 1}"
+            File.write(path, source.sub(%("#{current}"), %("#{version}")))
+          end
+
+          puts "#{current} -> #{version}"
+          File.open(ENV.fetch("GITHUB_OUTPUT"), "a") { |output| output.puts "version=#{version}" }
+          EOF
+
+      - name: Build the gem
+        id: build
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          git diff --stat
+          gem build *.gemspec
+          gem=$(ls *.gem)
+          case "$gem" in
+            *-"$VERSION".gem) ;;
+            *) echo "::error::Built $gem, expected version $VERSION."; exit 1 ;;
+          esac
+          echo "gem=$gem" >> "$GITHUB_OUTPUT"
+
+      - name: Commit and tag
+        if: ${{ env.DRY_RUN != 'true' && env.RELEASE != 'retry' }}
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git commit -am "v$VERSION"
+          git tag -a "v$VERSION" -m "v$VERSION"
+          git push origin main "v$VERSION"
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: gem
+          path: "*.gem"
+          if-no-files-found: error
+
+  release:
+    name: Publish
+    needs: build
+    # The rubygems environment only admits main, so dry runs from other branches stop after the build
+    if: ${{ github.ref == 'refs/heads/main' }}
+    runs-on: ubuntu-24.04
+    environment: rubygems
+    permissions:
+      contents: write # creates the GitHub release
+      id-token: write # OIDC token exchange with RubyGems.org
+    env:
+      VERSION: ${{ needs.build.outputs.version }}
+      GEM: ${{ needs.build.outputs.gem }}
+
+    steps:
+      - uses: actions/download-artifact@v8
+        with:
+          name: gem
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+
+      # Exchanges the job's OIDC token for a short-lived RubyGems.org API key and hands it to
+      # `gem push`. Fails when no trusted publisher on rubygems.org matches this workflow.
+      - uses: rubygems/configure-rubygems-credentials@v2.1.0
+
+      - name: Dry run
+        if: ${{ env.DRY_RUN == 'true' }}
+        run: |
+          ls -l "$GEM"
+          echo "RubyGems.org accepted the OIDC token: the trusted publisher matches this workflow. Nothing is pushed."
+
+      - name: Push to RubyGems.org
+        if: ${{ env.DRY_RUN != 'true' }}
+        run: |
+          name="${GEM%-$VERSION.gem}"
+          if gem specification --remote "$name" --version "$VERSION" > /dev/null 2>&1; then
+            echo "$name $VERSION is on rubygems.org already, finishing the release."
+          else
+            gem push "$GEM"
+          fi
+
+      - name: Create GitHub release
+        if: ${{ env.DRY_RUN != 'true' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          if gh release view "v$VERSION" > /dev/null 2>&1; then
+            echo "Release v$VERSION already exists."
+          else
+            # --verify-tag: only ever attach to the tag the build job pushed, never create one here.
+            gh release create "v$VERSION" --verify-tag --generate-notes
+          fi

data/fluent-plugin-logtail.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
+require_relative "lib/fluent/plugin/logtail/version"
 require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-logtail'
-  s.version     = '0.2.1'
+  s.version     = Fluent::Plugin::Logtail::VERSION
   s.date        = Date.today.to_s
   s.summary     = 'Logtail.com plugin for Fluentd'
   s.description = 'Streams Fluentd logs to the Logtail.com logging service.'

data/lib/fluent/plugin/logtail/version.rb

@@ -0,0 +1,7 @@
+module Fluent
+  module Plugin
+    module Logtail
+      VERSION = "0.2.2"
+    end
+  end
+end

data/lib/fluent/plugin/out_logtail.rb

@@ -1,11 +1,12 @@
 require 'fluent/output'
 require 'net/https'
+require_relative 'logtail/version'
 
 module Fluent
   class LogtailOutput < Fluent::BufferedOutput
     Fluent::Plugin.register_output('logtail', self)
 
-    VERSION = "0.1.1".freeze
+    VERSION = Fluent::Plugin::Logtail::VERSION
     CONTENT_TYPE = "application/msgpack".freeze
     PORT = 443
     PATH = "/".freeze

data/spec/fluent/plugin/out_logtail_spec.rb

@@ -39,6 +39,9 @@ describe Fluent::LogtailOutput do
     }.configure(cloud_config)
   end
 
+  # The gem version the bundle loaded from the gemspec, so a version bump needs no spec change
+  let(:user_agent) { "Logtail Fluentd/#{Gem.loaded_specs.fetch("fluent-plugin-logtail").version}" }
+
   let(:record) do
     {'age' => 26, 'request_id' => '42', 'parent_id' => 'parent', 'routing_id' => 'routing'}
   end
@@ -52,7 +55,7 @@ describe Fluent::LogtailOutput do
       stub = stub_request(:post, "https://in.logs.betterstack.com/").
         with(
           :body => start_with("\xDD\x00\x00\x00\x01\x85\xA3age\x1A\xAArequest_id\xA242\xA9parent_id\xA6parent\xAArouting_id\xA7routing\xA2dt\xB4".force_encoding("ASCII-8BIT")),
-          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.1.1'}
+          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>user_agent}
         ).
         to_return(:status => 202, :body => "", :headers => {})
 
@@ -86,7 +89,7 @@ describe Fluent::LogtailOutput do
       stub = stub_request(:post, "https://s1234.eu-nbg-2.betterstackdata.com/").
         with(
           :body => start_with("\xDD\x00\x00\x00\x01\x85\xA3age\x1A\xAArequest_id\xA242\xA9parent_id\xA6parent\xAArouting_id\xA7routing\xA2dt\xB4".force_encoding("ASCII-8BIT")),
-          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>'Logtail Fluentd/0.1.1'}
+          :headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'Bearer abcd1234', 'Content-Type'=>'application/msgpack', 'User-Agent'=>user_agent}
         ).
         to_return(:status => 202, :body => "", :headers => {})
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-logtail
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Logtail.com
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2026-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -79,11 +78,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
+- ".github/workflows/no-closing-keywords.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
 - fluent-plugin-logtail.gemspec
+- lib/fluent/plugin/logtail/version.rb
 - lib/fluent/plugin/out_logtail.rb
 - spec/fluent/plugin/out_logtail_spec.rb
 - spec/spec_helper.rb
@@ -91,7 +93,6 @@ homepage: https://github.com/logtail/fluent-plugin-logtail
 licenses:
 - ISC
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,10 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Logtail.com plugin for Fluentd
-test_files:
-- spec/fluent/plugin/out_logtail_spec.rb
-- spec/spec_helper.rb
+test_files: []