elastic-apm 3.12.0 → 4.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c810b4e9b4f1149873235af4d1ddd6b4a85acf7734c491a42d21777443d57a0
-  data.tar.gz: f63af16c444a3a5499cd9246b1d11bba2cd9a7a31efed58bfd23d5b1c8b3e0d3
+  metadata.gz: d2edbff5770e48799701579f045a0ed3871da1b65037ec0a951ecd106138202c
+  data.tar.gz: 750e7a30a2a69e5c36d35373d842eec64e8e89b5bab66ce6d4c25c69564fb38e
 SHA512:
-  metadata.gz: ed48f7f3870b346a17ec5e263c90c67f68b1f355a4900c3a79ae998bf689b1b549e6658d7c4165b934091669734bea561acf9991b82446a6ca4164558a488301
-  data.tar.gz: f87f347bf3a72e8d331e95d95ceca640d12754cb049ce4c39097b03b75d022c347f95062d3e311e0fb0cbc90f61050449ed1bd6f39f8682c95e935fccf7509f9
+  metadata.gz: 6add102bc8f803850243de2c7ef517f0be8ab57b8cc89f0d251034b86d83d5073685b3266123b3813496fd1c57fbc7f9c8855df63c5bcf8c35c807a746800803
+  data.tar.gz: fadf416339fa263a2bae03832fa9d46038953f563117c1bfb0623118364bc0bd40d75ca31585cb775d2d69cf708c0848e033c4b7dcae231b2832b6f83da41918

data/.ci/.jenkins_codecov.yml

@@ -2,4 +2,4 @@
 # Tuple of ruby version and frameworks which are in charge to send data to codecov.
 # # is the separator between the ruby version and the framework.
 ENABLED:
-  - ruby:2.6#rails-6.0
+  - ruby:2.7#rails-6.1

data/.ci/.jenkins_exclude.yml

@@ -2,91 +2,79 @@ exclude:
   # Ruby 2.3
   # Only includes rails-5.2, sinatra-2.0
   - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: rails-6.0
-  - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: rails-5.1
+    FRAMEWORK: rails-6.1
   - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: rails-5.0
+    FRAMEWORK: rails-6.0
   - RUBY_VERSION: ruby:2.3
     FRAMEWORK: rails-4.2
   - RUBY_VERSION: ruby:2.3
     FRAMEWORK: sinatra-1.4
   - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: grape-1.3
+    FRAMEWORK: grape-1.5
   - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.0
   - RUBY_VERSION: ruby:2.3
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.3
     FRAMEWORK: sinatra-master
   - RUBY_VERSION: ruby:2.3
     FRAMEWORK: grape-master
 
+  # rails-4.2 exclusions
+  # Only test on ruby 2.6, 2.5, 2.4, 2.3
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: rails-4.2
   - RUBY_VERSION: ruby:2.7
     FRAMEWORK: rails-4.2
   - 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-13-jdk
     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
 
+  # rails-6.0 and rails-6.1 exclusions
+  # Don't test on ruby 2.4
+  - RUBY_VERSION: ruby:2.4
+    FRAMEWORK: rails-6.1
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.0
-  - RUBY_VERSION: jruby:9.1
-    FRAMEWORK: rails-6.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
     FRAMEWORK: rails-6.0
 
-  # Only test master on newest ruby
+  # Only test rails master on ruby 2.7 and ruby 3.0
   - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-master
-  - RUBY_VERSION: jruby:9.1
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-master
+    FRAMEWORK: rails-main
   - 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
+    FRAMEWORK: rails-main
 
+  # Only test sinatra master on ruby 2.7 and ruby 3.0
+  - RUBY_VERSION: ruby:2.6
+    FRAMEWORK: sinatra-master
   - RUBY_VERSION: ruby:2.5
     FRAMEWORK: sinatra-master
   - RUBY_VERSION: ruby:2.4
     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-13-jdk
     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
 
+  # Only test grape master on ruby 2.7 and ruby 3.0
   - RUBY_VERSION: ruby:2.6
     FRAMEWORK: grape-master
   - RUBY_VERSION: ruby:2.5
@@ -95,42 +83,39 @@ exclude:
     FRAMEWORK: grape-master
   - RUBY_VERSION: jruby:9.2
     FRAMEWORK: grape-master
-  - RUBY_VERSION: jruby:9.1
-    FRAMEWORK: grape-master
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
     FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
-    FRAMEWORK: grape-master
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
     FRAMEWORK: grape-master
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
     FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
-    FRAMEWORK: grape-master
 
-  # Unsupported
-  - RUBY_VERSION: jruby:9.1
-    FRAMEWORK: grape-1.3
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
-    FRAMEWORK: grape-1.3
+  # grape 1.5 doesn't support ruby 3.0
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: grape-1.5
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
+
+  # only test ruby 3.0 with rails 6.0 and rails 6.1
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: rails-5.2
+  - RUBY_VERSION: ruby:3.0
+    FRAMEWORK: rails-5.1
 
+  # Unsupported
   - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    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
   - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
-  - RUBY_VERSION: jruby:9.1
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-12-jdk
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.1-7-jdk
-    FRAMEWORK: grape-1.3,sinatra-2.0,rails-6.0
+    FRAMEWORK: grape-1.5,sinatra-2.0,rails-6.1

data/.ci/.jenkins_framework.yml

@@ -1,13 +1,12 @@
 FRAMEWORK:
+  - rails-6.1
   - rails-6.0
   - rails-5.2
-  - rails-5.1
-  - rails-5.0
   - rails-4.2
 
   - sinatra-2.0
   - sinatra-1.4
 
-  - grape-1.3
+  - grape-1.5
 
-  - grape-1.3,sinatra-2.0,rails-6.0
+  - grape-1.5,sinatra-2.0,rails-6.1

data/.ci/.jenkins_master_framework.yml

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

data/.ci/.jenkins_ruby.yml

@@ -1,13 +1,10 @@
 RUBY_VERSION:
+  - ruby:3.0
   - ruby:2.7
   - 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-13-jdk
-  - 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/.ci/Jenkinsfile

@@ -26,6 +26,7 @@ pipeline {
     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'
   }
   options {
     timeout(time: 2, unit: 'HOURS')
@@ -206,6 +207,12 @@ pipeline {
         tag pattern: 'v\\d+.*', comparator: 'REGEXP'
       }
       stages {
+        stage('Notify') {
+          steps {
+            notifyStatus(slackStatus: 'warning', subject: "[${env.REPO}] Release *${env.TAG_NAME}* ready to be pushed",
+                         body: "(<${env.RUN_DISPLAY_URL}|Open>).\n Changes: ${env.TAG_NAME}")
+          }
+        }
         stage('Release') {
           steps {
             deleteDir()
@@ -226,9 +233,13 @@ pipeline {
             }
           }
           post {
+            success {
+              notifyStatus(slackStatus: 'good', subject: "[${env.REPO}] Release *${env.TAG_NAME}* published",
+                           body: "Great news, the release has been done successfully. (<${env.RUN_DISPLAY_URL}|Open>).")
+            }
             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."
+              notifyStatus(slackStatus: 'warning', subject: "[${env.REPO}] Release *${env.TAG_NAME}* has some sync-up post-release failures.",
+                           body: "Please go to ${env.BUILD_URL} to review the logs. Most likely you need to update the branch manually. (<${env.RUN_DISPLAY_URL}|Open>)")
             }
           }
         }
@@ -417,3 +428,12 @@ def prepareRelease(Closure body){
 def normalise(def what) {
   return what.replaceAll('.*/', '').replaceAll(':', '-')
 }
+
+def notifyStatus(def args = [:]) {
+  releaseNotification(slackChannel: "${env.SLACK_CHANNEL}",
+                      slackColor: args.slackStatus,
+                      slackCredentialsId: 'jenkins-slack-integration-token',
+                      to: "${env.NOTIFY_TO}",
+                      subject: args.subject,
+                      body: args.body)
+}

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

@@ -2,6 +2,7 @@ FROM openjdk:11-jdk
 
 RUN apt-get update \
     && apt-get install -y libc6-dev --no-install-recommends \
+    && apt-get install -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.10.0
@@ -37,4 +38,4 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-CMD [ "irb" ]
+CMD [ "irb" ]

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

@@ -2,6 +2,7 @@ FROM adoptopenjdk:12-jdk-openj9
 
 RUN apt-get update \
     && apt-get install -y libc6-dev git tcc netbase --no-install-recommends \
+    && apt-get install -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.10.0
@@ -37,4 +38,4 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-CMD [ "irb" ]
+CMD [ "irb" ]

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

@@ -2,6 +2,7 @@ FROM openjdk:13-jdk-slim
 
 RUN apt-get update \
     && apt-get install -y libc6-dev git tcc curl netbase --no-install-recommends \
+    && apt-get install -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.10.0
@@ -37,4 +38,4 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-CMD [ "irb" ]
+CMD [ "irb" ]

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

@@ -2,6 +2,7 @@ FROM openjdk:7-jdk
 
 RUN apt-get update \
     && apt-get install -y libc6-dev --no-install-recommends \
+    && apt-get install -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.1.17.0
@@ -37,4 +38,4 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-CMD [ "irb" ]
+CMD [ "irb" ]

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

@@ -2,6 +2,7 @@ FROM openjdk:8-jdk
 
 RUN apt-get update \
     && apt-get install -y libc6-dev --no-install-recommends \
+    && apt-get install -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.10.0
@@ -37,4 +38,4 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
-CMD [ "irb" ]
+CMD [ "irb" ]

data/.github/labeler-config.yml

@@ -0,0 +1,3 @@
+# add 'agent-ruby' label to all new issues
+agent-ruby:
+  - '.*'

data/.github/workflows/addToProject.yml

@@ -0,0 +1,29 @@
+name: Auto Assign to Project(s)
+
+on:
+  issues:
+    types: [opened, edited, milestoned]
+  pull_request_target:
+    types: [opened, edited, milestoned]
+env:
+  MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }}
+
+jobs:
+  assign_one_project:
+    runs-on: ubuntu-latest
+    name: Assign milestoned to Project
+    steps:
+    - name: Assign issues with milestones to project
+      uses: elastic/assign-one-project-github-action@1.2.2
+      if: github.event.issue && github.event.issue.milestone
+      with:
+        project: 'https://github.com/orgs/elastic/projects/454'
+        project_id: '5882982'
+        column_name: 'Planned'
+    - name: Assign new pull requests to project
+      uses: elastic/assign-one-project-github-action@1.2.2
+      if: github.event.action == 'opened' && github.event.pull_request
+      with:
+        project: 'https://github.com/orgs/elastic/projects/454'
+        project_id: '5882982'
+        column_name: 'In Progress'

data/.github/workflows/labeler.yml

@@ -0,0 +1,16 @@
+name: "Issue Labeler"
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: AlexanderWert/issue-labeler@v2.3
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: .github/labeler-config.yml
+        enable-versioned-regex: 0

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  NewCops: enable
   Exclude:
     - 'elastic-apm.gemspec'
     - 'vendor/**/*'
     - 'bench/*'
     - 'spec/support/helloworld_pb.rb'
     - 'spec/support/helloworld_services_pb.rb'
+    - 'features/**/*'
 
 require:
   - rubocop-performance
@@ -32,6 +34,15 @@ Lint/RescueException:
 Lint/SuppressedException:
   Enabled: false
 
+Lint/ConstantDefinitionInBlock: # So we can define a class in an rspec block
+  Enabled: false
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
+
 # Metrics /
 
 Metrics/AbcSize:
@@ -104,9 +115,20 @@ Style/HashEachMethods:
 Style/HashTransformKeys:
   Enabled: true
 
-Style/HashTransformValues:
-  Enabled: true
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/StringLiterals:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
+Style/SoleNestedConditional:
+  Enabled: false
+
+Style/StringConcatenation:
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false