elastic-apm 3.5.0 → 3.10.0

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

@@ -0,0 +1,40 @@
+FROM openjdk:11-jdk
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM adoptopenjdk:12-jdk-openj9
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev git tcc netbase --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM openjdk:13-jdk-slim
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev git tcc curl netbase --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM openjdk:7-jdk
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.1.17.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,40 @@
+FROM openjdk:8-jdk
+
+RUN apt-get update \
+    && apt-get install -y libc6-dev --no-install-recommends \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JRUBY_VERSION 9.2.10.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 -o /tmp/jruby.tar.gz \
+    && echo "$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
+
+# set the jruby binaries in the path
+ENV PATH /opt/jruby/bin:$PATH
+
+# skip installing gem documentation
+RUN mkdir -p /opt/jruby/etc \
+    && { \
+        echo 'install: --no-document'; \
+        echo 'update: --no-document'; \
+    } >> /opt/jruby/etc/gemrc
+
+# install bundler, gem requires bash to work
+RUN gem install bundler rake net-telnet xmlrpc tzinfo-data
+
+# install things globally, for great justice
+# and don't create ".bundle" in all our apps
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_PATH="$GEM_HOME" \
+    BUNDLE_BIN="$GEM_HOME/bin" \
+    BUNDLE_SILENCE_ROOT_WARNING=1 \
+    BUNDLE_APP_CONFIG="$GEM_HOME"
+ENV PATH $BUNDLE_BIN:$PATH
+RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \
+    && chmod 777 "$GEM_HOME" "$BUNDLE_BIN"
+
+CMD [ "irb" ]

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

@@ -0,0 +1,31 @@
+# JRuby docker images
+
+Builds jruby docker images.
+
+## Build
+
+To build the images run
+
+```bash
+  ./run.sh --action build
+```
+
+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`
+
+## Test
+
+To test the images run
+
+```bash
+  ./run.sh --action test
+```
+
+## Push
+
+To push the images run
+
+```bash
+  ./run.sh --action push
+```

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

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+
+while (( "$#" )); do
+  case "$1" in
+    -r|--registry)
+      REGISTRY=$2
+      shift 2
+      ;;
+    -e|--exclude)
+      EXCLUDE=$2
+      shift 2
+      ;;
+    -a|--action)
+      ACTION=$2
+      shift 2
+      ;;
+    --) # end argument parsing
+      shift
+      break
+      ;;
+    -*|--*=) # unsupported flags
+      echo "Error: Unsupported flag $1" >&2
+      exit 1
+      ;;
+    *) # preserve positional arguments
+      shift
+      ;;
+  esac
+done
+
+
+if [ -n "$EXCLUDE" ] ; then
+  search=$(find . -path ./$EXCLUDE -prune -o -name 'Dockerfile' -print)
+else
+  search=$(find . -name 'Dockerfile' -print)
+fi
+
+function report {
+  if [ $1 -eq 0 ] ; then
+    printf '\tImage %-60s %-10s\n' "${2}" "GENERATED"
+  else
+    printf '\tImage %-60s %-10s\n' "${2}" "FAILED"
+  fi
+}
+
+echo "${ACTION} docker images"
+for i in ${search}; do
+  jdk_image=$(basename `dirname "$i"`)
+  jdk_version=$(echo "$jdk_image" | cut -d'-' -f1)
+  jruby=$(grep "JRUBY_VERSION" $i | cut -d" " -f 3)
+  if [ "${jdk_image}" == "onbuild" ] ; then
+    short=$(grep "FROM" "$i" | cut -d":" -f 2 | cut -d'-' -f1)
+    jdk_version=
+  else
+    short=$(echo "$jruby" | cut -d'.' -f1-2)
+  fi
+
+  if [ -n "${REGISTRY}" ] ; then
+    name="${REGISTRY}/jruby:${short}-${jdk_image}"
+  else
+    name="jruby:${short}-${jdk_image}"
+  fi
+
+  if [ "${ACTION}" == "build" ] ; then
+    docker build --tag "${name}" -< $i >> output.log 2>&1
+    report $? "${name}"
+  elif [ "${ACTION}" == "push" ] ; then
+    docker push "${name}" >> output.log 2>&1
+    report $? "${name}"
+  else
+    ./test.sh "${name}" $jdk_version
+  fi
+done

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

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+image=${1?image is required}
+version=${2}
+
+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"
+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"

data/.ci/jobs/defaults.yml

@@ -17,7 +17,7 @@
     days-to-keep: '30'
     concurrent: true
     node: linux
-    periodic-folder-trigger: 1d
+    periodic-folder-trigger: 1w
     prune-dead-branches: true
     publishers:
     - email:

data/.ci/packer_cache.sh

@@ -2,13 +2,15 @@
 
 source /usr/local/bin/bash_standard_lib.sh
 
-grep "-" .ci/.jenkins_ruby.yml | grep -v 'observability-ci' | cut -d'-' -f2- | \
-while read -r version;
-do
-    transformedName=${version/:/-}
-    transformedVersion=$(echo "${version}" | cut -d":" -f2)
-    imageName="apm-agent-ruby"
-    registryImageName="docker.elastic.co/observability-ci/${imageName}:${transformedName}"
-    (retry 2 docker pull "${registryImageName}")
-    docker tag "${registryImageName}" "${imageName}:${transformedVersion}"
-done
+if [ -x "$(command -v docker)" ]; then
+  grep "-" .ci/.jenkins_ruby.yml | grep -v 'observability-ci' | cut -d'-' -f2- | \
+  while read -r version;
+  do
+      transformedName=${version/:/-}
+      transformedVersion=$(echo "${version}" | cut -d":" -f2)
+      imageName="apm-agent-ruby"
+      registryImageName="docker.elastic.co/observability-ci/${imageName}:${transformedName}"
+      (retry 2 docker pull "${registryImageName}")
+      docker tag "${registryImageName}" "${imageName}:${transformedVersion}"
+  done
+fi

data/.gitignore

@@ -22,4 +22,6 @@ vendor/
 log/
 
 benchmark-*.error
-benchmark-*.raw
+benchmark-*.raw
+
+.ci/docker/jruby/output.log

data/.rspec

@@ -1,3 +1,2 @@
 --color
---require spec_helper
 --exclude-pattern spec/integration/**/*_spec.rb

data/.rubocop.yml

@@ -4,6 +4,8 @@ AllCops:
     - 'elastic-apm.gemspec'
     - 'vendor/**/*'
     - 'bench/*'
+    - 'spec/support/helloworld_pb.rb'
+    - 'spec/support/helloworld_services_pb.rb'
 
 require:
   - rubocop-performance
@@ -96,5 +98,15 @@ Style/SpecialGlobalVars:
 Style/MissingRespondToMissing:
   Enabled: false
 
-Style/BracesAroundHashParameters:
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
   Enabled: false
+

data/CHANGELOG.asciidoc

@@ -35,6 +35,98 @@ endif::[]
 [[release-notes-3.x]]
 === Ruby Agent version 3.x
 
+[[release-notes-3.10.0]]
+==== 3.10.0 (2020-08-26)
+
+[float]
+===== Added
+
+- Config option `transaction_ignore_urls` to replace `ignore_url_patterns` {pull}844[#844]
+- Prepend `(?-i)` to patterns to make them case-sensitive {pull}846[#846]
+
+[float]
+===== Fixed
+
+- Reverted {pull}839[#839]
+- Improved Kubernetes pod ID detection {pull}859[#859]
+
+[[release-notes-3.9.0]]
+==== 3.9.0 (2020-08-04)
+
+[float]
+===== Fixed
+- Scrub request body of illegal UTF-8 characters {pull}832[#832]
+
+[float]
+===== Added
+
+- Support for DynamoDB {pull}827[#827]
+
+[float]
+===== Fixed
+
+- Fix Rails Engine views' paths being reported as absolute {pull}839[#839]
+- Fix an issue when using Elasticsearch spy without a running agent {pull}830[#830]
+
+[[release-notes-3.8.0]]
+==== 3.8.0 (2020-06-18)
+
+[float]
+===== Added
+
+- Add the option `capture_elasticsearch_queries` {pull}789[#789]
+- Add option to skip patching Kernal#require {pull}812[#812]
+- Add option `service_node_name` {pull}820[#820]
+
+[float]
+===== Fixed
+
+- Allow underscores in hostnames in Net::HTTP spy {pull}804[#804]
+- Don't change log level on logger object via remote config {pull}809[#809]
+- Update and fix the Opentracing bridge {pull}791[#791]
+
+[[release-notes-3.7.0]]
+==== 3.7.0 (2020-05-14)
+
+[float]
+===== Changed
+
+- Make config values dynamic so they can be changed via the remote config {pull}747[#747]
+- Log the updated options from central config in addition to cumulative modifications {pull}758[#758]
+
+[float]
+===== Fixed
+
+- Ensure that the log level is updated for the config's logger when value is changed {pull}755[#755]
+- Set config `false` values to `false`, not `nil` {pull}761[#761]
+- Ensure that the previously running agent's config is used in `ElasticAPM.restart` {pull}763[#763]
+- Handle the Resque spy's payload class value being a String or Class and update docs {pull}768[#768]
+- Add finalizer on ProxyPipe::Write so Zlib::GzipWriter is properly closed {pull}787[#787]
+
+[float]
+===== Added
+
+- Add enabled config option, replacing active {pull}669[#669]
+- Add recording config option {pull}765[#765]
+- Add support for `SuckerPunch` {pull}775[#775]
+- Support forking: Detect forking and restart agent tasks and background threads {pull}783[#783]
+
+[[release-notes-3.6.0]]
+==== 3.6.0 (2020-03-10)
+
+[float]
+===== Added
+
+- Support for gRPC using the `grpc` gem (Experimental) {pull}669[#669]
+- GraphQL support (experimental) {pull}721[#721]
+- Add `span.context.destination.address` and `span.context.destination.port` when available. {pull}722[#722]
+- Add support for Resque. {pull}729[#729]
+
+[float]
+===== Changed
+
+- The new SQL parser is used by default {pull}730[#730]
+
 [[release-notes-3.5.0]]
 ==== 3.5.0 (2020-02-12)