feat: AWS S3 instrumentation

.ci/.jenkins_nodejs.yml

@@ -1,7 +1,6 @@
 NODEJS_VERSION:
   - "16"
   - "16.0"
-  - "15"
   - "14"
   - "14.0"
   - "12"

.ci/Jenkinsfile

@@ -460,6 +460,7 @@ def generateStepForWindows(Map params = [:]){
                "ELASTIC_APM_ASYNC_HOOKS=${ELASTIC_APM_ASYNC_HOOKS}",
                "CASSANDRA_HOST=${linuxIp}",
                "ES_HOST=${linuxIp}",
+               "LOCALSTACK_HOST=${linuxIp}",
                "MEMCACHED_HOST=${linuxIp}",
                "MONGODB_HOST=${linuxIp}",
                "MSSQL_HOST=${linuxIp}",

.ci/docker/docker-compose-all.yml

@@ -33,6 +33,10 @@ services:
     extends:
       file: docker-compose.yml
       service: memcached
+  localstack:
+    extends:
+      file: docker-compose.yml
+      service: localstack
   node_tests:
     extends:
       file: docker-compose-node-test.yml
@@ -54,6 +58,8 @@ services:
         condition: service_healthy
       memcached:
         condition: service_healthy
+      localstack:
+        condition: service_healthy
 
 volumes:
   nodepgdata:
@@ -68,3 +74,5 @@ volumes:
     driver: local
   nodecassandradata:
     driver: local
+  nodelocalstackdata:
+    driver: local

.ci/docker/docker-compose-edge.yml

@@ -9,6 +9,10 @@ services:
     extends:
       file: docker-compose.yml
       service: elasticsearch
+  localstack:
+    extends:
+      file: docker-compose.yml
+      service: localstack
   memcached:
     extends:
       file: docker-compose.yml
@@ -42,6 +46,8 @@ services:
         condition: service_healthy
       elasticsearch:
         condition: service_healthy
+      localstack:
+        condition: service_healthy
       memcached:
         condition: service_healthy
       mongodb:
@@ -64,6 +70,8 @@ volumes:
     driver: local
   nodemysqldata:
     driver: local
+  nodelocalstackdata:
+    driver: local
   nodeesdata:
     driver: local
   nodecassandradata:

.ci/docker/docker-compose-localstack.yml

@@ -0,0 +1,14 @@
+version: '2.1'
+
+services:
+  localstack:
+    extends:
+      file: docker-compose.yml
+      service: localstack
+  node_tests:
+    extends:
+      file: docker-compose-node-test.yml
+      service: node_tests
+    depends_on:
+      localstack:
+        condition: service_healthy

.ci/docker/docker-compose-node-edge-test.yml

@@ -22,6 +22,7 @@ services:
       PGHOST: 'postgres'
       PGUSER: 'postgres'
       MEMCACHED_HOST: 'memcached'
+      LOCALSTACK_HOST: 'localstack'
       NODE_VERSION: ${NODE_VERSION}
       NVM_NODEJS_ORG_MIRROR: ${NVM_NODEJS_ORG_MIRROR}
       ELASTIC_APM_ASYNC_HOOKS: ${ELASTIC_APM_ASYNC_HOOKS}

.ci/docker/docker-compose-node-test.yml

@@ -20,6 +20,7 @@ services:
       PGHOST: 'postgres'
       PGUSER: 'postgres'
       MEMCACHED_HOST: 'memcached'
+      LOCALSTACK_HOST: 'localstack'
       NODE_VERSION: ${NODE_VERSION}
       TAV: ${TAV_MODULE}
       ELASTIC_APM_ASYNC_HOOKS: ${ELASTIC_APM_ASYNC_HOOKS}

.ci/docker/docker-compose.yml

@@ -114,6 +114,22 @@ services:
       timeout: 10s
       retries: 5
 
+  localstack:
+    # https://hub.docker.com/r/localstack/localstack/tags
+    image: localstack/localstack:0.12.12
+    environment:
+      - LOCALSTACK_SERVICES=s3
+      - DATA_DIR=/var/lib/localstack
+    ports:
+      - "4566:4566"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4566/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - nodelocalstackdata:/var/lib/localstack
+
 volumes:
   nodepgdata:
     driver: local
@@ -127,3 +143,5 @@ volumes:
     driver: local
   nodecassandradata:
     driver: local
+  nodelocalstackdata:
+    driver: local

.ci/scripts/docker-test.sh

@@ -15,7 +15,7 @@ fi
 # Skip for node v8 because it results in this warning:
 #   openssl config failed: error:25066067:DSO support routines:DLFCN_LOAD:could not load the shared library
 if [[ $major_node_version -gt 8 ]]; then
-  export NODE_OPTIONS="${NODE_OPTIONS:+${NODE_OPTIONS}} --openssl-config=./test/openssl-config-for-testing.cnf"
+  export NODE_OPTIONS="${NODE_OPTIONS:+${NODE_OPTIONS}} --openssl-config=$(pwd)/test/openssl-config-for-testing.cnf"
 fi
 
 # Workaround to git <2.7

.ci/scripts/test.sh

@@ -200,6 +200,9 @@ elif [[ -n "${TAV_MODULE}" ]]; then
     memcached)
       DOCKER_COMPOSE_FILE=docker-compose-memcached.yml
       ;;
+    aws-sdk)
+      DOCKER_COMPOSE_FILE=docker-compose-localstack.yml
+      ;;
     *)
       # Just the "node_tests" container. No additional services needed for testing.
       DOCKER_COMPOSE_FILE=docker-compose-node-test.yml
@@ -210,6 +213,8 @@ else
   DOCKER_COMPOSE_FILE=docker-compose-all.yml
 fi
 
+ELASTIC_APM_ASYNC_HOOKS=${ELASTIC_APM_ASYNC_HOOKS:-true}
+
 set +e
 NVM_NODEJS_ORG_MIRROR=${NVM_NODEJS_ORG_MIRROR} \
 ELASTIC_APM_ASYNC_HOOKS=${ELASTIC_APM_ASYNC_HOOKS} \

.github/workflows/test.yml

@@ -105,12 +105,21 @@ jobs:
         volumes:
           - nodeesdata:/usr/share/elasticsearch/data
 
+      localstack:
+        image: localstack/localstack:0.12.12
+        env:
+          LOCALSTACK_SERVICES: 's3'
+          DATA_DIR: '/var/lib/localstack'
+        ports:
+          - "4566:4566"
+        volumes:
+          - nodelocalstackdata:/var/lib/localstack
+
     strategy:
       matrix:
         node:
           - '16'
           - '16.0'
-          - '15'
           - '14'
           - '14.0'
           - '12'

lib/agent.js

@@ -321,6 +321,7 @@ const EMPTY_OPTS = {}
 //
 // Usage:
 //    captureError(err, opts, cb)
+//    captureError(err, opts)
 //    captureError(err, cb)
 //
 // where:

lib/instrumentation/index.js

@@ -11,6 +11,7 @@ var shimmer = require('./shimmer')
 var Transaction = require('./transaction')
 
 var MODULES = [
+  '@aws-sdk/client-s3',
   '@elastic/elasticsearch',
   'apollo-server-core',
   'aws-sdk',