elastic-apm 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ba0e1480f379488014123efe0974b22741593d451f1a501390dd0f8af17be2
-  data.tar.gz: f448574e08404ef0354998ef7e87173e653ef837309a3114f8694dcae97dbae3
+  metadata.gz: e226ecd39fc71213084dffaefbd4343c1d5f5d78a4d8fc91786dca9f5e865533
+  data.tar.gz: a0289b4872d55be4132b6982da072844ce71b2a6723877626584c1f5e8d7315f
 SHA512:
-  metadata.gz: d7a730f4a97d7c974fa6f8d4acd5f5d5274f552eeeaacf169d2feb27e19b0b8ac1959df2cd8efa7718517cdf7bd1f81ad6e09d3fc57bba1f96d48b5c7572c472
-  data.tar.gz: 0e695ab76052b342ae71ba7e4eed6a6a03f1368ac67638fbc3a4e8ef2c1558e183d3911eeb38aba296d4ae469f37c4665123f4fe204760ce9f74dcdc238150ee
+  metadata.gz: 641923b3afdf3c3fe258053a2f2492092aa1af5a35a50c3783b6e7d0d00e6198f8454c95fb4f2eca0a1ea83f59afd552c600ffaed34efa0aeecf44d40b9948cd
+  data.tar.gz: 427eee529da777c98d4c4c02eb79f5aba46200e92edcac1f31b5bbd38df55f78801d92de063c37a54ffecf2fe3777697495c745f8334d3fdae4509626b1e1350

data/.ci/Jenkinsfile

@@ -104,158 +104,162 @@ pipeline {
                 testTasks[rubyVersion] = { runJob(rubyVersion, i++) }
               }
               parallel(testTasks)
-              }
             }
           }
         }
       }
-      stage('Benchmarks') {
-        options { skipDefaultCheckout() }
-        when {
-          beforeAgent true
-          allOf {
-            anyOf {
-              branch 'master'
-              branch "\\d+\\.\\d+"
-              branch "v\\d?"
-              tag "v\\d+\\.\\d+\\.\\d+*"
-              expression { return params.Run_As_Master_Branch }
-            }
-            expression { return params.bench_ci }
+    }
+    stage('Integration Tests') {
+      agent none
+      when {
+        beforeAgent true
+        anyOf {
+          changeRequest()
+          expression { return !params.Run_As_Master_Branch }
+        }
+      }
+      steps {
+        build(job: env.ITS_PIPELINE, propagate: false, wait: false,
+              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)])
+        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('/','+')}")
+      }
+    }
+    stage('Benchmarks') {
+      options { skipDefaultCheckout() }
+      when {
+        beforeAgent true
+        allOf {
+          anyOf {
+            branch 'master'
+            branch "\\d+\\.\\d+"
+            branch "v\\d?"
+            tag "v\\d+\\.\\d+\\.\\d+*"
+            expression { return params.Run_As_Master_Branch }
           }
+          expression { return params.bench_ci }
         }
-        stages {
-          stage('Clean Workspace') {
-            agent { label 'metal' }
-            steps {
-              echo "Cleaning Workspace"
-            }
-            post {
-              always {
-                cleanWs()
-              }
+      }
+      stages {
+        stage('Clean Workspace') {
+          agent { label 'metal' }
+          steps {
+            echo "Cleaning Workspace"
+          }
+          post {
+            always {
+              cleanWs()
             }
           }
-          /**
-            Run the benchmarks and store the results on ES.
-            The result JSON files are also archive into Jenkins.
-          */
-          stage('Run Benchmarks') {
-            steps {
-              withGithubNotify(context: 'Run Benchmarks') {
-                deleteDir()
-                unstash 'source'
-                dir("${BASE_DIR}"){
-                  script {
-                    def versions = readYaml(file: ".ci/.jenkins_ruby.yml")
-                    def benchmarkTask = [:]
-                    versions['RUBY_VERSION'].each{ v ->
-                      benchmarkTask[v] = runBenchmark(v)
-                    }
-                    parallel(benchmarkTask)
+        }
+        /**
+          Run the benchmarks and store the results on ES.
+          The result JSON files are also archive into Jenkins.
+        */
+        stage('Run Benchmarks') {
+          steps {
+            withGithubNotify(context: 'Run Benchmarks') {
+              deleteDir()
+              unstash 'source'
+              dir("${BASE_DIR}"){
+                script {
+                  def versions = readYaml(file: ".ci/.jenkins_ruby.yml")
+                  def benchmarkTask = [:]
+                  versions['RUBY_VERSION'].each{ v ->
+                    benchmarkTask[v] = runBenchmark(v)
                   }
+                  parallel(benchmarkTask)
                 }
               }
             }
           }
         }
       }
-      stage('Populate Downstream failures') {
-        when {
-          expression { return rubyTasksFailed }
-        }
-        steps {
-          script {
-            def message = 'Failures when running the "Test" stage'
-            if (notifyBuildResult.isAnyDownstreamJobFailedWithTimeout(rubyDownstreamJobs)) {
-              message += ' related to a timeout issue'
-            }
-            error(message)
-          }
-        }
+    }
+    stage('Populate Downstream failures') {
+      when {
+        expression { return rubyTasksFailed }
       }
-      stage('Integration Tests') {
-        agent none
-        when {
-          beforeAgent true
-          anyOf {
-            changeRequest()
-            expression { return !params.Run_As_Master_Branch }
+      steps {
+        script {
+          def message = 'Failures when running the "Test" stage'
+          if (notifyBuildResult.isAnyDownstreamJobFailedWithTimeout(rubyDownstreamJobs)) {
+            message += ' related to a timeout issue'
           }
-        }
-        steps {
-          log(level: 'INFO', text: 'Launching Async ITs')
-          build(job: env.ITS_PIPELINE, propagate: false, wait: false,
-                parameters: [string(name: 'AGENT_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}"),
-                             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)]
-          )
-          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('/','+')}")
+          error(message)
         }
       }
-      stage('Release') {
-        options { skipDefaultCheckout() }
-        environment {
-          RUBY_DOCKER_TAG = 'ruby:2.6'
-          HOME = '/var/lib/jenkins'
-        }
-        when {
-          beforeAgent true
-          tag pattern: 'v\\d+.*', comparator: 'REGEXP'
+    }
+    stage('Release') {
+      options { skipDefaultCheckout() }
+      environment {
+        RUBY_DOCKER_TAG = 'ruby:2.6'
+        HOME = '/var/lib/jenkins'
+      }
+      when {
+        beforeAgent true
+        tag pattern: 'v\\d+.*', comparator: 'REGEXP'
+      }
+      stages {
+        stage('Release') {
+          steps {
+            deleteDir()
+            unstash 'source'
+            prepareRelease(){
+              sh 'rake release'
+            }
+          }
         }
-        stages {
-          stage('Release') {
-            steps {
-              withGithubNotify(context: 'Release') {
-                deleteDir()
-                unstash 'source'
-                script {
-                  dir(BASE_DIR){
-                    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}") {
-                          sshagent(['f6c7695a-671e-4f4f-a331-acdce44ff9ba']) {
-                            sh '.ci/prepare-git-context.sh'
-                            sh 'gem install rake yard rspec'
-                            sh 'rake release'
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
+        stage('Update Branch') {
+          steps {
+            deleteDir()
+            unstash 'source'
+            prepareRelease(){
+              catchError(buildResult: 'SUCCESS', message: 'Update branch task failed', stageResult: 'UNSTABLE') {
+                sh 'rake release:update_branch'
               }
             }
           }
-          stage('Opbeans') {
-            environment {
-              REPO_NAME = "${OPBEANS_REPO}"
+          post {
+            unsuccessful {
+              emailext subject: "[${env.REPO}] Syncup post-release stage failed.", to: "${NOTIFY_TO}",
+                        body: "Please go to ${env.BUILD_URL} to review the logs. Most likely you need to update the branch manually."
             }
-            steps {
-              deleteDir()
-              dir("${OPBEANS_REPO}"){
-                git credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
-                    url: "git@github.com:elastic/${OPBEANS_REPO}.git"
-                // It's required to transform the tag value to the gem version
-                sh script: ".ci/bump-version.sh ${env.BRANCH_NAME.replaceAll('^v', '')}", label: 'Bump version'
-                // The opbeans pipeline will trigger a release for the master branch
-                gitPush()
-                // The opbeans pipeline will trigger a release for the release tag
-                gitCreateTag(tag: "${env.BRANCH_NAME}")
-              }
+          }
+        }
+        stage('Opbeans') {
+          environment {
+            REPO_NAME = "${OPBEANS_REPO}"
+            VERSION = "${env.BRANCH_NAME.replaceAll('^v', '')}"
+          }
+          steps {
+            deleteDir()
+            // Let's wait for the Gem to be available
+            sh "(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"
+              // 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
+              gitPush()
+              // The opbeans pipeline will trigger a release for the release tag
+              gitCreateTag(tag: "${env.BRANCH_NAME}")
             }
           }
         }
       }
     }
-    post {
-      cleanup {
-        notifyBuildResult(downstreamJobs: rubyDownstreamJobs)
-      }
+  }
+  post {
+    cleanup {
+      notifyBuildResult(downstreamJobs: rubyDownstreamJobs)
     }
   }
+}
 
 /**
   Run benchmarks for a Ruby version, then report the results to the Elasticsearch server.
@@ -314,3 +318,19 @@ def runJob(String rubyVersion, int sleep = 1){
     rubyDownstreamJobs["${rubyVersion}"] = buildObject
   }
 }
+
+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') {
+      withEnv(["HOME=${env.WORKSPACE}/${env.BASE_DIR ?: ''}"]) {
+        rubygemsLogin.withApi(secret: "${env.RELEASE_SECRET}") {
+          sshagent(['f6c7695a-671e-4f4f-a331-acdce44ff9ba']) {
+            sh '.ci/prepare-git-context.sh'
+            sh 'gem install rake yard rspec'
+            body()
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,40 @@
+FROM openjdk:11-jdk
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM adoptopenjdk:12-jdk-openj9
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev git tcc netbase --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM openjdk:13-jdk-slim
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev git tcc curl netbase --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM openjdk:7-jdk
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.1.17.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]