elastic-apm 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b381ca37784473aef9bf3462b37eb77b3d263dfd402adf929c866153f81af3
-  data.tar.gz: 51f9290d7cace3428273171484ab6f6526e1309bdb2d27a101d9e74a17f9f619
+  metadata.gz: f7c28585ab44cfdb7a4eb8c32b8dd60e1ecb10c091357c25a6b13f35a0fe2ffc
+  data.tar.gz: 3aad55a03f8c2a4d824ea09731be304e7712ee306dc4e585c5cc29ba11e25413
 SHA512:
-  metadata.gz: 55c315cf52ce113f032b471f64d6662d4e5b9d85577bf228913da82c3f114cdc1846c70a8078de2fc7e1362c89f2cff2559b6e6b046007667feeb0c194223e75
-  data.tar.gz: 9962145d110f552e1beb449e721389cefe17bb862b3e255f48ef236170fa04523c29654f11fb3e1cc89cc5b8f69e14f0678cab51431b86a501ec016631278992
+  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/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

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
 

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
 

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
 

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

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

@@ -25,7 +25,6 @@ endif::[]
 
 [float]
 ===== Fixed
-- Fix {pull}2526[#2526]
 
 [float]
 [[unreleased]]
@@ -35,6 +34,13 @@ 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
 

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"

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/lib/elastic_apm/spies/faraday.rb

@@ -102,12 +102,20 @@ module ElasticAPM
           ) do |span|
             ElasticAPM::Spies.without_net_http do
               trace_context = span&.trace_context || transaction.trace_context
-              self.response :elastic_apm_middleware, span # middleware
 
-              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)
@@ -123,28 +131,6 @@ module ElasticAPM
       # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
       def install
-        # This middleware class has to be defined here because it inherits from
-        # ::Faraday::Middleware, which isn't defined when this file loads.
-        tracing_middleware = Class.new ::Faraday::Middleware do
-          attr_reader :span
-
-          def initialize(app, span = nil, options = {})
-            super(app)
-            @span = span
-          end
-
-          def on_complete(env)
-            status = env[:status]
-            http = span&.context&.http
-            if http && status
-              http.status_code = status.to_s
-              span.outcome = Span::Outcome.from_http_status(status)
-            end
-          end
-        end
-        ::Faraday::Response.register_middleware(
-          elastic_apm_middleware: -> { tracing_middleware }
-        )
         ::Faraday::Connection.prepend(Ext)
       end
     end

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '4.6.1'
+  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.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby