elastic-apm 3.13.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c0c5abfddc19b97d5a0a25f7adeff62bd8ed99a1bdcb97d94ca9b3ff09134f
-  data.tar.gz: 4e7a68808d904181b3649cc766c075e5b575633b55a370047cd85c4eff53c5ef
+  metadata.gz: f35288b7b9e691e200b5ae0183f6cc81ba40cb3cf520f11e3319e6a31461b8d2
+  data.tar.gz: '0487ec48ab081691b85d410711402a9777e9a2c815e5384148d2f33ee0d48e89'
 SHA512:
-  metadata.gz: 94af89d9a12520b2344f941b85eefdd6d0bd447dc75ac75b220b491611e0b16a47722cce78badf8f065f78cd09496d7a63d5a0e392af3ee939ed86ecef43599b
-  data.tar.gz: '0790d669dede1e490e290960129488264dc9661224ccb011094c1a3a5a48419ad628f5b7e83ba11ad273c8af1698e9d935cb2d6f3a823197793931f2ec27e7de'
+  metadata.gz: 17f18165f940d10a57a0fec94f1f9c5311e0d4c4769273f30a749c2512cc125f912f53b15b78f7a90bb5dc8e6c41dbdf7ecb7b9ecc669f581e0768e22d30771f
+  data.tar.gz: 0d2e0655d61495157b947d1ccd441511ee1508ba32b7acbe00dc6deeebd343efa708c6755afa9fc8a9f150cda3224eac52f42f7841c6eeb704bf40bb85c68fb2

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,11 @@
 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/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/CHANGELOG.asciidoc

@@ -35,6 +35,20 @@ endif::[]
 [[release-notes-3.x]]
 === Ruby Agent version 3.x
 
+[[release-notes-3.14.0]]
+==== 3.14.0 (2021-03-17)
+
+[float]
+===== Added
+- Expanded support for extracting ActiveRecord adapter name from notification payload when using ActiveRecord versions before 6.0 {pull}953[#953]
+
+[float]
+===== Fixed
+
+- Fixed setting outcome in Mongo spy when not traced {pull}937[#937]
+- Fixed missing container metadata in payloads {pull}942[#942]
+- Fixed outgoing HTTP request spans with no Host {pull}962[#962]
+
 [[release-notes-3.13.0]]
 ==== 3.13.0 (2020-12-22)
 

data/Gemfile

@@ -23,7 +23,6 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Tools
 gem 'cucumber', require: false
-gem 'pry'
 gem 'rack-test'
 gem 'rspec', '~> 3'
 gem 'rspec-its'
@@ -40,7 +39,7 @@ gem 'graphql', require: nil
 if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
   gem 'google-protobuf', '< 3.12'
 end
-gem 'grpc' unless defined?(JRUBY_VERSION)
+gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
 gem 'json'
 gem 'json-schema', require: nil
 gem 'mongo', require: nil
@@ -57,6 +56,10 @@ gem 'sucker_punch', '~> 2.0', require: nil
 gem 'yard', require: nil
 gem 'yarjuf'
 
+# See issue #6547 in the JRuby repo. When that bug is fixed,
+# we can use the latest version of the i18n gem.
+gem 'i18n', '< 1.8.8'
+
 ## Install Framework
 GITHUB_REPOS = {
   'grape' => 'ruby-grape/grape',
@@ -74,8 +77,10 @@ end
 
 frameworks_versions.each do |framework, version|
   case version
-  when 'master'
+  when 'master' # sinatra, grape
     gem framework, github: GITHUB_REPOS.fetch(framework)
+  when 'main' # rails
+    gem framework, github: GITHUB_REPOS.fetch(framework), branch: 'main'
   when /.+/
     gem framework, "~> #{version}.0"
   else
@@ -84,14 +89,22 @@ frameworks_versions.each do |framework, version|
 end
 
 if frameworks_versions.key?('rails')
-  unless frameworks_versions['rails'] =~ /^(master|6)/
+  unless frameworks_versions['rails'] =~ /^(main|6)/
     gem 'delayed_job', require: nil
   end
 end
 
 if RUBY_PLATFORM == 'java'
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'jdbc-sqlite3'
+  case rails = frameworks_versions['rails']
+  when 'main'
+    gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', glob: 'activerecord-jdbcsqlite3-adapter/*.gemspec'
+  when ''
+    gem 'activerecord-jdbcsqlite3-adapter', "~> 61.0"
+  when nil
+    gem 'jdbc-sqlite3'
+  else
+    gem 'activerecord-jdbcsqlite3-adapter', "~> #{rails.tr('.', '')}.0"
+  end
 elsif frameworks_versions['rails'] =~ /^(4|5)/
   gem 'sqlite3', '~> 1.3.6'
 else

data/docs/configuration.asciidoc

@@ -322,6 +322,23 @@ Usually APM Server determines how often to poll, but if not the default interval
 
 NOTE: This feature requires APM Server v7.3 or later and that the APM Server is configured with `kibana.enabled: true`.
 
+[float]
+[[config-cloud-provider]]
+==== `cloud_provider`
+|============
+| Environment                  | `Config` key     | Default
+| `ELASTIC_APM_CLOUD_PROVIDER` | `cloud_provider` | `"auto"`
+|============
+
+Specify the cloud provider for metadata collection.
+Defaults to `"auto"`, which means the agent uses trial and
+error to collect metadata from all supported cloud providers.
+
+Valid options are `"auto"`, `"aws"`, `"gcp"`, `"azure"`, and `"none"`.
+If set to `"none"`, no cloud metadata will be collected.
+If set to any of `"aws"`, `"gcp"`, or `"azure"`,
+attempts to collect metadata will only be performed from the chosen provider.
+
 [float]
 [[config-custom-key-filters]]
 ==== `custom_key_filters` deprecated:[3.5.0,See <<config-sanitize-field-names>> instead.]

data/docs/supported-technologies.asciidoc

@@ -77,6 +77,8 @@ requests using these libraries:
 - Http.rb (v0.6+)
 - Faraday (v0.2.1+)
 
+*Note:* These libraries usually assume `localhost` if no `Host` is specified, so the agent does as well. 
+
 [float]
 [[supported-technologies-backgroud-processing]]
 === Background Processing

data/lib/elastic_apm/config.rb

@@ -303,8 +303,11 @@ module ElasticAPM
     end
 
     def server_ca_cert=(value)
-      warn '[DEPRECATED] The option server_ca_cert has been ' \
-        'renamed to server_ca_cert_file to align with other agents.'
+      unless value == self.class.schema[:server_ca_cert_file][:default]
+        warn '[DEPRECATED] The option server_ca_cert has been ' \
+          'renamed to server_ca_cert_file to align with other agents.'
+      end
+
       self.server_ca_cert_file = value
     end
 

data/lib/elastic_apm/normalizers/rails/active_record.rb

@@ -57,10 +57,17 @@ module ElasticAPM
         private
 
         def subtype_for(payload)
-          cached_adapter_name(
-            payload[:connection]&.adapter_name ||
-              ::ActiveRecord::Base.connection_config[:adapter]
-          )
+          return cached_adapter_name(payload[:connection].adapter_name) if payload[:connection]
+
+          if can_attempt_connection_id_lookup?(payload)
+            begin
+              loaded_object = ObjectSpace._id2ref(payload[:connection_id])
+              return cached_adapter_name(loaded_object.adapter_name) if loaded_object.respond_to?(:adapter_name)
+            rescue RangeError # if connection object has somehow been garbage collected
+            end
+          end
+
+          cached_adapter_name(::ActiveRecord::Base.connection_config[:adapter])
         end
 
         def summarize(sql)
@@ -69,11 +76,16 @@ module ElasticAPM
 
         def cached_adapter_name(adapter_name)
           return UNKNOWN if adapter_name.nil? || adapter_name.empty?
+
           @adapters[adapter_name] ||
             (@adapters[adapter_name] = adapter_name.downcase)
         rescue StandardError
           nil
         end
+
+        def can_attempt_connection_id_lookup?(payload)
+          RUBY_ENGINE == "ruby" && payload[:connection_id] && ObjectSpace.respond_to?(:_id2ref)
+        end
       end
     end
   end

data/lib/elastic_apm/span/context/http.rb

@@ -33,6 +33,8 @@ module ElasticAPM
         private
 
         def sanitize_url(uri_or_str)
+          return unless uri_or_str
+
           uri = uri_or_str.is_a?(URI) ? uri_or_str.dup : URI(uri_or_str)
           uri.password = nil
           uri.to_s

data/lib/elastic_apm/spies/delayed_job.rb

@@ -38,7 +38,7 @@ module ElasticAPM
       end
 
       def self.invoke_job(job, *args, &block)
-        job_name = name_from_payload(job.payload_object)
+        job_name = job_name(job)
         transaction = ElasticAPM.start_transaction(job_name, TYPE)
         job.invoke_job_without_apm(*args, &block)
         transaction&.done 'success'
@@ -52,7 +52,9 @@ module ElasticAPM
         ElasticAPM.end_transaction
       end
 
-      def self.name_from_payload(payload_object)
+      def self.job_name(job)
+        payload_object = job.payload_object
+
         if payload_object.is_a?(::Delayed::PerformableMethod)
           performable_method_name(payload_object)
         elsif payload_object.instance_of?(
@@ -62,6 +64,8 @@ module ElasticAPM
         else
           payload_object.class.name
         end
+      rescue
+        job.name
       end
 
       def self.performable_method_name(payload_object)

data/lib/elastic_apm/spies/faraday.rb

@@ -55,20 +55,25 @@ module ElasticAPM
               tmp_request = build_request(method) do |req|
                 yield(req) if block_given?
               end
-              uri = URI(tmp_request.path)
+              uri = tmp_request.path && URI(tmp_request.path)
             end
 
-            host = uri.host
+            host = uri&.host || 'localhost'
 
             upcased_method = method.to_s.upcase
 
-            destination = ElasticAPM::Span::Context::Destination.from_uri(uri)
-
-            context =
-              ElasticAPM::Span::Context.new(
-                http: { url: uri, method: upcased_method },
-                destination: destination
-              )
+            if uri
+              destination = ElasticAPM::Span::Context::Destination.from_uri(uri)
+
+              context =
+                ElasticAPM::Span::Context.new(
+                  http: { url: uri, method: upcased_method },
+                  destination: destination
+                )
+            else
+              context =
+                ElasticAPM::Span::Context.new(http: { url: uri, method: upcased_method })
+            end
 
             ElasticAPM.with_span(
               "#{upcased_method} #{host}",

data/lib/elastic_apm/spies/mongo.rb

@@ -44,14 +44,18 @@ module ElasticAPM
         end
 
         def failed(event)
-          span = pop_event(event)
-          span&.outcome = Span::Outcome::FAILURE
+          if (span = pop_event(event))
+            span.outcome = Span::Outcome::FAILURE
+          end
+
           span
         end
 
         def succeeded(event)
-          span = pop_event(event)
-          span&.outcome = Span::Outcome::SUCCESS
+          if span = pop_event(event)
+            span.outcome = Span::Outcome::SUCCESS
+          end
+
           span
         end
 

data/lib/elastic_apm/spies/net_http.rb

@@ -61,7 +61,7 @@ module ElasticAPM
               return request_without_apm(req, body, &block)
             end
 
-            host = req['host']&.split(':')&.first || address
+            host = req['host']&.split(':')&.first || address || 'localhost'
             method = req.method.to_s.upcase
             path, query = req.path.split('?')
 

data/lib/elastic_apm/transport/serializers/metadata_serializer.rb

@@ -84,7 +84,8 @@ module ElasticAPM
             hostname: keyword_field(system.hostname),
             architecture: keyword_field(system.architecture),
             platform: keyword_field(system.platform),
-            kubernetes: keyword_object(system.kubernetes)
+            kubernetes: keyword_object(system.kubernetes),
+            container: keyword_object(system.container)
           }
         end
 

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.13.0'
+  VERSION = '3.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -70,6 +70,7 @@ files:
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/labeler-config.yml"
+- ".github/workflows/addToProject.yml"
 - ".github/workflows/labeler.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"