elastic-apm 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a73b88b204253aeff8ed4da74f11be5e6a1bdd77cf3848495f823d225569177
-  data.tar.gz: 0e962b3216d0c8dc28666175e2db57bc2fe8826e52abe047f1be4b8903fe2a04
+  metadata.gz: 47f1adcea0273ee666706ddea65216aa0d8ba4d15acb14be64a425b77e1c188c
+  data.tar.gz: 7aa7372590f8c43585681cb84464af8bf984557699c43c09a4614f71e0cfc8b2
 SHA512:
-  metadata.gz: e5302421b067475c581dde24caa1dce14c755017915b0e69420f8c281785aea06a244231a1f9946a6cd14ddc216f3c0fb303c5d3be78dc2ac49233c7f6371d90
-  data.tar.gz: 700cb6b1445390110721447fdf3096e4dc25077c5e46c45b71818888b650af56460e9a94645cb51c45f37912a95e6244f58c9bdc4d89517fb3b7cf61d7bcd353
+  metadata.gz: d4afe772c0f242885882347f6c5ed3b6e319c533ab24f88e52ab3e5c68be16c33243529a642ff3644936218808b7163e7c60536c3632aa11c28d8072efc3ca21
+  data.tar.gz: 49a6baa392426cb6f51b1327b23fc0f0d7257685c26737e222613595fb68be80b44f00b39d309535b918315e7138ba48ae9100837a92160c62265bafa2140764

data/.ci/.jenkins_exclude.yml

@@ -0,0 +1,73 @@
+exclude:
+  # Tests fail, but we don't care
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: rails-4.2
+  - RUBY_VERSION: jruby:9.1
+    FRAMEWORK: rails-4.2
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
+    FRAMEWORK: rails-4.2
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: rails-4.2
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: rails-4.2
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
+    FRAMEWORK: rails-4.2
+
+  # Only test master on newest ruby
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: ruby:2.3
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: jruby:9.1
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: rails-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
+    FRAMEWORK: rails-master
+
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: ruby:2.3
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: jruby:9.1
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: sinatra-master
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
+    FRAMEWORK: sinatra-master
+
+  # Rails 6 beta
+  - RUBY_VERSION: ruby:2.5
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: ruby:2.3
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: jruby:9.2
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: jruby:9.1
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+    FRAMEWORK: rails-6.0-rc1
+  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
+    FRAMEWORK: rails-6.0-rc1

data/.ci/.jenkins_framework.yml

@@ -0,0 +1,12 @@
+FRAMEWORK:
+  - rails-6.0-rc1
+  - rails-5.2
+  - rails-5.1
+  - rails-5.0
+  - rails-4.2
+
+  - sinatra-2.0
+  - sinatra-1.4
+
+  - rails-master
+  - sinatra-master

data/.ci/.jenkins_ruby.yml

@@ -0,0 +1,11 @@
+RUBY_VERSION:
+  - ruby:2.6
+  - ruby:2.5
+  - ruby:2.4
+  - ruby:2.3
+  - jruby:9.2
+  - jruby:9.1
+  - docker.elastic.co/observability-ci/jruby:9.2-12-jdk
+  - docker.elastic.co/observability-ci/jruby:9.2-11-jdk
+  - docker.elastic.co/observability-ci/jruby:9.2-8-jdk
+  - docker.elastic.co/observability-ci/jruby:9.1-7-jdk

data/{Jenkinsfile → .ci/Jenkinsfile}

@@ -70,9 +70,9 @@ pipeline {
               rubyTasksGen = new RubyParallelTaskGenerator(
                 xKey: 'RUBY_VERSION',
                 yKey: 'FRAMEWORK',
-                xFile: "./spec/.jenkins_ruby.yml",
-                yFile: "./spec/.jenkins_framework.yml",
-                exclusionFile: "./spec/.jenkins_exclude.yml",
+                xFile: ".ci/.jenkins_ruby.yml",
+                yFile: ".ci/.jenkins_framework.yml",
+                exclusionFile: ".ci/.jenkins_exclude.yml",
                 tag: "Ruby",
                 name: "Ruby",
                 steps: this
@@ -123,7 +123,7 @@ pipeline {
                 unstash 'source'
                 dir("${BASE_DIR}"){
                   script {
-                    def versions = readYaml(file: "./spec/.jenkins_ruby.yml")
+                    def versions = readYaml(file: ".ci/.jenkins_ruby.yml")
                     def benchmarkTask = [:]
                     versions['RUBY_VERSION'].each{ v ->
                       benchmarkTask[v] = runBenchmark(v)
@@ -185,7 +185,7 @@ pipeline {
       }
     }
     post {
-      always{
+      cleanup {
         script{
           if(rubyTasksGen?.results){
             writeJSON(file: 'results.json', json: toJSON(rubyTasksGen.results), pretty: 2)

data/.ci/downstreamTests.groovy

@@ -0,0 +1,159 @@
+#!/usr/bin/env groovy
+@Library('apm@current') _
+
+import co.elastic.matrix.*
+import groovy.transform.Field
+
+/**
+This is the parallel tasks generator,
+it is need as field to store the results of the tests.
+*/
+@Field def rubyTasksGen
+
+pipeline {
+  agent any
+  environment {
+    REPO="git@github.com:elastic/apm-agent-ruby.git"
+    BASE_DIR="src/github.com/elastic/apm-agent-ruby"
+    PIPELINE_LOG_LEVEL='INFO'
+    NOTIFY_TO = credentials('notify-to')
+    JOB_GCS_BUCKET = credentials('gcs-bucket')
+    JOB_GIT_CREDENTIALS = "f6c7695a-671e-4f4f-a331-acdce44ff9ba"
+    DOCKER_REGISTRY = 'docker.elastic.co'
+    DOCKER_SECRET = 'secret/apm-team/ci/docker-registry/prod'
+    CODECOV_SECRET = 'secret/apm-team/ci/apm-agent-ruby-codecov'
+  }
+  options {
+    timeout(time: 2, unit: 'HOURS')
+    buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
+    timestamps()
+    ansiColor('xterm')
+    disableResume()
+    durabilityHint('PERFORMANCE_OPTIMIZED')
+    rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
+    quietPeriod(10)
+  }
+  parameters {
+    string(name: 'RUBY_VERSION', defaultValue: "ruby:2.6", description: "Ruby version to test")
+    string(name: 'BRANCH_SPECIFIER', defaultValue: "master", description: "Git branch/tag to use")
+    string(name: 'CHANGE_TARGET', defaultValue: "master", description: "Git branch/tag to merge before building")
+  }
+  stages {
+    /**
+    Checkout the code and stash it, to use it on other stages.
+    */
+    stage('Checkout') {
+      agent { label 'master || immutable' }
+      options { skipDefaultCheckout() }
+      steps {
+        deleteDir()
+        gitCheckout(basedir: "${BASE_DIR}", 
+          branch: "${params.BRANCH_SPECIFIER}",
+          repo: "${REPO}",
+          credentialsId: "${JOB_GIT_CREDENTIALS}",
+          mergeTarget: "${params.CHANGE_TARGET}",
+          reference: '/var/lib/jenkins/apm-agent-ruby.git')
+        stash allowEmpty: true, name: 'source', useDefaultExcludes: false
+      }
+    }
+    /**
+    Execute unit tests.
+    */
+    stage('Test') {
+      agent { label 'linux && immutable' }
+      options { skipDefaultCheckout() }
+      steps {
+        deleteDir()
+        unstash "source"
+        dir("${BASE_DIR}"){
+          script {
+            rubyTasksGen = new RubyParallelTaskGenerator(
+              xVersions: [ "${params.RUBY_VERSION}" ],
+              yKey: 'FRAMEWORK',
+              yFile: ".ci/.jenkins_framework.yml",
+              exclusionFile: ".ci/.jenkins_exclude.yml",
+              tag: "Ruby",
+              name: "Ruby",
+              steps: this
+            )
+            def mapPatallelTasks = rubyTasksGen.generateParallelTests()
+            parallel(mapPatallelTasks)
+          }
+        }
+      }
+    }
+  }
+  post {
+    cleanup {
+      script{
+        if(rubyTasksGen?.results){
+          writeJSON(file: 'results.json', json: toJSON(rubyTasksGen.results), pretty: 2)
+          def mapResults = ["Ruby": rubyTasksGen.results]
+          def processor = new ResultsProcessor()
+          processor.processResults(mapResults)
+          archiveArtifacts allowEmptyArchive: true, artifacts: 'results.json,results.html', defaultExcludes: false
+        }
+      }
+      notifyBuildResult()
+    }
+  }
+}
+
+/**
+Parallel task generator for the integration tests.
+*/
+class RubyParallelTaskGenerator extends DefaultParallelTaskGenerator {
+
+  public RubyParallelTaskGenerator(Map params){
+    super(params)
+  }
+
+  /**
+  build a clousure that launch and agent and execute the corresponding test script,
+  then store the results.
+  */
+  public Closure generateStep(x, y){
+    return {
+      steps.sleep steps.randomNumber(min:10, max: 30)
+      steps.node('linux && immutable'){
+        // Label is transformed to avoid using the internal docker registry in the x coordinate
+        // TODO: def label = "${tag}:${x?.drop(x?.lastIndexOf('/')+1)}#${y}"
+        def label = "${tag}:${x}#${y}"
+        try {
+          steps.runScript(label: label, ruby: x, framework: y)
+          saveResult(x, y, 1)
+        } catch(e){
+          saveResult(x, y, 0)
+          steps.error("${label} tests failed : ${e.toString()}\n")
+        } finally {
+          steps.junit(allowEmptyResults: false,
+            keepLongStdio: true,
+            testResults: "**/spec/ruby-agent-junit.xml")
+          steps.codecov(repo: "${steps.env.REPO}", basedir: "${steps.env.BASE_DIR}",
+            secret: "${steps.env.CODECOV_SECRET}")
+        }
+      }
+    }
+  }
+}
+
+/**
+  Run tests for a Ruby version and framework version.
+*/
+def runScript(Map params = [:]){
+  def label = params.label
+  def ruby = params.ruby
+  def framework = params.framework
+  log(level: 'INFO', text: "${label}")
+  env.HOME = "${env.WORKSPACE}"
+  env.PATH = "${env.PATH}:${env.WORKSPACE}/bin"
+  deleteDir()
+  unstash 'source'
+  dir("${BASE_DIR}"){
+    retry(2){
+      sleep randomNumber(min:10, max: 30)
+      dockerLogin(secret: "${DOCKER_SECRET}", registry: "${DOCKER_REGISTRY}")
+      sh("./spec/scripts/spec.sh ${ruby} ${framework}")
+    }
+  }
+}

data/.ci/jobs/apm-agent-ruby-downstream.yml

@@ -0,0 +1,6 @@
+---
+- job:
+    name: apm-agent-ruby/apm-agent-ruby-downstream
+    display-name: APM Agent Ruby Downstream
+    description: APM Agent Ruby Downstream .
+    script-path: .ci/downstreamTests.groovy

data/.ci/jobs/apm-agent-ruby-mbp.yml

@@ -3,3 +3,4 @@
     name: apm-agent-ruby/apm-agent-ruby-mbp
     display-name: APM Agent Ruby
     description: APM Agent Ruby
+    script-path: .ci/Jenkinsfile

data/.ci/jobs/defaults.yml

@@ -13,11 +13,11 @@
     logrotate:
       daysToKeep: 30
       numToKeep: 100
-    number-to-keep: '5'
-    days-to-keep: '1'
+    number-to-keep: '100'
+    days-to-keep: '30'
     concurrent: true
     node: linux
-    script-path: Jenkinsfile
+    script-path: .ci/Jenkinsfile
     scm:
     - github:
         branch-discovery: all

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.9.1 (2019-06-28)
+
+### Fixed
+
+- Use system CA certificate if none is specified ([#460](https://github.com/elastic/apm-agent-ruby/pull/460))
+
 ## 2.9.0 (2019-06-25)
 
 ### Security

data/lib/elastic_apm/transport/connection.rb

@@ -136,6 +136,9 @@ module ElasticAPM
         OpenSSL::SSL::SSLContext.new.tap do |context|
           if @config.server_ca_cert
             context.ca_file = @config.server_ca_cert
+          else
+            context.cert_store =
+              OpenSSL::X509::Store.new.tap(&:set_default_paths)
           end
 
           context.verify_mode =

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '2.9.0'
+  VERSION = '2.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -45,7 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ci/.jenkins_exclude.yml"
+- ".ci/.jenkins_framework.yml"
+- ".ci/.jenkins_ruby.yml"
+- ".ci/Jenkinsfile"
 - ".ci/bin/check_paths_for_matches.py"
+- ".ci/downstreamTests.groovy"
+- ".ci/jobs/apm-agent-ruby-downstream.yml"
 - ".ci/jobs/apm-agent-ruby-mbp.yml"
 - ".ci/jobs/apm-agent-ruby.yml"
 - ".ci/jobs/defaults.yml"
@@ -57,7 +63,6 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
-- Jenkinsfile
 - LICENSE
 - README.md
 - Rakefile