elastic-apm 4.5.0 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c396bc981217532f2d6775de89e9a2aa7a1bcd501100588bbd700d0f4f2eb590
-  data.tar.gz: 94f859585a09fc99f02a4bbd261193e0ed1f74bdb9463968692a16f277b1e4f0
+  metadata.gz: f7c28585ab44cfdb7a4eb8c32b8dd60e1ecb10c091357c25a6b13f35a0fe2ffc
+  data.tar.gz: 3aad55a03f8c2a4d824ea09731be304e7712ee306dc4e585c5cc29ba11e25413
 SHA512:
-  metadata.gz: ae66a68c4651f695361b2028bf76132e8bc257fc141d3ad2872786bbab10b8e19bc3609a84478de53e56ad0c15695ad7debbcf62c4af8997833d0cf7cc7f6d23
-  data.tar.gz: c6b9fd6f80de4139cac0dd040e45d56f869eb2ff8b3db38df376e898490b8c2a5523a9bb3f1ba73a8583356ae5647ec67835b994597dc3db8d72c62ee506794f
+  metadata.gz: eb6480a61567bd000e5325e12702c46882a42a9c452a60bd7af997b7138b076cd332d853f101b694af30d120bdd3b48f1b911feb6ecf12e94cdfc58ba096855c
+  data.tar.gz: e626d4a1cb9370780d764385585fb4c4025d612a84b7ef36ae0525f6d6f6a83ddf7d5aa670ccf2610bf10f9e2c2d9a87f2f97818cc9e8de27153c3a85cd34875

data/.ci/.jenkins_exclude.yml

@@ -1,27 +1,31 @@
 exclude:
-  # Ruby 2.3
-  # Only includes rails-5.2, sinatra-2.0
-  - RUBY_VERSION: ruby:2.3
+  # Ruby 2.4
+  # 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.3
+  - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-6.0
-  - RUBY_VERSION: ruby:2.3
+  - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: grape-1.5
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.0
-  - RUBY_VERSION: ruby:2.3
+  - RUBY_VERSION: ruby:2.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.2,rails-6.0
+  - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: ruby:2.3
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: ruby:2.4
     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 main 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,21 +81,39 @@ 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: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: rails-7.0
+
+  # Only test sinatra main on ruby 2.7 and ruby 3.1
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: ruby:2.6
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: sinatra-main
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: sinatra-main
 
   # Only test grape master on ruby 2.7 and ruby 3.0
   - RUBY_VERSION: ruby:2.6
@@ -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.5
+    FRAMEWORK: grape-1.6
   - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.5,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.2,rails-6.1
   - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # Ruby 2.5
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-7.0
+  # Ruby 2.4
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: grape-1.5,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.5,sinatra-2.0,rails-6.1
+    FRAMEWORK: grape-1.6,sinatra-2.2,rails-6.1
+  - RUBY_VERSION: jruby:9.2
+    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.2,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
+    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.5,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-11-jdk
+    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.5,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.5
+  - grape-1.6
 
-  - grape-1.5,sinatra-2.0,rails-6.1
+  - grape-1.6,sinatra-2.2,rails-6.1

data/.ci/.jenkins_main_framework.yml

@@ -0,0 +1,4 @@
+FRAMEWORK:
+  #- rails-main
+  - sinatra-main
+  - grape-master

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/master'
     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')
@@ -42,7 +41,7 @@ pipeline {
     issueCommentTrigger("(${obltGitHubComments()}|^run benchmark tests)")
   }
   parameters {
-    booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
+    booleanParam(name: 'Run_As_Main_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on main branch.')
     booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable run benchmarks.')
   }
   stages {
@@ -71,7 +70,7 @@ pipeline {
           expression { return env.ONLY_DOCS == "false" }
           anyOf {
             not { changeRequest() }
-            expression { return params.Run_As_Master_Branch }
+            expression { return params.Run_As_Main_Branch }
           }
         }
       }
@@ -115,32 +114,44 @@ pipeline {
             }
           }
         }
-        stage('Master Tests frameworks') {
+        stage('Main Tests frameworks') {
           options { skipDefaultCheckout() }
           steps {
-            catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE', message: "The tests for the master framework have failed. Let's warn instead.") {
-              runTests('.ci/.jenkins_master_framework.yml')
+            catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE', message: "The tests for the main framework have failed. Let's warn instead.") {
+              runTests('.ci/.jenkins_main_framework.yml')
             }
           }
         }
-        stage('Integration Tests') {
-          agent none
-          when {
-            beforeAgent true
-            anyOf {
-              changeRequest()
-              expression { return !params.Run_As_Master_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) ])
-          }
         }
       }
     }
@@ -150,11 +161,11 @@ pipeline {
         beforeAgent true
         allOf {
           anyOf {
-            branch 'master'
+            branch 'main'
             branch "\\d+\\.\\d+"
             branch "v\\d?"
             tag pattern: 'v\\d+.*', comparator: "REGEXP"
-            expression { return params.Run_As_Master_Branch }
+            expression { return params.Run_As_Main_Branch }
             expression { return env.GITHUB_COMMENT?.contains('benchmark tests') }
           }
           expression { return params.bench_ci }
@@ -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 {
@@ -256,11 +266,12 @@ pipeline {
               (retry 10 curl --silent --show-error --fail -I https://rubygems.org/gems/elastic-apm/versions/${env.VERSION})
             """
             dir("${OPBEANS_REPO}"){
-              git credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
-                  url: "git@github.com:elastic/${OPBEANS_REPO}.git"
+              git(credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
+                  url: "git@github.com:elastic/${OPBEANS_REPO}.git",
+                  branch: 'main')
               // It's required to transform the tag value to the gem version
               sh script: ".ci/bump-version.sh ${env.VERSION}", label: 'Bump version'
-              // The opbeans pipeline will trigger a release for the master branch
+              // The opbeans pipeline will trigger a release for the main branch
               gitPush()
               // The opbeans pipeline will trigger a release for the release tag
               gitCreateTag(tag: "${env.BRANCH_NAME}")
@@ -282,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
@@ -298,8 +309,6 @@ def runBenchmark(version){
             }
             try{
               sh """./spec/scripts/benchmarks.sh "${version}" "${REFERENCE_REPO}" """
-            } catch(e){
-              throw e
             } finally {
               archiveArtifacts(
                 allowEmptyArchive: true,
@@ -307,6 +316,7 @@ def runBenchmark(version){
                 onlyIfSuccessful: false)
               sendBenchmarks(file: "benchmark-${transformedVersion}.bulk",
                 index: "benchmark-ruby", archive: true)
+              cleanWs(notFailBuild: true)
             }
           }
         }
@@ -410,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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.16.0
-ENV JRUBY_SHA256 9199707712c683c525252ccb1de5cb8e75f53b790c5b57a18f6367039ec79553
 
 RUN mkdir -p /opt/jruby \
+    && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz.sha256 -o /tmp/jruby.sha256 \
     && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
-    && echo "$JRUBY_SHA256 */tmp/jruby.tar.gz" | sha256sum -c - \
+    && echo "$(cat /tmp/jruby.sha256) */tmp/jruby.tar.gz" | sha256sum -c - \
     && tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
     && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
 
@@ -25,7 +25,9 @@ RUN mkdir -p /opt/jruby/etc \
     } >> /opt/jruby/etc/gemrc
 
 # install bundler, gem requires bash to work
-RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+# https://github.com/rubygems/rubygems/issues/2534#issuecomment-448843746
+RUN gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems) \
+    && gem install bundler:2.3.26 rake net-telnet xmlrpc tzinfo-data
 
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
@@ -38,4 +40,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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.0
-ENV JRUBY_SHA256 9199707712c683c525252ccb1de5cb8e75f53b790c5b57a18f6367039ec79553
 
 RUN mkdir -p /opt/jruby \
+    && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz.sha256 -o /tmp/jruby.sha256 \
     && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
-    && echo "$JRUBY_SHA256 */tmp/jruby.tar.gz" | sha256sum -c - \
+    && echo "$(cat /tmp/jruby.sha256) */tmp/jruby.tar.gz" | sha256sum -c - \
     && tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
     && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
 
@@ -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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.0
-ENV JRUBY_SHA256 9199707712c683c525252ccb1de5cb8e75f53b790c5b57a18f6367039ec79553
 
 RUN mkdir -p /opt/jruby \
+    && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz.sha256 -o /tmp/jruby.sha256 \
     && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
-    && echo "$JRUBY_SHA256 */tmp/jruby.tar.gz" | sha256sum -c - \
+    && echo "$(cat /tmp/jruby.sha256) */tmp/jruby.tar.gz" | sha256sum -c - \
     && tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
     && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
 
@@ -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

@@ -2,15 +2,15 @@ FROM openjdk:7-jdk
 
 RUN apt-get update \
     && apt-get install -y libc6-dev --no-install-recommends \
-    && apt-get install -y gcc \
+    && apt-get install --force-yes -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.0
-ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
 
 RUN mkdir -p /opt/jruby \
+    && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz.sha256 -o /tmp/jruby.sha256 \
     && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
-    && echo "$JRUBY_SHA256 */tmp/jruby.tar.gz" | sha256sum -c - \
+    && echo "$(cat /tmp/jruby.sha256) */tmp/jruby.tar.gz" | sha256sum -c - \
     && tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
     && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
 
@@ -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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.14.0
-ENV JRUBY_SHA256 9199707712c683c525252ccb1de5cb8e75f53b790c5b57a18f6367039ec79553
 
 RUN mkdir -p /opt/jruby \
+    && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz.sha256 -o /tmp/jruby.sha256 \
     && curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
-    && echo "$JRUBY_SHA256 */tmp/jruby.tar.gz" | sha256sum -c - \
+    && echo "$(cat /tmp/jruby.sha256) */tmp/jruby.tar.gz" | sha256sum -c - \
     && tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
     && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
 
@@ -25,7 +25,9 @@ RUN mkdir -p /opt/jruby/etc \
     } >> /opt/jruby/etc/gemrc
 
 # install bundler, gem requires bash to work
-RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+# https://github.com/rubygems/rubygems/issues/2534#issuecomment-448843746
+RUN gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems) \
+    && gem install bundler:2.3.26 rake net-telnet xmlrpc tzinfo-data
 
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
@@ -38,4 +40,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/README.md

@@ -12,7 +12,7 @@ To build the images run
 
 You can set your own docker registry with the flag `--registry x.y.z/org`
 
-You can exclude what images can be built with the flag `--exclude jdk-7`
+You can exclude what images can be built with the flag `--exclude jdk-7`. Multiple usages of `--exclude` are accepted.
 
 ## Test
 

data/.ci/docker/jruby/run.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -o pipefail
+
+# 7-jdk is excluded by default. See https://github.com/elastic/apm-agent-ruby/pull/1367#issuecomment-1437228929
+EXCLUDE=("7-jdk")
+
 while (( "$#" )); do
   case "$1" in
     -r|--registry)
@@ -7,7 +12,7 @@ while (( "$#" )); do
       shift 2
       ;;
     -e|--exclude)
-      EXCLUDE=$2
+      EXCLUDE+=("$2")
       shift 2
       ;;
     -a|--action)
@@ -28,12 +33,13 @@ while (( "$#" )); do
   esac
 done
 
+function convert_exclude_opts() {
+    for val in "${EXCLUDE[@]}"; do
+      printf "! -path \"./%s/*\" " $val
+    done
+}
 
-if [ -n "$EXCLUDE" ] ; then
-  search=$(find . -path ./$EXCLUDE -prune -o -name 'Dockerfile' -print)
-else
-  search=$(find . -name 'Dockerfile' -print)
-fi
+search=$(bash -c "find . -name 'Dockerfile' $(convert_exclude_opts) -print")
 
 function report {
   if [ $1 -eq 0 ] ; then
@@ -43,7 +49,18 @@ function report {
   fi
 }
 
+function max {
+  if [ "$1" -gt "$2" ]; then
+    echo "$1"
+  else
+    echo "$2"
+  fi
+}
+
 echo "${ACTION} docker images"
+
+EXIT_CODE=0
+
 for i in ${search}; do
   jdk_image=$(basename `dirname "$i"`)
   jdk_version=$(echo "$jdk_image" | cut -d'-' -f1)
@@ -63,11 +80,18 @@ for i in ${search}; do
 
   if [ "${ACTION}" == "build" ] ; then
     docker build --tag "${name}" -< $i >> output.log 2>&1
-    report $? "${name}"
+    result=$?
+    report $result "${name}"
   elif [ "${ACTION}" == "push" ] ; then
     docker push "${name}" >> output.log 2>&1
-    report $? "${name}"
+    result=$?
+    report $result "${name}"
   else
     ./test.sh "${name}" $jdk_version
+    result=$?
   fi
-done
+
+  EXIT_CODE=$(max $EXIT_CODE $result)
+done
+
+exit "${EXIT_CODE}"