elastic-apm 3.5.0 → 3.10.0

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM
@@ -77,7 +94,9 @@ module ElasticAPM
                 name: keyword_field(destination.name),
                 resource: keyword_field(destination.resource),
                 type: keyword_field(destination.type)
-              }
+              },
+              address: keyword_field(destination.address),
+              port: destination.port
             }
           end
         end

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

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/transport/user_agent.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/transport/worker.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM
@@ -60,6 +77,10 @@ module ElasticAPM
       private
 
       def serialize_and_filter(resource)
+        if resource.respond_to?(:prepare_for_serialization!)
+          resource.prepare_for_serialization!
+        end
+
         serialized = serializers.serialize(resource)
 
         # if a filter returns nil, it means skip the event

data/lib/elastic_apm/util.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/util/inflector.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/util/lru_cache.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/util/throttle.rb

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM

data/lib/elastic_apm/version.rb

@@ -1,5 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.5.0'
+  VERSION = '3.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - mikkel@elastic.co
 executables: []
@@ -51,7 +51,14 @@ files:
 - ".ci/.jenkins_master_framework.yml"
 - ".ci/.jenkins_ruby.yml"
 - ".ci/Jenkinsfile"
-- ".ci/downstreamTests.groovy"
+- ".ci/docker/jruby/11-jdk/Dockerfile"
+- ".ci/docker/jruby/12-jdk/Dockerfile"
+- ".ci/docker/jruby/13-jdk/Dockerfile"
+- ".ci/docker/jruby/7-jdk/Dockerfile"
+- ".ci/docker/jruby/8-jdk/Dockerfile"
+- ".ci/docker/jruby/README.md"
+- ".ci/docker/jruby/run.sh"
+- ".ci/docker/jruby/test.sh"
 - ".ci/jobs/apm-agent-ruby-downstream.yml"
 - ".ci/jobs/apm-agent-ruby-linting-mbp.yml"
 - ".ci/jobs/apm-agent-ruby-mbp.yml"
@@ -59,7 +66,6 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".ci/linting.groovy"
 - ".ci/packer_cache.sh"
-- ".ci/prepare-git-context.sh"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
@@ -68,7 +74,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.asciidoc
-- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Dockerfile
@@ -90,7 +95,6 @@ files:
 - bin/run-tests
 - bin/setup
 - bin/with_framework
-- codecov.yml
 - docker-compose.yml
 - docs/advanced.asciidoc
 - docs/api.asciidoc
@@ -100,14 +104,18 @@ files:
 - docs/debugging.asciidoc
 - docs/getting-started-rack.asciidoc
 - docs/getting-started-rails.asciidoc
+- docs/graphql.asciidoc
+- docs/images/dynamic-config.svg
 - docs/index.asciidoc
 - docs/introduction.asciidoc
 - docs/log-correlation.asciidoc
 - docs/metrics.asciidoc
 - docs/opentracing.asciidoc
+- docs/performance-tuning.asciidoc
 - docs/release-notes.asciidoc
 - docs/set-up.asciidoc
 - docs/supported-technologies.asciidoc
+- docs/upgrading.asciidoc
 - elastic-apm.gemspec
 - lib/elastic-apm.rb
 - lib/elastic_apm.rb
@@ -134,6 +142,8 @@ files:
 - lib/elastic_apm/error/log.rb
 - lib/elastic_apm/error_builder.rb
 - lib/elastic_apm/grape.rb
+- lib/elastic_apm/graphql.rb
+- lib/elastic_apm/grpc.rb
 - lib/elastic_apm/instrumenter.rb
 - lib/elastic_apm/internal_error.rb
 - lib/elastic_apm/logging.rb
@@ -164,6 +174,7 @@ files:
 - lib/elastic_apm/opentracing.rb
 - lib/elastic_apm/rails.rb
 - lib/elastic_apm/railtie.rb
+- lib/elastic_apm/resque.rb
 - lib/elastic_apm/sinatra.rb
 - lib/elastic_apm/span.rb
 - lib/elastic_apm/span/context.rb
@@ -174,6 +185,7 @@ files:
 - lib/elastic_apm/spies.rb
 - lib/elastic_apm/spies/action_dispatch.rb
 - lib/elastic_apm/spies/delayed_job.rb
+- lib/elastic_apm/spies/dynamo_db.rb
 - lib/elastic_apm/spies/elasticsearch.rb
 - lib/elastic_apm/spies/faraday.rb
 - lib/elastic_apm/spies/http.rb
@@ -182,11 +194,13 @@ files:
 - lib/elastic_apm/spies/net_http.rb
 - lib/elastic_apm/spies/rake.rb
 - lib/elastic_apm/spies/redis.rb
+- lib/elastic_apm/spies/resque.rb
 - lib/elastic_apm/spies/sequel.rb
 - lib/elastic_apm/spies/shoryuken.rb
 - lib/elastic_apm/spies/sidekiq.rb
 - lib/elastic_apm/spies/sinatra.rb
 - lib/elastic_apm/spies/sneakers.rb
+- lib/elastic_apm/spies/sucker_punch.rb
 - lib/elastic_apm/spies/tilt.rb
 - lib/elastic_apm/sql.rb
 - lib/elastic_apm/sql/signature.rb
@@ -206,6 +220,7 @@ files:
 - lib/elastic_apm/transport/connection/http.rb
 - lib/elastic_apm/transport/connection/proxy_pipe.rb
 - lib/elastic_apm/transport/filters.rb
+- lib/elastic_apm/transport/filters/hash_sanitizer.rb
 - lib/elastic_apm/transport/filters/secrets_filter.rb
 - lib/elastic_apm/transport/headers.rb
 - lib/elastic_apm/transport/serializers.rb
@@ -222,13 +237,12 @@ files:
 - lib/elastic_apm/util/lru_cache.rb
 - lib/elastic_apm/util/throttle.rb
 - lib/elastic_apm/version.rb
-- vendor/.gitkeep
 homepage: https://github.com/elastic/apm-agent-ruby
 licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/elastic/apm-agent-ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,8 +257,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: The official Elastic APM agent for Ruby
 test_files: []

data/.ci/downstreamTests.groovy

@@ -1,185 +0,0 @@
-#!/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 { label 'linux && immutable' }
-  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: '300', 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")
-  }
-  stages {
-    /**
-    Checkout the code and stash it, to use it on other stages.
-    */
-    stage('Checkout') {
-      options { skipDefaultCheckout() }
-      steps {
-        deleteDir()
-        gitCheckout(basedir: "${BASE_DIR}",
-          branch: "${params.BRANCH_SPECIFIER}",
-          repo: "${REPO}",
-          credentialsId: "${JOB_GIT_CREDENTIALS}")
-        stash allowEmpty: true, name: 'source', useDefaultExcludes: false
-      }
-    }
-    stage('Test') {
-      options { skipDefaultCheckout() }
-      steps {
-        runTests('.ci/.jenkins_framework.yml')
-      }
-    }
-    stage('Master Test') {
-      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')
-        }
-      }
-    }
-  }
-  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
-          catchError(buildResult: 'SUCCESS') {
-            def datafile = readFile(file: "results.json")
-            def json = getVaultSecret(secret: 'secret/apm-team/ci/jenkins-stats-cloud')
-            sendDataToElasticsearch(es: json.data.url, data: datafile, restCall: '/jenkins-builds-ruby-test-results/_doc/')
-          }
-        }
-      }
-      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: true,
-            keepLongStdio: true,
-            testResults: "**/spec/junit-reports/**/ruby-agent-junit.xml")
-          if (steps.isCodecovEnabled(x, y)) {
-            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}")
-    }
-  }
-}
-
-/**
-* Whether the given ruby version and framework are in charge of sending the
-* codecov results. It does require the workspace.
-*/
-def isCodecovEnabled(ruby, framework){
-  dir(BASE_DIR){
-    def codecovVersions = readYaml(file: '.ci/.jenkins_codecov.yml')
-    return codecovVersions['ENABLED'].any { it.trim() == "${ruby?.trim()}#${framework?.trim()}" }
-  }
-}
-
-/**
-  Run all the tests for the given ruby version and file with the frameworks to test
-*/
-def runTests(frameworkFile) {
-  deleteDir()
-  unstash "source"
-  dir("${BASE_DIR}"){
-    script {
-      rubyTasksGen = new RubyParallelTaskGenerator(
-        xVersions: [ "${params.RUBY_VERSION}" ],
-        xKey: 'RUBY_VERSION',
-        yKey: 'FRAMEWORK',
-        yFile: frameworkFile,
-        exclusionFile: '.ci/.jenkins_exclude.yml',
-        tag: 'Ruby',
-        name: 'Ruby',
-        steps: this
-      )
-      def mapPatallelTasks = rubyTasksGen.generateParallelTests()
-      parallel(mapPatallelTasks)
-    }
-  }
-}