elastic-apm 4.5.1 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176cc8d035203774027d36d50769b763761354f3b9627f024ce90e07cd9069e3
-  data.tar.gz: 19a6d7ed6796133c1b79b2e762718f4be7068e4e5876e13e9e898894fc112900
+  metadata.gz: 49b381ca37784473aef9bf3462b37eb77b3d263dfd402adf929c866153f81af3
+  data.tar.gz: 51f9290d7cace3428273171484ab6f6526e1309bdb2d27a101d9e74a17f9f619
 SHA512:
-  metadata.gz: e2c34d43d849374706b481eabda64190ae0469e6770f068166eae20d42f7b12a54213820fac8a78e9343cca785f68378e9d4212a3fa6235966f6bb2a8517ca2d
-  data.tar.gz: c19991391535b0ab3087bcdb3bf3d7354a160570fa08a80c313391ab739c9996872e1b68f7ec164223bec2f2f70e643daa6c2ca69adb9549a1255abac5c1f794
+  metadata.gz: 55c315cf52ce113f032b471f64d6662d4e5b9d85577bf228913da82c3f114cdc1846c70a8078de2fc7e1362c89f2cff2559b6e6b046007667feeb0c194223e75
+  data.tar.gz: 9962145d110f552e1beb449e721389cefe17bb862b3e255f48ef236170fa04523c29654f11fb3e1cc89cc5b8f69e14f0678cab51431b86a501ec016631278992

data/.ci/.jenkins_exclude.yml

@@ -1,6 +1,8 @@
 exclude:
   # Ruby 2.4
-  # Only includes rails-5.2, sinatra-2.0
+  # Only test on rails-5.2, sinatra-1.4
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-6.1
   - RUBY_VERSION: ruby:2.4
@@ -8,11 +10,11 @@ exclude:
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-4.2
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-1.4
+    FRAMEWORK: sinatra-2.2
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: grape-1.6
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.0
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.4
@@ -21,7 +23,9 @@ exclude:
     FRAMEWORK: grape-master
 
   # rails-4.2 exclusions
-  # Only test on ruby 2.6, 2.5, 2.4, 2.3
+  # Only test on ruby 2.6, 2.5, 2.4
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: rails-4.2
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: rails-4.2
   - RUBY_VERSION: ruby:2.7
@@ -35,6 +39,8 @@ exclude:
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
     FRAMEWORK: rails-4.2
   # sinatra-1.4 exclusions
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: sinatra-1.4
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: sinatra-1.4
   - RUBY_VERSION: ruby:2.7
@@ -55,7 +61,11 @@ exclude:
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-6.0
 
-  # Only test rails master on ruby 2.7 and ruby 3.0
+  # Only test rails master on ruby 3.1
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: rails-main
+  - RUBY_VERSION: ruby:2.7
+    FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.6
     FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.5
@@ -71,7 +81,25 @@ exclude:
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
     FRAMEWORK: rails-main
 
-  # Only test sinatra master on ruby 2.7 and ruby 3.0
+  # Only test rails 7.0 on ruby >= 2.7
+  - RUBY_VERSION: ruby:2.6
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: rails-7.0
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: rails-7.0
+
+  # Only test sinatra master on ruby 2.7 and ruby 3.1
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: sinatra-master
   - RUBY_VERSION: ruby:2.6
     FRAMEWORK: sinatra-master
   - RUBY_VERSION: ruby:2.5
@@ -104,31 +132,60 @@ exclude:
     FRAMEWORK: grape-master
 
   # grape 1.5 doesn't support ruby 3.0
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: grape-1.6
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: grape-1.6
   - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
 
-  # only test ruby 3.0 with rails 6.0 and rails 6.1
+  # only test ruby >= 3.0 with rails 6.0 and rails 6.1
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: rails-5.2
+  - RUBY_VERSION: ruby:3.1
+    FRAMEWORK: rails-5.1
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: rails-5.2
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: rails-5.1
 
   # Unsupported
+  # Ruby 2.6
   - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
+  - RUBY_VERSION: ruby:2.6
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # Ruby 2.5
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # Ruby 2.4
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # JRuby 9.2
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # JRuby 9.2-13-jdk
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # JRuby 9.2-11-jdk
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # JRuby 9.2-8-jdk
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0

data/.ci/.jenkins_framework.yml

@@ -1,12 +1,13 @@
 FRAMEWORK:
+  - rails-7.0
   - rails-6.1
   - rails-6.0
   - rails-5.2
   - rails-4.2
 
-  - sinatra-2.0
+  - sinatra-2.2
   - sinatra-1.4
 
   - grape-1.6
 
-  - grape-1.6,sinatra-2.0,rails-6.1
+  - grape-1.6,sinatra-2.2,rails-6.1

data/.ci/.jenkins_ruby.yml

@@ -1,8 +1,8 @@
 RUBY_VERSION:
+  - ruby:3.1
   - ruby:3.0
   - ruby:2.7
   - ruby:2.6
-  - ruby:2.5
   - ruby:2.4
   - jruby:9.2
   - docker.elastic.co/observability-ci/jruby:9.2-13-jdk

data/.ci/.jenkins_ruby_benchmarks.yml

@@ -0,0 +1,6 @@
+RUBY_VERSION:
+  - ruby:3.1
+  - ruby:3.0
+  - ruby:2.7
+  - ruby:2.6
+  - jruby:9.2

data/.ci/Jenkinsfile

@@ -21,12 +21,11 @@ pipeline {
     CODECOV_SECRET = 'secret/apm-team/ci/apm-agent-ruby-codecov'
     DOCKER_REGISTRY = 'docker.elastic.co'
     DOCKER_SECRET = 'secret/apm-team/ci/docker-registry/prod'
-    GITHUB_CHECK_ITS_NAME = 'Integration Tests'
-    ITS_PIPELINE = 'apm-integration-tests-selector-mbp/main'
     RELEASE_SECRET = 'secret/apm-team/ci/apm-agent-ruby-rubygems-release'
     OPBEANS_REPO = 'opbeans-ruby'
     REFERENCE_REPO = '/var/lib/jenkins/.git-references/apm-agent-ruby.git'
     SLACK_CHANNEL = '#apm-agent-ruby'
+    RUBY_DOCKER_TAG = 'ruby:2.6'
   }
   options {
     timeout(time: 2, unit: 'HOURS')
@@ -123,24 +122,36 @@ pipeline {
             }
           }
         }
-        stage('Integration Tests') {
-          agent none
-          when {
-            beforeAgent true
-            anyOf {
-              changeRequest()
-              expression { return !params.Run_As_Main_Branch }
+      }
+    }
+    stage('Publish snapshot packages') {
+      options { skipDefaultCheckout() }
+      environment {
+        PATH = "${env.WORKSPACE}/.local/bin:${env.WORKSPACE}/bin:${env.PATH}"
+        BUCKET_NAME = 'oblt-artifacts'
+        DOCKER_REGISTRY = 'docker.elastic.co'
+        DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod'
+        GCS_ACCOUNT_SECRET = 'secret/observability-team/ci/snapshoty'
+      }
+      when { branch 'main' }
+      steps {
+        withGithubNotify(context: 'Publish snapshot packages') {
+          deleteDir()
+          unstash 'source'
+          dir(env.BASE_DIR) {
+            script {
+              docker.image(env.RUBY_DOCKER_TAG).inside() {
+                sh(label: 'install build system', script: 'gem install rake yard rspec')
+                sh(label: 'create gem', script: 'rake build')
+              }
+              snapshoty(
+                bucket: env.BUCKET_NAME,
+                gcsAccountSecret: env.GCS_ACCOUNT_SECRET,
+                dockerRegistry: env.DOCKER_REGISTRY,
+                dockerSecret: env.DOCKER_REGISTRY_SECRET
+              )
             }
           }
-          steps {
-            githubNotify(context: "${env.GITHUB_CHECK_ITS_NAME}", description: "${env.GITHUB_CHECK_ITS_NAME} ...", status: 'PENDING', targetUrl: "${env.JENKINS_URL}search/?q=${env.ITS_PIPELINE.replaceAll('/','+')}")
-            build(job: env.ITS_PIPELINE, propagate: false, wait: true,
-                  parameters: [ string(name: 'INTEGRATION_TEST', value: 'Ruby'),
-                                string(name: 'BUILD_OPTS', value: "--ruby-agent-version ${env.GIT_BASE_COMMIT} --ruby-agent-version-state ${env.GIT_BUILD_CAUSE} --ruby-agent-repo ${env.CHANGE_FORK?.trim() ?: 'elastic'}/${env.REPO} --opbeans-ruby-agent-branch ${env.GIT_BASE_COMMIT}"),
-                                string(name: 'GITHUB_CHECK_NAME', value: env.GITHUB_CHECK_ITS_NAME),
-                                string(name: 'GITHUB_CHECK_REPO', value: env.REPO),
-                                string(name: 'GITHUB_CHECK_SHA1', value: env.GIT_BASE_COMMIT) ])
-          }
         }
       }
     }
@@ -162,13 +173,13 @@ pipeline {
       }
       stages {
         stage('Clean Workspace') {
-          agent { label 'metal' }
+          agent { label 'microbenchmarks-pool' }
           steps {
             echo "Cleaning Workspace"
           }
           post {
             always {
-              cleanWs()
+              cleanWs(notFailBuild: true)
             }
           }
         }
@@ -183,7 +194,7 @@ pipeline {
               unstash 'source'
               dir("${BASE_DIR}"){
                 script {
-                  def versions = readYaml(file: ".ci/.jenkins_ruby.yml")
+                  def versions = readYaml(file: ".ci/.jenkins_ruby_benchmarks.yml")
                   def benchmarkTask = [:]
                   versions['RUBY_VERSION'].each{ v ->
                     benchmarkTask[v] = runBenchmark(v)
@@ -199,7 +210,6 @@ pipeline {
     stage('Release') {
       options { skipDefaultCheckout() }
       environment {
-        RUBY_DOCKER_TAG = 'ruby:2.6'
         HOME = '/var/lib/jenkins'
       }
       when {
@@ -283,7 +293,7 @@ pipeline {
 */
 def runBenchmark(version){
   return {
-    node('metal'){
+    node('microbenchmarks-pool'){
       // Transform the versions like:
       //  - docker.elastic.co/observability-ci/jruby:9.2-12-jdk to jruby-9.2-12-jdk
       //  - jruby:9.1 to jruby-9.1
@@ -299,8 +309,6 @@ def runBenchmark(version){
             }
             try{
               sh """./spec/scripts/benchmarks.sh "${version}" "${REFERENCE_REPO}" """
-            } catch(e){
-              throw e
             } finally {
               archiveArtifacts(
                 allowEmptyArchive: true,
@@ -308,6 +316,7 @@ def runBenchmark(version){
                 onlyIfSuccessful: false)
               sendBenchmarks(file: "benchmark-${transformedVersion}.bulk",
                 index: "benchmark-ruby", archive: true)
+              cleanWs(notFailBuild: true)
             }
           }
         }
@@ -411,7 +420,7 @@ def convergeCoverage() {
 
 def prepareRelease(Closure body){
   dir("${env.BASE_DIR}"){
-    docker.image("${env.RUBY_DOCKER_TAG}").inside('-v ${REFERENCE_REPO}:${REFERENCE_REPO} -v /etc/passwd:/etc/passwd -v ${HOME}/.ssh:${HOME}/.ssh') {
+    docker.image(env.RUBY_DOCKER_TAG).inside('-v ${REFERENCE_REPO}:${REFERENCE_REPO} -v /etc/passwd:/etc/passwd -v ${HOME}/.ssh:${HOME}/.ssh') {
       withEnv(["HOME=${env.WORKSPACE}/${env.BASE_DIR ?: ''}"]) {
         rubygemsLogin.withApi(secret: "${env.RELEASE_SECRET}") {
           withGitRelease(credentialsId: '2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken') {

data/.ci/docker/jruby/11-jdk/Dockerfile

@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/docker/jruby/12-jdk/Dockerfile

@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/docker/jruby/13-jdk/Dockerfile

@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/docker/jruby/7-jdk/Dockerfile

@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/docker/jruby/8-jdk/Dockerfile

@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/snapshoty.yml

@@ -0,0 +1,34 @@
+---
+
+# Version of configuration to use
+version: '1.0'
+
+# You can define a Google Cloud Account to use
+account:
+  # Project id of the service account
+  project: '${GCS_PROJECT}'
+  # Private key id of the service account
+  private_key_id: '${GCS_PRIVATE_KEY_ID}'
+  # Private key of the service account
+  private_key: '${GCS_PRIVATE_KEY}'
+  # Email of the service account
+  client_email: '${GCS_CLIENT_EMAIL}'
+  # URI token
+  token_uri: 'https://oauth2.googleapis.com/token'
+
+# List of artifacts
+artifacts:
+  # Path to use for artifacts discovery 
+  - path: './pkg'
+    # Files pattern to match
+    files_pattern: 'elastic-apm-(?P<app_version>\d+\.\d+\.\d+)\.gem'
+    # File layout on GCS bucket
+    output_pattern: '{project}/{jenkins_branch_name}/elastic-apm-ruby-{app_version}-{jenkins_git_commit_short}.gem'
+    # List of metadata processors to use.
+    metadata:
+      # Define static custom metadata
+      - name: 'custom'
+        data:
+          project: 'apm-agent-ruby'
+      # Add jenkins metadata
+      - name: 'jenkins'

data/.ci/update-specs.yml

@@ -0,0 +1,108 @@
+name: update-specs
+
+title: synchronize schema specs
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: '{{ requiredEnv "GIT_USER" }}'
+      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      owner: elastic
+      repository: apm-agent-ruby
+      token: '{{ requiredEnv "GITHUB_TOKEN" }}'
+      username: '{{ requiredEnv "GIT_USER" }}'
+      branch: main
+
+sources:
+  sha:
+    kind: file
+    spec:
+      file: 'https://github.com/elastic/apm-data/commit/main.patch'
+      matchpattern: "^From\\s([0-9a-f]{40})\\s"
+    transformers:
+      - findsubmatch:
+          pattern: "[0-9a-f]{40}"
+  error.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/error.json
+  metadata.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metadata.json
+  metricset.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metricset.json
+  span.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/span.json
+  transaction.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/transaction.json
+
+
+
+
+
+actions:
+  pr:
+    kind: "github/pullrequest"
+    scmid: default
+    sourceid: sha
+    spec:
+      automerge: false
+      draft: false
+      labels:
+        - "automation"
+      description: |-
+        ### What
+        APM agent json schema automatic sync
+        ### Why
+        *Changeset*
+        * https://github.com/elastic/apm-data/commit/{{ source "sha" }}
+
+targets:
+  error.json:
+    name: error.json
+    scmid: default
+    sourceid: error.json
+    kind: file
+    spec:
+      file: spec/fixtures/error.json
+      forcecreate: true
+  metadata.json:
+    name: metadata.json
+    scmid: default
+    sourceid: metadata.json
+    kind: file
+    spec:
+      file: spec/fixtures/metadata.json
+      forcecreate: true
+  metricset.json:
+    name: metricset.json
+    scmid: default
+    sourceid: metricset.json
+    kind: file
+    spec:
+      file: spec/fixtures/metricset.json
+      forcecreate: true
+  span.json:
+    name: span.json
+    scmid: default
+    sourceid: span.json
+    kind: file
+    spec:
+      file: spec/fixtures/span.json
+      forcecreate: true
+  transaction.json:
+    name: transaction.json
+    scmid: default
+    sourceid: transaction.json
+    kind: file
+    spec:
+      file: spec/fixtures/transaction.json
+      forcecreate: true

data/.github/workflows/update-specs.yml

@@ -0,0 +1,30 @@
+name: update-specs
+
+on:
+  workflow_dispatch: ~
+  schedule:
+    - cron: '0 6 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current
+        env:
+          BRANCH_NAME: ${{ github.ref_name }}
+        with:
+          vaultUrl: ${{ secrets.VAULT_ADDR }}
+          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
+          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
+          pipeline: ./.ci/update-specs.yml
+      - if: failure()
+        uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
+        with:
+          vaultUrl: ${{ secrets.VAULT_ADDR }}
+          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
+          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
+          slackChannel: "#apm-agent-ruby"

data/CHANGELOG.asciidoc

@@ -35,6 +35,40 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.6.1]]
+==== 4.6.1
+
+[float]
+===== Fixed
+
+- Fix growing number of open file descriptors when HTTP request to APM is never sent {pull}1351[#1351]
+- Fix setting span http status code when Faraday Middleware is used {pull}1368[#1368]
+- Handle whitespace when splitting tracestate entries {pull}1353[#1353]
+
+[[release-notes-4.6.0]]
+==== 4.6.0
+
+[float]
+===== Added
+
+- Added transaction_name to reported error to allow grouping by transaction name {pull}1267[#1267]
+- Added ability to query server for version (useful in the future) {pull}1278[#1278]
+- Added instrumentation for https://github.com/zendesk/racecar/ Racecar Kafka library {pull}1284[#1284]
+
+===== Changed
+
+- Expanded filtering to sanitize any key that contains the string 'auth' {pull}1266[#1266]
+- Rename `log_ecs_formatting` option to `log_ecs_reformatting`, deprecate old option name {pull}1248[#1248]
+- When the configuration value for `log_path` is set, override the `logger` to point to that path instead of using e.g. Rails logger {pull}1247[#1247]
+- Only send tracestate header for distributed tracing when it has content {pull}1277[#1277]
+- Use the hostname as the Kubernetes pod name in the Container Info metadata if the pod id is parsed from cgroup {pull}1314[#1314]
+
+====== Fixed
+
+- Small change to Sidekiq tests to handle new configuration passing method {pull}1283[#1283]
+- Set transaction sample rate to 0 when it's unsampled {pull}1339[#1339]
+- Don't send unsampled transactions to APM server >= 8.0 {pull}1341[#1341]
+
 [[release-notes-4.5.1]]
 ==== 4.5.1
 

data/Gemfile

@@ -46,11 +46,12 @@ if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
   gem 'google-protobuf', '< 3.12'
 end
 gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
-gem 'json', '2.6.2' # note: can be unpinned when https://github.com/flori/json/issues/495 is resolved
+gem 'json'
 gem 'json-schema', require: nil
 gem 'mongo', require: nil
 gem 'opentracing', require: nil
 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
@@ -77,6 +78,10 @@ frameworks_versions = parsed_frameworks.inject({}) do |frameworks, str|
 end
 
 frameworks_versions.each do |framework, version|
+  if framework =='rails' && RUBY_VERSION >= '3.1'
+    gem 'net-smtp', require: false
+  end
+
   case version
   when 'master' # sinatra, grape
     gem framework, github: GITHUB_REPOS.fetch(framework)
@@ -111,12 +116,14 @@ if RUBY_PLATFORM == 'java'
   end
 elsif frameworks_versions['rails'] =~ /^(4|5)/
   gem 'sqlite3', '~> 1.3.6'
+elsif RUBY_VERSION < '2.7'
+  gem 'sqlite3', '~> 1.4.4'
 else
   gem 'sqlite3'
 end
 
-# current sneakers only supports >=2.5.0
-if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.5.0')
+# sneakers main only supports >=2.5.0
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.5.0') && !defined?(JRUBY_VERSION)
   gem 'sneakers', github: 'jondot/sneakers', ref: 'd761dfe1493', require: nil
 end
 

data/bench/report.rb

@@ -11,7 +11,7 @@ git_date = `git log -n 1 --pretty="format:%ai"`
 platform = Gem::Platform.local
 
 def doc(payload)
-  puts({ index: { _index: "benchmark-ruby", _type: "_doc" } }.to_json)
+  puts({ index: { _index: "benchmark-ruby" } }.to_json)
   puts(payload.to_json)
 end
 

data/docker-compose.yml

@@ -6,6 +6,8 @@ services:
     image: mongo:latest
     volumes: ['mongodata:/data/db']
     ports: ['27017:27017']
+    security_opt:
+      - no-new-privileges
 
   specs:
     build:
@@ -27,12 +29,16 @@ services:
     depends_on:
       - mongodb
     user: ${USER_ID}
+    security_opt:
+      - no-new-privileges
 
   ruby_rspec:
     image: apm-agent-ruby:${RUBY_VERSION}
     environment:
       MONGODB_URL: 'mongodb:27017'
     user: ${USER_ID}
+    security_opt:
+      - no-new-privileges
 
 volumes:
   vendor: