elastic-apm 4.8.0 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebd8a3592a4632b3f13811b920430b0052a67d80c921827ceb6639764c99de1
-  data.tar.gz: 485ec2dcb2f45d58fef2dbdb2acaa2cf515d33d0ce634bc44ef6f0f526e80f41
+  metadata.gz: 31edb9bba2adf03fbf15be845cbf4b9612b9d53821cb628d0e58b8433a913645
+  data.tar.gz: 7d2ea706462aa65a194292d6014618ed869468e30269de1d1c58b6b744e7a89b
 SHA512:
-  metadata.gz: d39a813a6c001fe599e397ec74b8a5037ad3b07c9c0710124046f58ffb96a06c18bbd0021672d6b00e55ef1317a008f354ddf5061eb58ba560ab1684bbb29a0b
-  data.tar.gz: e72c6f09511b8f2884e7f07d053c8ee4618fc18692e453e4afafd81d164f890fe2fd6c39b1f47097ae828d789c620c72c6448ca85a30746925be4be9ca24625e
+  metadata.gz: 6115cc9c39a67366f472436d6f0e22df08518915581361d2ee5999846d0a65238bdfe79e9522f38b1d19312642c09bc1bb5abb7a021efc3b138d24525fb53ccd
+  data.tar.gz: 250ece59f0403da4844ca5108559a1a434cceec6dbb2fb5dfb3113d6f466553f5dbf97e820cdeb4b2c6f05de67891521174a1f6f6a32aedd9ee8fd9ffc50032c

data/.ci/.exclude.yml

@@ -73,7 +73,9 @@ exclude:
   - VERSION: elasticobservability/jruby:9.2-8-jdk
     FRAMEWORK: rails-main
 
-  # Only test rails 7.2 on ruby >= 3.1
+  # Only test rails 7.2 on ruby >= 3.4
+  - VERSION: ruby:3.1
+    FRAMEWORK: rails-7.2
   - VERSION: ruby:2.7
     FRAMEWORK: rails-7.2
   - VERSION: ruby:2.6
@@ -103,7 +105,11 @@ exclude:
   - VERSION: elasticobservability/jruby:9.2-8-jdk
     FRAMEWORK: sinatra-main
 
-  # Only test grape master on ruby 2.7 and ruby 3.1
+  # Only test grape master on ruby >= 3.2
+  - VERSION: ruby:3.1
+    FRAMEWORK: grape-master
+  - VERSION: ruby:2.7
+    FRAMEWORK: grape-master
   - VERSION: ruby:2.6
     FRAMEWORK: grape-master
   - VERSION: ruby:2.4

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+/.github/workflows @elastic/observablt-ci

data/.github/dependabot.yml

@@ -27,8 +27,6 @@ updates:
       day: "sunday"
       time: "22:00"
     open-pull-requests-limit: 5
-    reviewers:
-      - "elastic/observablt-ci"
     labels:
       - dependencies
     groups:

data/.github/workflows/addToProject.yml

@@ -16,31 +16,48 @@ jobs:
     steps:
     - name: Get token
       id: get_token
-      uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
+      uses: actions/create-github-app-token@v3
       with:
-        app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
-        private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
-        permissions: >-
-          {
-            "issues": "read",
-            "organization_projects": "write",
-            "pull_requests": "read"
-          }
-    - name: Assign issues with milestones to project
-      uses: elastic/assign-one-project-github-action@1.2.2
+        app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }}
+        private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }}
+        permission-organization-projects: write
+        permission-issues: read
+        permission-pull-requests: read
+
+    - name: Add milestoned issues to project
+      id: add-issue-to-project
+      if: github.event.issue && github.event.issue.milestone
+      uses: elastic/oblt-actions/github/project-add@v1
+      with:
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1674
+        item-url: ${{ github.event.issue.html_url }}
+
+    - name: Set issue status to Planned
       if: github.event.issue && github.event.issue.milestone
+      uses: elastic/oblt-actions/github/project-field-set@v1
       with:
-        project: 'https://github.com/orgs/elastic/projects/454'
-        project_id: '5882982'
-        column_name: 'Planned'
-      env:
-        MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
-    - name: Assign new pull requests to project
-      uses: elastic/assign-one-project-github-action@1.2.2
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1674
+        item-id: ${{ steps.add-issue-to-project.outputs.item-id }}
+        field-name: Status
+        field-value: Planned
+
+    - name: Add new pull requests to project
+      id: add-pr-to-project
+      if: github.event.action == 'opened' && github.event.pull_request
+      uses: elastic/oblt-actions/github/project-add@v1
+      with:
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1674
+        item-url: ${{ github.event.pull_request.html_url }}
+
+    - name: Set pull request status to In Progress
       if: github.event.action == 'opened' && github.event.pull_request
+      uses: elastic/oblt-actions/github/project-field-set@v1
       with:
-        project: 'https://github.com/orgs/elastic/projects/454'
-        project_id: '5882982'
-        column_name: 'In Progress'
-      env:
-        MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
+        github-token: ${{ steps.get_token.outputs.token }}
+        project-id: 1674
+        item-id: ${{ steps.add-pr-to-project.outputs.item-id }}
+        field-name: Status
+        field-value: In Progress

data/.github/workflows/docs-build.yml

@@ -1,19 +1,16 @@
 name: docs-build
-
 on:
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize, reopened]
   push:
-    branches:
-      - main
-  pull_request_target: ~
+    branches: [main]
   merge_group: ~
-
+permissions:
+  contents: read
+  pull-requests: read
 jobs:
-  docs-preview:
-    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+  build:
+    uses: elastic/docs-actions/.github/workflows/docs-build.yml@v1
     with:
-      path-pattern: docs/**
-    permissions:
-      deployments: write
-      id-token: write
-      contents: read
-      pull-requests: read
+      enable-vale-linting: true

data/.github/workflows/docs-deploy.yml

@@ -0,0 +1,16 @@
+name: docs-deploy
+on:
+  workflow_run:
+    workflows: [docs-build]
+    types: [completed]
+permissions:
+  contents: read
+  deployments: write
+  id-token: write
+  pull-requests: write
+  actions: read
+jobs:
+  deploy:
+    uses: elastic/docs-actions/.github/workflows/docs-deploy.yml@v1
+    with:
+      enable-vale-linting: true

data/.github/workflows/docs-preview-cleanup.yml

@@ -0,0 +1,12 @@
+name: docs-preview-cleanup
+on:
+  pull_request_target:
+    branches: [main]
+    types: [closed]
+permissions:
+  contents: none
+  deployments: write
+  id-token: write
+jobs:
+  cleanup:
+    uses: elastic/docs-actions/.github/workflows/docs-preview-cleanup.yml@v1

data/.github/workflows/github-commands-comment.yml

@@ -13,26 +13,6 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     permissions:
-      issues: write
       pull-requests: write
     steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const body = `
-              ### :robot: GitHub comments
-
-              <details><summary>Expand to view the GitHub comments</summary>
-              <p>
-
-              Just comment with:
-              - `run` `docs-build` : Re-trigger the docs validation. (use unformatted text in the comment!)
-              </p>
-              </details>
-            `.replace(/  +/g, '')
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: body
-            })
+      - uses: elastic/oblt-actions/elastic/github-commands@v1

data/.github/workflows/release.yml

@@ -14,6 +14,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     permissions:
+      artifact-metadata: write
       attestations: write
       contents: write
       id-token: write
@@ -43,7 +44,7 @@ jobs:
         if:  ${{ ! startsWith(github.ref, 'refs/tags') }}
 
       - name: generate build provenance
-        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd  # v2.3.0
+        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be  # v2.4.0
         with:
           subject-path: "${{ github.workspace }}/pkg/*.gem" 
       

data/Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_IMAGE
+ARG RUBY_IMAGE=ruby:3.3
 FROM ${RUBY_IMAGE}
 
 ARG USER_ID_GROUP
@@ -9,10 +9,18 @@ ARG BUNDLER_VERSION
 # For tzdata
 # ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -qq \
-      && apt-get install -qq -y --no-install-recommends \
-        build-essential libpq-dev git \
-      && rm -rf /var/lib/apt/lists/*
+RUN set -eux; \
+      apt-get update -qq || ( \
+        find /etc/apt -name '*.list' -type f -print0 | xargs -0 sed -i \
+          -e 's|deb.debian.org/debian|archive.debian.org/debian|g' \
+          -e 's|security.debian.org/debian-security|archive.debian.org/debian-security|g'; \
+        find /etc/apt -name '*.list' -type f -print0 | xargs -0 sed -i '/buster-updates/d'; \
+        printf 'Acquire::Check-Valid-Until "false";\n' > /etc/apt/apt.conf.d/99no-check-valid; \
+        apt-get -o Acquire::Check-Valid-Until=false update -qq \
+      ); \
+      apt-get install -qq -y --no-install-recommends \
+        build-essential libpq-dev git netbase; \
+      rm -rf /var/lib/apt/lists/*
 
 # Configure bundler and PATH
 ENV LANG=C.UTF-8
@@ -29,15 +37,33 @@ ENV FRAMEWORKS $FRAMEWORKS
 RUN mkdir -p $VENDOR_PATH \
       && chown -R $USER_ID_GROUP $VENDOR_PATH
 
-USER $USER_ID_GROUP
-
-# Upgrade RubyGems and install required Bundler version
-RUN gem update --system && \
-      gem install bundler:$BUNDLER_VERSION
+# Upgrade RubyGems with a Ruby-version-compatible strategy and install Bundler.
+RUN set -eux; \
+      if ruby -e 'require "rubygems"; exit(Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2") ? 0 : 1)'; then \
+        gem update --system 3.2.3; \
+      else \
+        gem update --system; \
+      fi; \
+      if ruby -e 'require "rubygems"; exit(Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5") ? 0 : 1)'; then \
+        gem install bundler:1.17.3; \
+      else \
+        gem install bundler:$BUNDLER_VERSION; \
+      fi
 
-# Use unpatched, system version for more speed over less security
-RUN gem install nokogiri -- --use-system-libraries
+# Use unpatched, system version for more speed over less security.
+# Pin Nokogiri by Ruby compatibility to support old CI targets (e.g. Ruby 2.4).
+RUN set -eux; \
+      if ruby -e 'require "rubygems"; exit(Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5") ? 0 : 1)'; then \
+        gem install nokogiri -v 1.10.10 -- --use-system-libraries; \
+      elif ruby -e 'require "rubygems"; exit(Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.2") ? 0 : 1)'; then \
+        gem install nokogiri -v 1.12.5 -- --use-system-libraries; \
+      else \
+        gem install nokogiri -- --use-system-libraries; \
+      fi
 # Rake is required to build http-parser on some jruby images
 RUN gem install rake
 
+RUN chown -R $USER_ID_GROUP $VENDOR_PATH
+USER $USER_ID_GROUP
+
 WORKDIR /app

data/Gemfile

@@ -59,7 +59,6 @@ gem 'rake', '>= 13.0', require: nil
 gem 'racecar', require: nil if !defined?(JRUBY_VERSION)
 gem 'resque', require: nil
 gem 'sequel', require: nil
-gem 'shoryuken', require: nil
 gem 'sidekiq', require: nil
 gem 'simplecov', require: false
 gem 'simplecov-cobertura', require: false
@@ -91,6 +90,10 @@ frameworks_versions.each do |framework, version|
     gem 'net-smtp', require: false
   end
 
+  if framework =='rails' && RUBY_VERSION < '3.2' && !defined?(JRUBY_VERSION) && version >= '5.2'
+    gem 'i18n', '1.14.8'
+  end
+
   if framework =='rails' && RUBY_VERSION >= '3.4' && ['4.2', '5.2', '6.1'].include?(version)
     gem 'mutex_m'
   end
@@ -107,17 +110,36 @@ frameworks_versions.each do |framework, version|
   end
 end
 
-# Handle Rack::Auth::Digest being removed in rack 3.1, grape requires it
+# Handle Rack::Auth::Digest being removed in rack 3.1, grape requires it.
+# Sinatra 2.x depends on rack 2.x, so use a compatible rack line when both are present.
 if frameworks_versions.key?('grape')
-  gem 'rack', '~> 3.0.0'
+  sinatra_version = frameworks_versions['sinatra']
+  if sinatra_version&.start_with?('2.')
+    gem 'rack', '~> 2.2.0'
+  else
+    gem 'rack', '~> 3.0.0'
+  end
 end
 
 if frameworks_versions.key?('rails')
-  unless /^(main|6)/.match?(frameworks_versions['rails'])
-    gem 'delayed_job', require: nil
+  rails_version = frameworks_versions['rails']
+  unless /^(main|6)/.match?(rails_version)
+    if rails_version.start_with?('4.') || rails_version.start_with?('5.')
+      gem 'delayed_job', '~> 4.1.13', require: nil
+    else
+      gem 'delayed_job', require: nil
+    end
   end
 end
 
+# Shoryuken 7.x references ActiveJob::QueueAdapters::AbstractAdapter, which
+# is missing in the Ruby 3.4 + Rails 6.1 matrix target.
+if frameworks_versions['rails'] == '6.1' && RUBY_VERSION >= '3.4'
+  gem 'shoryuken', '< 7.0', require: nil
+else
+  gem 'shoryuken', require: nil
+end
+
 if RUBY_PLATFORM == 'java'
   # See issue #6547 in the JRuby repo. It is fixed in JRuby 9.3
   gem 'i18n', '< 1.8.8' if JRUBY_VERSION < '9.3'

data/bin/dev

@@ -26,14 +26,26 @@ end.parse!
 USER_ID_GROUP = %w[u g].map { |f| `id -#{f}`.chomp }.join(':')
 
 RUBY_IMAGE = options.fetch(:image, 'ruby:latest')
-FRAMEWORKS = options.fetch(:frameworks, 'rails,sinatra,grape')
+default_frameworks = if RUBY_IMAGE.include?('jruby')
+                       'rails-6.1,sinatra-2.2,grape-1.6'
+                     else
+                       'rails,sinatra,grape'
+                     end
+FRAMEWORKS = options.fetch(:frameworks, default_frameworks)
 
 IMAGE_PATH_SAFE = RUBY_IMAGE.tr(':', '_')
 IMAGE_NAME = "apm-agent-ruby:#{IMAGE_PATH_SAFE}"
 VENDOR_PATH = "/vendor/#{IMAGE_PATH_SAFE}"
+legacy_ruby_image = RUBY_IMAGE.match?(/^ruby:(2\.[0-9]+|1\.[0-9]+)/)
+DOCKER_PLATFORM = if RUBY_IMAGE.include?('jruby') || legacy_ruby_image
+                    'linux/amd64'
+                  end
 
 def run(cmd)
-  "IMAGE_NAME=#{IMAGE_NAME} #{cmd}".tap do |str|
+  env = ["IMAGE_NAME=#{IMAGE_NAME}"]
+  env << "DOCKER_DEFAULT_PLATFORM=#{DOCKER_PLATFORM}" if DOCKER_PLATFORM
+
+  "#{env.join(' ')} #{cmd}".tap do |str|
     puts str
     system str
   end

data/bin/run-bdd

@@ -9,9 +9,9 @@ if [[ $specific_feature = '' ]]; then
   echo 'Running all features'
 
   echo "========================================"
-  cucumber
+  bundle exec cucumber
 else
   echo "Running only $specific_feature"
 
-  cucumber $specific_feature
+  bundle exec cucumber $specific_feature
 fi

data/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.4'
 
 services:
   mongodb:
@@ -14,10 +13,18 @@ services:
       context: .
       args:
         BUNDLER_VERSION: '2.2.21'
+        RUBY_IMAGE: ${RUBY_IMAGE:-ruby:3.3}
+        USER_ID_GROUP: ${USER_ID_GROUP:-1000:1000}
+        FRAMEWORKS: ${FRAMEWORKS:-rails,sinatra,grape}
+        VENDOR_PATH: ${VENDOR_PATH:-/vendor/ruby_3.3}
     image: '$IMAGE_NAME'
     environment:
       HOME: '/tmp'
       MONGODB_URL: 'mongodb:27017'
+      USER_ID: ${USER_ID:-1000}
+      LOCAL_USER_ID: ${LOCAL_USER_ID:-1000}
+      LOCAL_GROUP_ID: ${LOCAL_GROUP_ID:-1000}
+      RUBY_VERSION: ${RUBY_VERSION:-3.3}
     entrypoint:
       'spec/entrypoint.sh'
     tty: true
@@ -28,17 +35,17 @@ services:
       - /tmp:exec,mode=1777
     depends_on:
       - mongodb
-    user: ${USER_ID}
+    user: ${USER_ID:-1000}
     security_opt:
       - no-new-privileges
 
   ruby_rspec:
-    image: apm-agent-ruby:${RUBY_VERSION}
+    image: apm-agent-ruby:${RUBY_VERSION:-3.3}
     environment:
       APP_PATH: /opt/app
       FRAMEWORK: rails
-      LOCAL_USER_ID: ${LOCAL_USER_ID}
-      LOCAL_GROUP_ID: ${LOCAL_GROUP_ID}
+      LOCAL_USER_ID: ${LOCAL_USER_ID:-1000}
+      LOCAL_GROUP_ID: ${LOCAL_GROUP_ID:-1000}
       MONGODB_URL: 'mongodb:27017'
     security_opt:
       - no-new-privileges

data/docs/docset.yml

@@ -1,4 +1,6 @@
 project: 'APM Ruby agent docs'
+products:
+  - id: apm-agent
 cross_links:
   - apm-agent-rum-js
   - docs-content

data/docs/reference/advanced-topics.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/advanced.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Advanced topics [advanced]

data/docs/reference/api-reference.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/api.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # API reference [api]

data/docs/reference/configuration.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Configuration [configuration]
@@ -379,7 +385,7 @@ The version number of the used framework. For Ruby on Rails and Sinatra, this de
 | --- | --- | --- | --- |
 | `ELASTIC_APM_GLOBAL_LABELS` | `global_labels` | `nil` | `dept=engineering,rack=number8` |
 
-Labels added to all events, with the format key=value[,key=value[,…​]].
+Labels added to all events, with the format key=value[,key=value[,… ]].
 
 ::::{note}
 This option requires APM Server 7.2 or greater, and will have no effect when using older server versions.
@@ -677,6 +683,18 @@ Limits the amount of spans that are recorded per transaction. This is helpful in
 By default, the agent will sample every transaction (e.g. request to your service). To reduce overhead and storage requirements, you can set the sample rate to a value between `0.0` and `1.0`. We still record overall time and the result for unsampled transactions, but no context information, tags, or spans. The sample rate will be rounded to 4 digits of precision.
 
 
+### `transaction_sample_rate_by_name` [config-transaction-sample-rate-by-name]
+
+|     |     |     |     |
+| --- | --- | --- | --- |
+| Environment | `Config` key | Default | Example |
+| `ELASTIC_APM_TRANSACTION_SAMPLE_RATE_BY_NAME` | `transaction_sample_rate_by_name` | `{}` | `{"UsersController#index" => 1.0, "HealthController#ping" => 0.0}` |
+
+Configure specific sampling rates for transactions with particular names. This option takes a hash where the keys are transaction names and the values are sampling rates between `0.0` and `1.0`.
+
+This is useful when you want to ensure critical transactions are always sampled while reducing sampling for high-volume, less important transactions. When a transaction name matches an entry in this hash, the specified sampling rate takes precedence over the global `transaction_sample_rate`.
+
+
 ### `verify_server_cert` [config-verify-server-cert]
 
 |     |     |     |
@@ -731,4 +749,3 @@ Elastic APM patches `Kernel#require` to auto-detect and instrument supported thi
 To get around this patch, set the environment variable `ELASTIC_APM_SKIP_REQUIRE_PATCH` to `"1"`.
 
 The agent might need some additional tweaking to make sure the third-party libraries are picked up and instrumented. Make sure you require the agent *after* you require your other dependencies.
-

data/docs/reference/context.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/context.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Adding additional context [context]

data/docs/reference/custom-instrumentation.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/custom-instrumentation.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Custom instrumentation [custom-instrumentation]

data/docs/reference/getting-started-rack.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rack.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Getting started with Rack [getting-started-rack]

data/docs/reference/getting-started-rails.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Getting started with Rails [getting-started-rails]

data/docs/reference/graphql.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/graphql.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # GraphQL [graphql]

data/docs/reference/index.md

@@ -2,6 +2,12 @@
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/introduction.html
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/index.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # APM Ruby agent [introduction]
@@ -22,3 +28,6 @@ These events, called Transactions and Spans, are sent to the APM Server. The APM
 
 APM Agents work in conjunction with the [APM Server](docs-content://solutions/observability/apps/application-performance-monitoring-apm.md), [Elasticsearch](docs-content://get-started/index.md), and [Kibana](docs-content://get-started/the-stack.md). The [APM Guide](docs-content://solutions/observability/apps/application-performance-monitoring-apm.md) provides details on how these components work together, and provides a matrix outlining [Agent and Server compatibility](docs-content://solutions/observability/apps/apm-agent-compatibility.md).
 
+## Troubleshooting
+
+If you're experiencing issues with the APM Ruby agent, refer to [Troubleshoot APM Ruby Agent](docs-content://troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md).

data/docs/reference/logs.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/log-correlation.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Logs [logs]

data/docs/reference/metrics.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/metrics.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Metrics [metrics]

data/docs/reference/opentracing-api.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/opentracing.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # OpenTracing API [opentracing]

data/docs/reference/performance-tuning.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/tuning-and-overhead.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Performance tuning [tuning-and-overhead]

data/docs/reference/set-up-apm-ruby-agent.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/set-up.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Set up the APM Ruby agent [set-up]

data/docs/reference/supported-technologies.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/supported-technologies.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Supported technologies [supported-technologies]
@@ -10,7 +16,7 @@ The Elastic APM Ruby Agent has built-in support for many frameworks and librarie
 
 ## Ruby [supported-technologies-ruby]
 
-We follow Ruby’s own maintenance policy and officially support all currently maintained versions per [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/).
+We follow Ruby’s own maintenance policy and officially support all currently maintained versions per [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) < 4.0.
 
 
 ## Web Frameworks and Libraries [supported-technologies-web]
@@ -22,21 +28,21 @@ We test against all supported minor versions of Rails, Sinatra, and Grape.
 
 ### Ruby on Rails [supported-technologies-rails]
 
-We currently support all versions of Rails since 4.2. This follows Rails' own [Security policy](https://rubyonrails.org/security/).
+We currently support Rails >= 4.2 <= 7.2. This follows Rails' own [Security policy](https://rubyonrails.org/security/).
 
 See [Getting started with Rails](/reference/getting-started-rails.md).
 
 
 ### Sinatra [supported-technologies-sinatra]
 
-We currently support all versions of Sinatra since 1.0.
+We currently support Sinatra >= 1.0 <= 2.2.
 
 See [Getting started with Rack](/reference/getting-started-rack.md).
 
 
 ### Grape [supported-technologies-grape]
 
-We currently support all versions of Grape since 1.2.
+We currently support Grape >= 1.2 <= 1.6.
 
 See [Grape example](/reference/getting-started-rack.md#getting-started-grape).
 
@@ -45,12 +51,12 @@ See [Grape example](/reference/getting-started-rack.md#getting-started-grape).
 
 We automatically instrument database actions using:
 
-* ActiveRecord (v4.2+)
-* DynamoDB (v1.0+)
-* Elasticsearch (v0.9+)
-* Mongo (v2.1+)
-* Redis (v3.1+)
-* Sequel (v4.35+)
+* ActiveRecord (>= 4.2 <= 7.2)
+* DynamoDB (>= 1.0 <= 1.158.0)
+* Elasticsearch (>= 0.9 <= 9.2.0)
+* Mongo (>= 2.1 <= 2.22.0)
+* Redis (>= 3.1 <= 5.4.1)
+* Sequel (>= 4.35 <= 5.100.0)
 
 
 ## External HTTP requests [supported-technologies-http]
@@ -58,8 +64,8 @@ We automatically instrument database actions using:
 We automatically instrument and add support for distributed tracing to external requests using these libraries:
 
 * `net/http`
-* Http.rb (v0.6+)
-* Faraday (v0.2.1+)
+* Http.rb (>= 3.0 < 6.0)
+* Faraday (>= 0.2.1 <= 2.14.0)
 
 **Note:** These libraries usually assume `localhost` if no `Host` is specified, so the agent does as well.
 
@@ -68,12 +74,12 @@ We automatically instrument and add support for distributed tracing to external
 
 We automatically instrument background processing using:
 
-* DelayedJob
-* Sidekiq
-* Shoryuken
-* Sneakers (v2.12.0+) (Experimental, see [#676](https://github.com/elastic/apm-agent-ruby/pull/676))
-* Resque (v2.0.0+)
-* SuckerPunch (v2.0.0+)
+* DelayedJob (<= 4.2.0)
+* Sidekiq (<= 8.1.0)
+* Shoryuken (<= 6.2.1)
+* Sneakers (2.12.0) (Experimental, see [#676](https://github.com/elastic/apm-agent-ruby/pull/676))
+* Resque (>= 2.0.0 <= 2.7.0)
+* SuckerPunch (>= 2.0.0 <= 3.3.0)
 
 
 ## Resque [supported-technologies-resque]

data/docs/reference/toc.yml

@@ -19,4 +19,6 @@ toc:
   # TO DO: Not available on master
   # - file: log-correlation.md
   - file: performance-tuning.md
-  - file: upgrading.md
+  - file: upgrading.md
+  - title: Troubleshooting
+    crosslink: docs-content://troubleshoot/observability/apm-agent-ruby/apm-ruby-agent.md

data/docs/reference/upgrading.md

@@ -1,6 +1,12 @@
 ---
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/upgrading.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Upgrading [upgrading]

data/docs/release-notes/index.md

@@ -3,6 +3,12 @@ navigation_title: "Elastic APM Ruby Agent"
 mapped_pages:
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/release-notes.html
   - https://www.elastic.co/guide/en/apm/agent/ruby/current/release-notes-4.x.html
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Elastic APM Ruby Agent release notes [elastic-apm-ruby-agent-release-notes]
@@ -22,6 +28,16 @@ All notable changes to this project will be documented here. This project adhere
 
 % ### Fixes [elastic-apm-ruby-agent-versionext-fixes]
 
+## 4.9.0 [elastic-apm-ruby-agent-490-release-notes]
+
+### Features and enhancements [elastic-apm-ruby-agent-490-features-enhancements]
+* Add ability to configure sampling rate based on transaction span name [#1531](https://github.com/elastic/apm-agent-ruby/pull/1531)
+* Set version 7.0 as http gem upper bound in gemspec [#1624](https://github.com/elastic/apm-agent-ruby/pull/1624)
+
+### Fixes [elastic-apm-ruby-agent-490-fixes]
+* Use status code explicitly in central config for changes in http 6.0 [#1615](https://github.com/elastic/apm-agent-ruby/pull/1615)
+* Use headers method directly for compatibility with all versions of http [#1629](https://github.com/elastic/apm-agent-ruby/pull/1629)
+
 ## 4.8.0 [elastic-apm-ruby-agent-480-release-notes]
 
 ### Features and enhancements [elastic-apm-ruby-agent-480-features-enhancements]

data/docs/release-notes/known-issues.md

@@ -1,6 +1,11 @@
 ---
 navigation_title: "Known issues"
-
+applies_to:
+  stack:
+  serverless:
+    observability:
+  product:
+    apm_agent_ruby: ga
 ---
 
 # Elastic APM Ruby Agent known issues [elastic-apm-ruby-agent-known-issues]

data/elastic-apm.gemspec

@@ -29,14 +29,14 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/elastic/apm-agent-ruby'
   spec.metadata = { 'source_code_uri' => 'https://github.com/elastic/apm-agent-ruby' }
   spec.license  = 'Apache-2.0'
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.3.0", "< 4.0"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
   spec.add_dependency('concurrent-ruby', '~> 1.0')
-  spec.add_dependency('http', '>= 3.0')
+  spec.add_dependency('http', '>= 3.0', '< 7.0')
   spec.add_runtime_dependency('ruby2_keywords')
 
   spec.require_paths = ['lib']

data/lib/elastic_apm/central_config.rb

@@ -75,7 +75,7 @@ module ElasticAPM
       resp = perform_request
 
       # rubocop:disable Lint/DuplicateBranch
-      case resp.status
+      case resp.status.code
       when 200..299
         resp
       when 300..399

data/lib/elastic_apm/config/round_float_hash_value.rb

@@ -0,0 +1,35 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Config
+    # @api private
+    class RoundFloatHashValue
+      def initialize
+        @float_converter = RoundFloat.new
+      end
+
+      def call(hash)
+        return {} unless hash
+
+        hash.transform_values { |value| @float_converter.call(value) }
+      end
+    end
+  end
+end

data/lib/elastic_apm/config.rb

@@ -22,6 +22,7 @@ require 'elastic_apm/config/duration'
 require 'elastic_apm/config/log_level_map'
 require 'elastic_apm/config/options'
 require 'elastic_apm/config/round_float'
+require 'elastic_apm/config/round_float_hash_value'
 require 'elastic_apm/config/regexp_list'
 require 'elastic_apm/config/wildcard_pattern_list'
 require 'elastic_apm/deprecations'
@@ -98,6 +99,7 @@ module ElasticAPM
     option :transaction_ignore_urls,           type: :list,   default: [],      converter: WildcardPatternList.new
     option :transaction_max_spans,             type: :int,    default: 500
     option :transaction_sample_rate,           type: :float,  default: 1.0,     converter: RoundFloat.new
+    option :transaction_sample_rate_by_name,   type: :hash,   default: {},      converter: RoundFloatHashValue.new
     option :use_elastic_traceparent_header,    type: :bool,   default: true
     option :verify_server_cert,                type: :bool,   default: true
 

data/lib/elastic_apm/instrumenter.rb

@@ -123,7 +123,7 @@ module ElasticAPM
         sampled = trace_context.recorded?
         sample_rate = trace_context.tracestate.sample_rate
       else
-        sampled = random_sample?(config)
+        sampled = random_sample?(config.transaction_sample_rate)
         sample_rate = sampled ? config.transaction_sample_rate : 0
       end
 
@@ -195,6 +195,19 @@ module ElasticAPM
           current_transaction
         end
       return unless transaction
+
+      unless trace_context
+        span_sample_rate = transaction_sample_rate_for_name(name, transaction.config)
+        # if the span sample rate is different from the transaction sample rate,
+        # we need to check if the span should be sampled
+        # and update the transaction's sample rate accordingly
+        if transaction.started_spans == 0 && span_sample_rate && span_sample_rate != transaction.sample_rate
+          span_sampled = random_sample?(span_sample_rate)
+          transaction.sampled = span_sampled
+          transaction.sample_rate = span_sampled ? span_sample_rate : 0
+        end
+      end
+
       return unless transaction.sampled?
       return unless transaction.inc_started_spans!
 
@@ -278,10 +291,17 @@ module ElasticAPM
         '>'
     end
 
+    def transaction_sample_rate_for_name(name, config)
+      return if !name || config.transaction_sample_rate_by_name.empty?
+      return unless config.transaction_sample_rate_by_name.key?(name)
+
+      config.transaction_sample_rate_by_name[name]
+    end
+
     private
 
-    def random_sample?(config)
-      rand <= config.transaction_sample_rate
+    def random_sample?(sample_rate)
+      rand <= sample_rate
     end
 
     def update_transaction_metrics(transaction)

data/lib/elastic_apm/spies/http.rb

@@ -49,7 +49,7 @@ module ElasticAPM
             context: context
           ) do |span|
             trace_context = span&.trace_context || transaction.trace_context
-            trace_context.apply_headers { |key, value| req[key] = value }
+            trace_context.apply_headers { |key, value| req.headers[key] = value }
 
             result = super(req, options)
 

data/lib/elastic_apm/transaction.rb

@@ -87,7 +87,15 @@ module ElasticAPM
     end
     # rubocop:enable Metrics/ParameterLists
 
-    attr_accessor :name, :type, :result, :outcome
+    attr_accessor(
+      :name,
+      :type,
+      :result,
+      :outcome,
+      :sampled,
+      :sample_rate,
+      :started_spans
+    )
 
     attr_reader(
       :breakdown_metrics,
@@ -98,12 +106,11 @@ module ElasticAPM
       :framework_name,
       :notifications,
       :self_time,
-      :sample_rate,
       :span_frames_min_duration,
-      :started_spans,
       :timestamp,
       :trace_context,
-      :transaction_max_spans
+      :transaction_max_spans,
+      :config
     )
 
     alias :collect_metrics? :collect_metrics

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '4.8.0'
+  VERSION = '4.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.0
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-07 00:00:00.000000000 Z
+date: 2026-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -32,6 +32,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,6 +42,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,7 @@ files:
 - ".ci/updatecli/values.d/apm-json-specs.yml"
 - ".ci/updatecli/values.d/scm.yml"
 - ".ci/updatecli/values.d/update-compose.yml"
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
@@ -90,7 +97,8 @@ files:
 - ".github/workflows/ci-docs.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/docs-build.yml"
-- ".github/workflows/docs-cleanup.yml"
+- ".github/workflows/docs-deploy.yml"
+- ".github/workflows/docs-preview-cleanup.yml"
 - ".github/workflows/github-commands-comment.yml"
 - ".github/workflows/labeler.yml"
 - ".github/workflows/microbenchmark.yml"
@@ -109,7 +117,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- SECURITY.md
 - bench/.gitignore
 - bench/app.rb
 - bench/benchmark.rb
@@ -162,6 +169,7 @@ files:
 - lib/elastic_apm/config/options.rb
 - lib/elastic_apm/config/regexp_list.rb
 - lib/elastic_apm/config/round_float.rb
+- lib/elastic_apm/config/round_float_hash_value.rb
 - lib/elastic_apm/config/server_info.rb
 - lib/elastic_apm/config/wildcard_pattern_list.rb
 - lib/elastic_apm/context.rb
@@ -298,6 +306,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/workflows/docs-cleanup.yml

@@ -1,14 +0,0 @@
-name: docs-cleanup
-
-on:
-  pull_request_target:
-    types:
-      - closed
-
-jobs:
-  docs-preview:
-    uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
-    permissions:
-      contents: none
-      id-token: write
-      deployments: write

data/SECURITY.md

@@ -1,7 +0,0 @@
-# Security Policy
-
-Thanks for your interest in the security of our products.
-Our security policy can be found at [https://www.elastic.co/community/security](https://www.elastic.co/community/security).
-
-## Reporting a Vulnerability
-Please send security vulnerability reports to security@elastic.co.