elastic-apm 3.4.0 → 3.9.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

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source /usr/local/bin/bash_standard_lib.sh
+
+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/.github/ISSUE_TEMPLATE/Bug_report.md

@@ -4,26 +4,28 @@ about: Create a report to help us improve
 
 ---
 
-**Describe the bug**: ...
-
-**To Reproduce**
+## Describe the bug
 
+## Steps to reproduce
+<!--
 1. ...
 2. ...
 3. ...
 4. ...
+-->
 
-**Expected behavior**: ...
+## Expected behavior
 
-**Environment (please complete the following information)**
-- OS: [e.g. Linux]
-- Ruby version:
-- Framework and version [e.g. Rails 6.0.1]: 
-- APM Server version:
-- Agent version:
+## Environment
+<!-- Please complete the following information -->
+- **OS**: <!-- [e.g. Linux] -->
+- **Ruby version**:
+- **Framework and version**: <!-- [e.g. Rails 6.0.1] -->
+- **APM Server version**:
+- **Agent version**:
 
 
-**Additional context**
+## Additional context
 
 Add any other context about the problem here.
 

data/.github/ISSUE_TEMPLATE/Feature_request.md

@@ -4,14 +4,14 @@ about: Suggest an idea for this project
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+## Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## Describe alternatives you've considered
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional context
+<!-- Add any other context or screenshots about the feature request here. -->

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,60 @@
+<!--
+A few suggestions about filling out this PR
+
+1. Use a descriptive title for the PR.
+2. If this pull request is work in progress, create a draft PR instead of prefixing the title with WIP.
+3. Please label this PR at least one of the following labels, depending on the scope of your change:
+- feature request, which adds new behavior
+- bug fix
+- enhancement, which modifies existing behavior
+- breaking change
+4. Remove those recommended/optional sections if you don't need them. Only "What does this PR do", "Why is it important?" and "Checklist" are mandatory.
+5. Generally, we require that you test any code you are adding or modifying.
+Once your changes are ready to submit for review:
+6. Submit the pull request: Push your local changes to your forked copy of the repository and submit a pull request (https://help.github.com/articles/using-pull-requests).
+7. Please be patient. We might not be able to review your code as fast as we would like to, but we'll do our best to dedicate to it the attention it deserves. Your effort is much appreciated!
+-->
+
 ## What does this pull request do?
 
-<!-- Comment:
-Here you can explain the changes made on the PR.
+<!--
+Use this space to describe what the proposed code _does_, ie. what precisely will be done differently from this change.
 -->
 
 ## Why is it important?
 
-<!-- Comment:
-Here you can explains how this change will impact the funcionality of the agent
+<!--
+Optionally provide an explanation of why this is important.
+-->
+
+## Checklist
+<!--
+Add a checklist of things that are required to be reviewed in order to have the PR approved
+
+List here all the items you have verified BEFORE sending this PR. Please DO NOT remove any item, striking through those that do not apply. (Just in case, strikethrough uses two tildes. ~~Scratch this.~~)
 -->
 
+- [ ] I have signed the [Contributor License Agreement](https://www.elastic.co/contributor-agreement/). 
+- [ ] My code follows the style guidelines of this project (See `.rubocop.yml`)
+- [ ] I have rebased my changes on top of the latest master branch
+<!--
+Update your local repository with the most recent code from the main repo, and rebase your branch on top of the latest master branch. We prefer your initial changes to be squashed into a single commit. Later, if we ask you to make changes, add them as separate commits. This makes them easier to review.
+-->
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing [**unit** tests](https://github.com/elastic/apm-agent-ruby/blob/master/CONTRIBUTING.md#testing) pass locally with my changes
+<!--
+Run the test suite to make sure that nothing is broken. See https://github.com/elastic/apm-agent-ruby/blob/master/CONTRIBUTING.md#testing for details.
+-->
+- [ ] I have made corresponding changes to the documentation
+- [ ] I have updated [CHANGELOG.asciidoc](CHANGELOG.asciidoc)
+- [ ] I have updated [supported-technologies.asciidoc](docs/supported-technologies.asciidoc)
+- [ ] Added an API method or config option? Document in which version this will be introduced
+
 ## Related issues
-closes #ISSUE
+<!--
+Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it.
+- Closes #ISSUE_ID
+- Relates #ISSUE_ID
+- Requires #ISSUE_ID
+- Superseds #ISSUE_ID
+-->