honeycomb-beeline 2.11.0 → 2.11.1.pre.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb1cdd573575f99c826f6c98a20184dca3585ca9725f78373086c4b6dbac9a8a
-  data.tar.gz: 84d8b9c5e0d3e98a86f469245b8981c74861b92c591a1b399ebbcb786f18749e
+  metadata.gz: 52fb2200e25db002d4e9c2570c95a786fa2b8f43990363d2ff24c3d4eff15a51
+  data.tar.gz: 40854a97dfc2ef9a71729c6ffc6af0a6732c877b2faacaf417a5c4b72ff87c51
 SHA512:
-  metadata.gz: 7d9700b19010094ec5c130af68cf6d07b91d493e60b560b48ec89012680d9102c82249a16e131adec06db3463cec5113dc68977bc0b8a1dccf8a1171f412674a
-  data.tar.gz: 25f56bc53a4debe90efb86dbc00152129fc7fe80a1e682a9d3efc33294b2d8fe87139fb87aa3e5cca0f03f76c238a41e5508208f3df0246792f841e0c265013e
+  metadata.gz: cca4d89088d60d01d98a3e499e0ca53f226dea09b9e9575ccac8618545a50e5fdf9fff108ccd2a24bef551aa286add0ef2a69d57d238831535bf9e95950229b5
+  data.tar.gz: d4f28f8de6b59d88eed5fc54a441051003c966a29ac542581dab5a937fac8d7008e9e855033e56cc87e160bc059e8cb765d4884b08ff0962b48db8575e52a977

data/.circleci/config.yml

@@ -30,7 +30,7 @@ commands:
 jobs:
   build_artifacts:
     docker:
-      - image: circleci/ruby:2.6
+      - image: cimg/ruby:2.7
     steps:
       - checkout
       - run: mkdir -p ~/artifacts
@@ -45,7 +45,7 @@ jobs:
 
   publish_rubygems:
     docker:
-      - image: circleci/ruby:2.6
+      - image: cimg/ruby:2.7
     steps:
       - attach_workspace:
           at: ~/
@@ -79,9 +79,9 @@ jobs:
     parameters:
       ruby-version:
         type: string
-        default: "2.6"
+        default: "2.7"
     docker:
-        - image: circleci/ruby:<< parameters.ruby-version >>
+        - image: cimg/ruby:<< parameters.ruby-version >>
     environment:
       BUNDLE_GEMFILE: ./Gemfile
     steps:
@@ -89,7 +89,7 @@ jobs:
           ruby-version: << parameters.ruby-version >>
           gemfile: root
           command: bundle exec rake rubocop
-  test:
+  test-older-versions: # need to use deprecated circleci/ruby images for older ruby versions
     parameters:
       gemfile:
         type: string
@@ -110,13 +110,34 @@ jobs:
           root: ./
           paths:
             - coverage
+  test:
+    parameters:
+      gemfile:
+        type: string
+      ruby-version:
+        type: string
+    docker:
+        - image: cimg/ruby:<< parameters.ruby-version >>
+    environment:
+      BUNDLE_GEMFILE: gemfiles/<< parameters.gemfile >>.gemfile
+    steps:
+      - ruby:
+          ruby-version: << parameters.ruby-version >>
+          gemfile: << parameters.gemfile >>
+          command: bundle exec rake test
+      - store_test_results:
+          path: test/reports
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - coverage
   coverage_report:
     parameters:
       ruby-version:
         type: string
-        default: "2.6"
+        default: "2.7"
     docker:
-        - image: circleci/ruby:<< parameters.ruby-version >>
+        - image: cimg/ruby:<< parameters.ruby-version >>
     environment:
       BUNDLE_GEMFILE: ./Gemfile
     steps:
@@ -142,13 +163,13 @@ workflows:
                 - main
     jobs:
       - lint
-      - test: &test
+      - test-older-versions: &test-older-versions # need to use deprecated circleci/ruby images for older ruby versions
           name: test-<< matrix.gemfile >>-ruby_<< matrix.ruby-version >>
           requires:
             - lint
           matrix:
             parameters:
-              ruby-version: ["2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0"]
+              ruby-version: ["2.2", "2.3", "2.4", "2.5", "2.6"]
               gemfile:
                 - aws_2
                 - aws_3
@@ -157,7 +178,8 @@ workflows:
                 - sequel4
                 - sequel5
                 - sinatra
-                - rack
+                - rack_2
+                - rack_3
                 - rails_41
                 - rails_42
                 - rails_5
@@ -168,20 +190,22 @@ workflows:
                 - redis_3
                 - redis_4
             exclude:
+              - ruby-version: "2.2"
+                gemfile: faraday_0
               - ruby-version: "2.2"
                 gemfile: faraday_1
               - ruby-version: "2.2"
                 gemfile: rails_52
               - ruby-version: "2.2"
                 gemfile: rails_6
-              - ruby-version: "2.3"
-                gemfile: rails_6
-              - ruby-version: "2.4"
-                gemfile: rails_6
               - ruby-version: "2.2"
                 gemfile: rails_61
+              - ruby-version: "2.3"
+                gemfile: rails_6
               - ruby-version: "2.3"
                 gemfile: rails_61
+              - ruby-version: "2.4"
+                gemfile: rails_6
               - ruby-version: "2.4"
                 gemfile: rails_61
               - ruby-version: "2.4"
@@ -190,14 +214,35 @@ workflows:
                 gemfile: rails_41
               - ruby-version: "2.6"
                 gemfile: rails_41
-              - ruby-version: "2.7"
-                gemfile: rails_41
-              - ruby-version: "2.7"
-                gemfile: rails_42
-              - ruby-version: "3.0"
-                gemfile: rails_41
-              - ruby-version: "3.0"
-                gemfile: rails_42
+              - ruby-version: "2.2"
+                gemfile: rack_3
+              - ruby-version: "2.3"
+                gemfile: rack_3
+      - test: &test
+          name: test-<< matrix.gemfile >>-ruby_<< matrix.ruby-version >>
+          requires:
+            - lint
+          matrix:
+            parameters:
+              ruby-version: ["2.7", "3.0", "3.1"]
+              gemfile:
+                - aws_2
+                - aws_3
+                - faraday_0
+                - faraday_1
+                - sequel4
+                - sequel5
+                - sinatra
+                - rack_2
+                - rack_3
+                - rails_5
+                - rails_51
+                - rails_52
+                - rails_6
+                - rails_61
+                - redis_3
+                - redis_4
+            exclude:
               - ruby-version: "3.0"
                 gemfile: rails_5
               - ruby-version: "3.0"
@@ -206,6 +251,14 @@ workflows:
                 gemfile: rails_52
               - ruby-version: "3.0"
                 gemfile: sequel4
+              - ruby-version: "3.1"
+                gemfile: rails_5
+              - ruby-version: "3.1"
+                gemfile: rails_51
+              - ruby-version: "3.1"
+                gemfile: rails_52
+              - ruby-version: "3.1"
+                gemfile: sequel4
 
   beeline:
     jobs:
@@ -213,6 +266,9 @@ workflows:
           filters: &regular_filters
               tags:
                 only: /.*/
+      - test-older-versions: # need to use deprecated circleci/ruby images for older ruby versions
+          <<: *test-older-versions
+          filters: *regular_filters
       - test:
           <<: *test
           filters: *regular_filters
@@ -220,6 +276,7 @@ workflows:
           filters: *regular_filters
           requires:
             - test
+            - test-older-versions
       - build_artifacts:
           filters: &tag_filters
               tags:
@@ -229,10 +286,11 @@ workflows:
           requires:
             - lint
             - test
+            - test-older-versions
       - publish_rubygems: &publish
           filters: *tag_filters
           requires:
             - build_artifacts
+          context: Honeycomb Secrets for Public Repos
       - publish_github:
           <<: *publish
-          context: Honeycomb Secrets for Public Repos

data/.circleci/setup-rubygems.sh

@@ -1,3 +1,3 @@
 mkdir ~/.gem
-echo -e "---\r\n:rubygems_api_key: $GEM_HOST_API_KEY" > ~/.gem/credentials
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
 chmod 0600 /home/circleci/.gem/credentials

data/.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # This file controls who is tagged for review for any given pull request.
 
 # For anything not explicitly taken by someone else:
-* @honeycombio/telemetry-team @martin308
+* @honeycombio/telemetry-team

data/.github/dependabot.yml

@@ -13,3 +13,6 @@ updates:
       - "type: dependencies"
     reviewers:
       - "honeycombio/telemetry-team"
+    commit-message:
+      prefix: "maint"
+      include: "scope"

data/.github/release.yml

@@ -0,0 +1,23 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - no-changelog
+  categories:
+    - title: 💥 Breaking Changes 💥
+      labels:
+        - "version: bump major"
+        - breaking-change
+    - title: 💡 Enhancements
+      labels:
+        - "type: enhancement"
+    - title: 🐛 Fixes
+      labels:
+        - "type: bug"
+    - title: 🛠 Maintenance
+      labels:
+        - "type: maintenance"
+    - title: 🤷 Other Changes
+      labels:
+        - "*"

data/.github/workflows/add-to-project-v2.yml

@@ -0,0 +1,15 @@
+name: Add to project
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    name: Add issues and PRs to project
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/honeycombio/projects/11
+          github-token: ${{ secrets.GHPROJECTS_TOKEN }}

data/.github/workflows/validate-pr-title.yml

@@ -0,0 +1,64 @@
+name: "Validate PR Title"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        id: lint_pr_title
+        name: "🤖 Check PR title follows conventional commit spec"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # Have to specify all types because `maint` and `rel` aren't defaults
+          types: |
+            maint
+            rel
+            fix
+            feat
+            chore
+            ci
+            docs
+            style
+            refactor
+            perf
+            test
+          ignoreLabels: |
+            "type: dependencies"
+      # When the previous steps fails, the workflow would stop. By adding this
+      # condition you can continue the execution with the populated error message.
+      - if: always() && (steps.lint_pr_title.outputs.error_message != null)
+        name: "📝 Add PR comment about using conventional commit spec"
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          message: |
+            Thank you for contributing to the project! 🎉
+
+            We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted.
+
+            Make sure to prepend with `feat:`, `fix:`, or another option in the list below.
+
+            Once you update the title, this workflow will re-run automatically and validate the updated title.
+
+            Details:
+
+            ```
+            ${{ steps.lint_pr_title.outputs.error_message }}
+            ```
+
+      # Delete a previous comment when the issue has been resolved
+      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
+        name: "❌ Delete PR comment after title has been updated"
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          delete: true

data/Appraisals

@@ -31,8 +31,15 @@ appraise "sinatra" do
   gem "warden"
 end
 
-appraise "rack" do
-  gem "rack"
+appraise "rack-2" do
+  gem "rack", "~>2.0"
+  gem "rack-test"
+  gem "warden"
+end
+
+appraise "rack-3" do
+  gem "rack", "~>3.0"
+  gem "rack-session"
   gem "rack-test"
   gem "warden"
 end

data/honeycomb-beeline.gemspec

@@ -7,8 +7,8 @@ require "honeycomb/beeline/version"
 Gem::Specification.new do |spec|
   spec.name          = Honeycomb::Beeline::NAME
   spec.version       = Honeycomb::Beeline::VERSION
-  spec.authors       = ["Martin Holman"]
-  spec.email         = ["martin@honeycomb.io"]
+  spec.authors       = ["The Honeycomb.io Team"]
+  spec.email         = ["support@honeycomb.io"]
 
   spec.summary       = "Instrument your Ruby apps with Honeycomb"
   spec.homepage      = "https://honeycomb.io"
@@ -48,9 +48,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter", ">= 0.5.1"
-  spec.add_development_dependency "rubocop", "< 0.69"
+  spec.add_development_dependency "rubocop", [">= 0.60.0", "< 0.69"]
   spec.add_development_dependency "rubocop-performance", "< 1.3.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-console"
-  spec.add_development_dependency "webmock"
+  if RUBY_VERSION < "2.3.0"
+    spec.add_development_dependency "webmock", "< 3.15.0"
+  else
+    spec.add_development_dependency "webmock"
+  end
 end

data/lib/honeycomb/beeline/version.rb

@@ -3,7 +3,7 @@
 module Honeycomb
   module Beeline
     NAME = "honeycomb-beeline".freeze
-    VERSION = "2.11.0".freeze
+    VERSION = "2.11.1-dev".freeze
     USER_AGENT_SUFFIX = "#{NAME}/#{VERSION}".freeze
   end
 end

data/lib/honeycomb/integrations/rack.rb

@@ -65,7 +65,7 @@ module Honeycomb
 
     def add_package_information(_env)
       yield "meta.package", "rack"
-      yield "meta.package_version", ::Rack::VERSION.join(".")
+      yield "meta.package_version", ::Rack.release
     end
 
     def extract_fields(env, fields)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-beeline
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1.pre.dev
 platform: ruby
 authors:
-- Martin Holman
+- The Honeycomb.io Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney
@@ -154,6 +154,9 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.60.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.69'
@@ -161,6 +164,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.60.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.69'
@@ -222,7 +228,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- martin@honeycomb.io
+- support@honeycomb.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -238,10 +244,11 @@ files:
 - ".github/ISSUE_TEMPLATE/security-vulnerability-report.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
-- ".github/workflows/add-to-project.yml"
+- ".github/release.yml"
+- ".github/workflows/add-to-project-v2.yml"
 - ".github/workflows/apply-labels.yml"
-- ".github/workflows/re-triage.yml"
 - ".github/workflows/stale.yml"
+- ".github/workflows/validate-pr-title.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
@@ -313,11 +320,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Instrument your Ruby apps with Honeycomb

data/.github/workflows/add-to-project.yml

@@ -1,14 +0,0 @@
-name: Apply project management flow
-on:
-  issues:
-    types: [opened]
-  pull_request_target:
-    types: [opened]
-jobs:
-  project-management:
-    runs-on: ubuntu-latest
-    name: Apply project management flow
-    steps:
-      - uses: honeycombio/oss-management-actions/projects@v1
-        with:
-          ghprojects-token: ${{ secrets.GHPROJECTS_TOKEN }}

data/.github/workflows/re-triage.yml

@@ -1,12 +0,0 @@
-name: Re-triage issues with new comments
-on:
-  issue_comment:
-    types: [created]
-jobs:
-  re-triage:
-    runs-on: ubuntu-latest
-    name: Re-triage issues with new comments
-    steps:
-      - uses: honeycombio/oss-management-actions/re-triage@v1
-        with:
-          ghprojects-token: ${{ secrets.GHPROJECTS_TOKEN }}