elastic-apm 4.6.0 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edae30dc148307b137e402a81ffed731cbe738ca7924f31c9440a9a6ea9a8eb4
-  data.tar.gz: ef860d2d783fd9351b0eea3106e96eafbadef339fa72a4b5979fbc38d4e3d46a
+  metadata.gz: f7c28585ab44cfdb7a4eb8c32b8dd60e1ecb10c091357c25a6b13f35a0fe2ffc
+  data.tar.gz: 3aad55a03f8c2a4d824ea09731be304e7712ee306dc4e585c5cc29ba11e25413
 SHA512:
-  metadata.gz: 8e1543b7f39d5ba73eb30e34777ba07a8ae940ddd1aee2d84afc445642319304bd26036a9eb5b5e6d4d9c11bbc0323c7c17aa2bd18101bbfcfed1cdcf6bdc635
-  data.tar.gz: 971963f1d06a398c2af8f988e4386004b7fb176e67d6d8c35b9be8a781b8561fd8236395d89f51ef87e3cad4375f9c91c4105e550dc7f7b1e7b1142e1d0f7c17
+  metadata.gz: eb6480a61567bd000e5325e12702c46882a42a9c452a60bd7af997b7138b076cd332d853f101b694af30d120bdd3b48f1b911feb6ecf12e94cdfc58ba096855c
+  data.tar.gz: e626d4a1cb9370780d764385585fb4c4025d612a84b7ef36ae0525f6d6f6a83ddf7d5aa670ccf2610bf10f9e2c2d9a87f2f97818cc9e8de27153c3a85cd34875

data/.ci/.jenkins_exclude.yml

@@ -18,7 +18,7 @@ exclude:
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: grape-master
 
@@ -61,7 +61,7 @@ exclude:
   - RUBY_VERSION: ruby:2.4
     FRAMEWORK: rails-6.0
 
-  # Only test rails master on ruby 3.1
+  # Only test rails main on ruby 3.1
   - RUBY_VERSION: ruby:3.0
     FRAMEWORK: rails-main
   - RUBY_VERSION: ruby:2.7
@@ -97,23 +97,23 @@ exclude:
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
     FRAMEWORK: rails-7.0
 
-  # Only test sinatra master on ruby 2.7 and ruby 3.1
+  # Only test sinatra main on ruby 2.7 and ruby 3.1
   - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
   - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-master
+    FRAMEWORK: sinatra-main
 
   # Only test grape master on ruby 2.7 and ruby 3.0
   - RUBY_VERSION: ruby:2.6

data/.ci/.jenkins_main_framework.yml

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

data/.ci/Jenkinsfile

@@ -25,6 +25,7 @@ pipeline {
     OPBEANS_REPO = 'opbeans-ruby'
     REFERENCE_REPO = '/var/lib/jenkins/.git-references/apm-agent-ruby.git'
     SLACK_CHANNEL = '#apm-agent-ruby'
+    RUBY_DOCKER_TAG = 'ruby:2.6'
   }
   options {
     timeout(time: 2, unit: 'HOURS')
@@ -123,6 +124,37 @@ pipeline {
         }
       }
     }
+    stage('Publish snapshot packages') {
+      options { skipDefaultCheckout() }
+      environment {
+        PATH = "${env.WORKSPACE}/.local/bin:${env.WORKSPACE}/bin:${env.PATH}"
+        BUCKET_NAME = 'oblt-artifacts'
+        DOCKER_REGISTRY = 'docker.elastic.co'
+        DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod'
+        GCS_ACCOUNT_SECRET = 'secret/observability-team/ci/snapshoty'
+      }
+      when { branch 'main' }
+      steps {
+        withGithubNotify(context: 'Publish snapshot packages') {
+          deleteDir()
+          unstash 'source'
+          dir(env.BASE_DIR) {
+            script {
+              docker.image(env.RUBY_DOCKER_TAG).inside() {
+                sh(label: 'install build system', script: 'gem install rake yard rspec')
+                sh(label: 'create gem', script: 'rake build')
+              }
+              snapshoty(
+                bucket: env.BUCKET_NAME,
+                gcsAccountSecret: env.GCS_ACCOUNT_SECRET,
+                dockerRegistry: env.DOCKER_REGISTRY,
+                dockerSecret: env.DOCKER_REGISTRY_SECRET
+              )
+            }
+          }
+        }
+      }
+    }
     stage('Benchmarks') {
       options { skipDefaultCheckout() }
       when {
@@ -178,7 +210,6 @@ pipeline {
     stage('Release') {
       options { skipDefaultCheckout() }
       environment {
-        RUBY_DOCKER_TAG = 'ruby:2.6'
         HOME = '/var/lib/jenkins'
       }
       when {
@@ -389,7 +420,7 @@ def convergeCoverage() {
 
 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') {
+    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}") {
           withGitRelease(credentialsId: '2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken') {

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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.16.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.sha256 -o /tmp/jruby.sha256 \
     && 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 - \
+    && echo "$(cat /tmp/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
 
@@ -25,7 +25,9 @@ RUN mkdir -p /opt/jruby/etc \
     } >> /opt/jruby/etc/gemrc
 
 # install bundler, gem requires bash to work
-RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+# https://github.com/rubygems/rubygems/issues/2534#issuecomment-448843746
+RUN gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems) \
+    && gem install bundler:2.3.26 rake net-telnet xmlrpc tzinfo-data
 
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
@@ -38,4 +40,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.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.sha256 -o /tmp/jruby.sha256 \
     && 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 - \
+    && echo "$(cat /tmp/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
 
@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.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.sha256 -o /tmp/jruby.sha256 \
     && 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 - \
+    && echo "$(cat /tmp/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
 
@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

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

@@ -2,15 +2,15 @@ FROM openjdk:7-jdk
 
 RUN apt-get update \
     && apt-get install -y libc6-dev --no-install-recommends \
-    && apt-get install -y gcc \
+    && apt-get install --force-yes -y gcc \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.3.1.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.sha256 -o /tmp/jruby.sha256 \
     && 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 - \
+    && echo "$(cat /tmp/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
 
@@ -38,4 +38,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

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

@@ -6,11 +6,11 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JRUBY_VERSION 9.2.14.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.sha256 -o /tmp/jruby.sha256 \
     && 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 - \
+    && echo "$(cat /tmp/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
 
@@ -25,7 +25,9 @@ RUN mkdir -p /opt/jruby/etc \
     } >> /opt/jruby/etc/gemrc
 
 # install bundler, gem requires bash to work
-RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+# https://github.com/rubygems/rubygems/issues/2534#issuecomment-448843746
+RUN gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems) \
+    && gem install bundler:2.3.26 rake net-telnet xmlrpc tzinfo-data
 
 # install things globally, for great justice
 # and don't create ".bundle" in all our apps
@@ -38,4 +40,7 @@ ENV PATH $BUNDLE_BIN:$PATH
 RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
     && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
 
+RUN useradd -rm -d /home/jruby -u 1001 jruby
+USER jruby
+WORKDIR /home/jruby
 CMD [ "irb" ]

data/.ci/docker/jruby/README.md

@@ -12,7 +12,7 @@ To build the images run
 
 You can set your own docker registry with the flag `--registry x.y.z/org`
 
-You can exclude what images can be built with the flag `--exclude jdk-7`
+You can exclude what images can be built with the flag `--exclude jdk-7`. Multiple usages of `--exclude` are accepted.
 
 ## Test
 

data/.ci/docker/jruby/run.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -o pipefail
+
+# 7-jdk is excluded by default. See https://github.com/elastic/apm-agent-ruby/pull/1367#issuecomment-1437228929
+EXCLUDE=("7-jdk")
+
 while (( "$#" )); do
   case "$1" in
     -r|--registry)
@@ -7,7 +12,7 @@ while (( "$#" )); do
       shift 2
       ;;
     -e|--exclude)
-      EXCLUDE=$2
+      EXCLUDE+=("$2")
       shift 2
       ;;
     -a|--action)
@@ -28,12 +33,13 @@ while (( "$#" )); do
   esac
 done
 
+function convert_exclude_opts() {
+    for val in "${EXCLUDE[@]}"; do
+      printf "! -path \"./%s/*\" " $val
+    done
+}
 
-if [ -n "$EXCLUDE" ] ; then
-  search=$(find . -path ./$EXCLUDE -prune -o -name 'Dockerfile' -print)
-else
-  search=$(find . -name 'Dockerfile' -print)
-fi
+search=$(bash -c "find . -name 'Dockerfile' $(convert_exclude_opts) -print")
 
 function report {
   if [ $1 -eq 0 ] ; then
@@ -43,7 +49,18 @@ function report {
   fi
 }
 
+function max {
+  if [ "$1" -gt "$2" ]; then
+    echo "$1"
+  else
+    echo "$2"
+  fi
+}
+
 echo "${ACTION} docker images"
+
+EXIT_CODE=0
+
 for i in ${search}; do
   jdk_image=$(basename `dirname "$i"`)
   jdk_version=$(echo "$jdk_image" | cut -d'-' -f1)
@@ -63,11 +80,18 @@ for i in ${search}; do
 
   if [ "${ACTION}" == "build" ] ; then
     docker build --tag "${name}" -< $i >> output.log 2>&1
-    report $? "${name}"
+    result=$?
+    report $result "${name}"
   elif [ "${ACTION}" == "push" ] ; then
     docker push "${name}" >> output.log 2>&1
-    report $? "${name}"
+    result=$?
+    report $result "${name}"
   else
     ./test.sh "${name}" $jdk_version
+    result=$?
   fi
-done
+
+  EXIT_CODE=$(max $EXIT_CODE $result)
+done
+
+exit "${EXIT_CODE}"

data/.ci/docker/jruby/test.sh

@@ -6,8 +6,23 @@ printf '\tTest %-30s %s\n' ${image}
 
 if [ -n "$version" ] ; then
   test_name="Test java -version '$version'"
-  docker run -t --rm $image java -version | grep -q "openjdk version \"$version\|1.$version" && printf '\t\t%-40s %s\n' "${test_name}" "PASSED" || printf '\t\t%-40s %s\n' "${test_name}" "FAILED"
+  docker run -t --rm $image java -version | grep -q "openjdk version \"$version\|1.$version"
+  TEST_JAVA_VERSION_RESULT=$?
+  if [[ $TEST_JAVA_VERSION_RESULT -eq 0 ]]; then
+    printf '\t\t%-40s %s\n' "${test_name}" "PASSED"
+  else
+    printf '\t\t%-40s %s\n' "${test_name}" "FAILED"
+  fi
 fi
 
 test_name="Test Hello World"
-docker run -t --rm $image jruby -e "puts 'Hello World" | grep -q 'Hello World' && printf '\t\t%-40s %s\n' "${test_name}" "PASSED" || printf '\t\t%-40s %s\n' "${test_name}" "FAILED"
+# random operation to verify that ruby evaluates the passed string correctly
+docker run -t --rm $image jruby -e "foo = 3 * 4; puts foo" | grep -q '12'
+TEST_HELLO_WORLD_RESULT=$?
+if [[ $TEST_HELLO_WORLD_RESULT -eq 0 ]]; then
+  printf '\t\t%-40s %s\n' "${test_name}" "PASSED"
+else
+  printf '\t\t%-40s %s\n' "${test_name}" "FAILED"
+fi
+
+! (( $TEST_JAVA_VERSION_RESULT || $TEST_HELLO_WORLD_RESULT ))

data/.ci/snapshoty.yml

@@ -0,0 +1,34 @@
+---
+
+# Version of configuration to use
+version: '1.0'
+
+# You can define a Google Cloud Account to use
+account:
+  # Project id of the service account
+  project: '${GCS_PROJECT}'
+  # Private key id of the service account
+  private_key_id: '${GCS_PRIVATE_KEY_ID}'
+  # Private key of the service account
+  private_key: '${GCS_PRIVATE_KEY}'
+  # Email of the service account
+  client_email: '${GCS_CLIENT_EMAIL}'
+  # URI token
+  token_uri: 'https://oauth2.googleapis.com/token'
+
+# List of artifacts
+artifacts:
+  # Path to use for artifacts discovery 
+  - path: './pkg'
+    # Files pattern to match
+    files_pattern: 'elastic-apm-(?P<app_version>\d+\.\d+\.\d+)\.gem'
+    # File layout on GCS bucket
+    output_pattern: '{project}/{jenkins_branch_name}/elastic-apm-ruby-{app_version}-{jenkins_git_commit_short}.gem'
+    # List of metadata processors to use.
+    metadata:
+      # Define static custom metadata
+      - name: 'custom'
+        data:
+          project: 'apm-agent-ruby'
+      # Add jenkins metadata
+      - name: 'jenkins'

data/.ci/update-specs.yml

@@ -0,0 +1,108 @@
+name: update-specs
+
+title: synchronize schema specs
+
+scms:
+  default:
+    kind: github
+    spec:
+      user: '{{ requiredEnv "GIT_USER" }}'
+      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      owner: elastic
+      repository: apm-agent-ruby
+      token: '{{ requiredEnv "GITHUB_TOKEN" }}'
+      username: '{{ requiredEnv "GIT_USER" }}'
+      branch: main
+
+sources:
+  sha:
+    kind: file
+    spec:
+      file: 'https://github.com/elastic/apm-data/commit/main.patch'
+      matchpattern: "^From\\s([0-9a-f]{40})\\s"
+    transformers:
+      - findsubmatch:
+          pattern: "[0-9a-f]{40}"
+  error.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/error.json
+  metadata.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metadata.json
+  metricset.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/metricset.json
+  span.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/span.json
+  transaction.json:
+    kind: file
+    spec:
+      file: https://raw.githubusercontent.com/elastic/apm-data/main/input/elasticapm/docs/spec/v2/transaction.json
+
+
+
+
+
+actions:
+  pr:
+    kind: "github/pullrequest"
+    scmid: default
+    sourceid: sha
+    spec:
+      automerge: false
+      draft: false
+      labels:
+        - "automation"
+      description: |-
+        ### What
+        APM agent json schema automatic sync
+        ### Why
+        *Changeset*
+        * https://github.com/elastic/apm-data/commit/{{ source "sha" }}
+
+targets:
+  error.json:
+    name: error.json
+    scmid: default
+    sourceid: error.json
+    kind: file
+    spec:
+      file: spec/fixtures/error.json
+      forcecreate: true
+  metadata.json:
+    name: metadata.json
+    scmid: default
+    sourceid: metadata.json
+    kind: file
+    spec:
+      file: spec/fixtures/metadata.json
+      forcecreate: true
+  metricset.json:
+    name: metricset.json
+    scmid: default
+    sourceid: metricset.json
+    kind: file
+    spec:
+      file: spec/fixtures/metricset.json
+      forcecreate: true
+  span.json:
+    name: span.json
+    scmid: default
+    sourceid: span.json
+    kind: file
+    spec:
+      file: spec/fixtures/span.json
+      forcecreate: true
+  transaction.json:
+    name: transaction.json
+    scmid: default
+    sourceid: transaction.json
+    kind: file
+    spec:
+      file: spec/fixtures/transaction.json
+      forcecreate: true

data/.github/workflows/update-specs.yml

@@ -0,0 +1,30 @@
+name: update-specs
+
+on:
+  workflow_dispatch: ~
+  schedule:
+    - cron: '0 6 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: elastic/apm-pipeline-library/.github/actions/updatecli@current
+        env:
+          BRANCH_NAME: ${{ github.ref_name }}
+        with:
+          vaultUrl: ${{ secrets.VAULT_ADDR }}
+          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
+          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
+          pipeline: ./.ci/update-specs.yml
+      - if: failure()
+        uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
+        with:
+          vaultUrl: ${{ secrets.VAULT_ADDR }}
+          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
+          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
+          slackChannel: "#apm-agent-ruby"

data/CHANGELOG.asciidoc

@@ -25,7 +25,6 @@ endif::[]
 
 [float]
 ===== Fixed
-- Fix {pull}2526[#2526]
 
 [float]
 [[unreleased]]
@@ -35,6 +34,23 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.6.2]]
+==== 4.6.2
+
+[float]
+===== Fixed
+- Fix Faraday::RackBuilder::StackLocked {pull}1371[#1371]
+
+[[release-notes-4.6.1]]
+==== 4.6.1
+
+[float]
+===== Fixed
+
+- Fix growing number of open file descriptors when HTTP request to APM is never sent {pull}1351[#1351]
+- Fix setting span http status code when Faraday Middleware is used {pull}1368[#1368]
+- Handle whitespace when splitting tracestate entries {pull}1353[#1353]
+
 [[release-notes-4.6.0]]
 ==== 4.6.0
 

data/CONTRIBUTING.md

@@ -49,4 +49,4 @@ To release a new version:
     2. Push the tag to GitHub.
     3. Build the gem and upload to Rubygems (local user needs to be signed in and authorized.)
 1. Run `rake release:update_branch`. This will...
-    1. Update `3.x` branch to be at released commit and push it to GitHub.
+    1. Update `4.x` branch to be at released commit and push it to GitHub.

data/Gemfile

@@ -83,9 +83,9 @@ frameworks_versions.each do |framework, version|
   end
 
   case version
-  when 'master' # sinatra, grape
+  when 'master' # grape
     gem framework, github: GITHUB_REPOS.fetch(framework)
-  when 'main' # rails
+  when 'main' # sinatra, rails
     gem framework, github: GITHUB_REPOS.fetch(framework), branch: 'main'
   when /.+/
     gem framework, "~> #{version}.0"
@@ -116,6 +116,8 @@ if RUBY_PLATFORM == 'java'
   end
 elsif frameworks_versions['rails'] =~ /^(4|5)/
   gem 'sqlite3', '~> 1.3.6'
+elsif RUBY_VERSION < '2.7'
+  gem 'sqlite3', '~> 1.4.4'
 else
   gem 'sqlite3'
 end

data/Rakefile

@@ -24,9 +24,9 @@ desc 'Post release action:'\
 
 namespace :release do
   task :update_branch do
-    `git checkout 3.x &&
+    `git checkout 4.x &&
     git rebase main &&
-    git push origin 3.x &&
+    git push origin 4.x &&
     git checkout main`
   end
 end

data/docker-compose.yml

@@ -6,6 +6,8 @@ services:
     image: mongo:latest
     volumes: ['mongodata:/data/db']
     ports: ['27017:27017']
+    security_opt:
+      - no-new-privileges
 
   specs:
     build:
@@ -27,12 +29,16 @@ services:
     depends_on:
       - mongodb
     user: ${USER_ID}
+    security_opt:
+      - no-new-privileges
 
   ruby_rspec:
     image: apm-agent-ruby:${RUBY_VERSION}
     environment:
       MONGODB_URL: 'mongodb:27017'
     user: ${USER_ID}
+    security_opt:
+      - no-new-privileges
 
 volumes:
   vendor:

data/lib/elastic_apm/spies/faraday.rb

@@ -103,10 +103,19 @@ module ElasticAPM
             ElasticAPM::Spies.without_net_http do
               trace_context = span&.trace_context || transaction.trace_context
 
-              result = super(method, url, body, headers) do |req|
-                trace_context.apply_headers { |k, v| req[k] = v }
-
-                yield req if block
+              begin
+                result = super(method, url, body, headers) do |req|
+                  trace_context.apply_headers { |k, v| req[k] = v }
+                  yield req if block
+                end
+              rescue Faraday::ClientError, Faraday::ServerError => e # Faraday::Response::RaiseError
+                status = e.response[:status]
+                http = span&.context&.http
+                if http && status
+                  http.status_code = status.to_s
+                  span.outcome = Span::Outcome.from_http_status(status)
+                end
+                raise e
               end
 
               if (http = span&.context&.http)

data/lib/elastic_apm/trace_context/tracestate.rb

@@ -92,6 +92,8 @@ module ElasticAPM
 
       extend Forwardable
 
+      ENTRY_SPLIT_REGEX = /\s*[\n,]+\s*/
+
       def initialize(entries: {}, sample_rate: nil)
         @entries = entries
 
@@ -140,7 +142,7 @@ module ElasticAPM
           # Rack handles this by joining the headers under the same key,
           # separated by newlines.
           # See https://www.rubydoc.info/github/rack/rack/file/SPEC
-          String(str).split("\n").map { |s| s.split(',') }.flatten
+          String(str).split(ENTRY_SPLIT_REGEX).flatten
         end
       end
     end

data/lib/elastic_apm/transport/connection/http.rb

@@ -75,7 +75,15 @@ module ElasticAPM
           @closed.make_true
 
           @wr&.close
-          return if @request.nil? || @request&.join(5)
+
+          if @request&.join(5)
+            @rd&.close
+            return
+          end
+
+          @rd&.close
+
+          return if @request.nil?
 
           error(
             '%s: APM Server not responding in time, terminating request',
@@ -117,8 +125,6 @@ module ElasticAPM
               error(
                 "Couldn't establish connection to APM Server:\n%p", e.inspect
               )
-            ensure
-              @rd&.close
             end
           end
         end

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.2
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -82,6 +82,8 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".ci/linting.groovy"
 - ".ci/packer_cache.sh"
+- ".ci/snapshoty.yml"
+- ".ci/update-specs.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
@@ -89,6 +91,7 @@ files:
 - ".github/labeler-config.yml"
 - ".github/workflows/addToProject.yml"
 - ".github/workflows/labeler.yml"
+- ".github/workflows/update-specs.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"