test(instrumentation): parallelize and clean up tests

Author: dszakallas

circle.yml

@@ -18,10 +18,8 @@ test:
   override:
     - ./scripts/run-ci.sh ./scripts/prepare.sh
     - ./scripts/run-ci.sh ./scripts/lint.sh
-    - ./scripts/run-ci.sh ./scripts/node-matrix.sh ./scripts/prepare.sh ./scripts/test-unit.sh ./scripts/test-cover.sh ./scripts/test-e2e.sh:
+    - ./scripts/run-ci.sh ./scripts/node-matrix.sh ./scripts/prepare.sh ./scripts/test-unit.sh ./scripts/test-cover.sh ./scripts/test-e2e.sh && ./scripts/run-ci.sh ./scripts/test-instrumentations.sh:
         parallel: true
-    - ./scripts/run-ci.sh ./scripts/prepare.sh
-    - ./scripts/run-ci.sh ./scripts/test-instrumentations.sh
 
 deployment:
   release:

scripts/test-instrumentations.sh

@@ -9,4 +9,5 @@ if [[ -z $INSTR_TARGET_VERSIONS ]]; then
 fi
 
 cd ./test/instrumentations
-make test TARGET_VERSIONS=$INSTR_TARGET_VERSIONS
+make test TARGET_VERSIONS=$INSTR_TARGET_VERSIONS \
+    NODE_INDEX=$NODE_INDEX NODE_TOTAL=$NODE_TOTAL

test/instrumentations/Makefile

@@ -4,6 +4,8 @@ cur_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 cur_dir := $(dir $(cur_path))
 cur_base := $(notdir $(cur_path))
 
+export PATH := $(shell npm bin):$(PATH)
+
 # Use this variable for invoking the test runner
 export MOCHA := $(shell npm bin)/mocha
 
@@ -15,21 +17,32 @@ export MOCHA := $(shell npm bin)/mocha
 # one: most important version, stable version for smoke test
 #
 # Default is all, but it can be overriden from the command line
-TARGET_VERSIONS?=all
+TARGET_VERSIONS ?= all
 configure_targets = $(if $(filter one,$(TARGET_VERSIONS)),$(1),$(if $(filter some,$(TARGET_VERSIONS)),$(2),)$(if $(filter all,$(TARGET_VERSIONS)),$(3),))
 
 # Every library instrumentation should have a subrecipe in its directory
 # containing the target test_suite_<LIBRARY_NAME>
 # and should append <LIBRARY_NAME> to the variable `targets`
-include $(cur_dir)/*/*.mk
+ifndef TARGET_LIBRARIES
+	include $(cur_dir)/*/*.mk
+else
+	include $(patsubst %, $(cur_dir)/%/*.mk, $(TARGET_LIBRARIES))
+endif
+
+# Used for running tests in parallel if possible which will speed up the job on
+# CircleCI.
+NODE_INDEX ?= 0
+NODE_TOTAL ?= 1
 
-# We have a common package json for every test suite, because it is much more
-# fast this way. Of course you could install other dependencies in the test
-# suites. This is actually needed for versioning.
+# We have a common package json for every test suite, because it is faster
+# this way. Of course you could install other dependencies in the test suites.
+# This is actually needed for versioning.
 before :
+	@node --version
+	@npm --version
 	npm i
 
-test : $(targets:%=test_suite_%)
+test : $(shell $(cur_dir)/distribute-tasks.py $(NODE_INDEX) $(NODE_TOTAL) $(targets:%=test_suite_%))
 
 # On best practices for writing a test suite for an instrumentation, please
 # see mysql/mysql.mk

test/instrumentations/amqplib/amqplib.mk

@@ -31,7 +31,7 @@ before_$(target) : before
 	@echo '*---------------*'
 	@echo '| amqplib       |'
 	@echo '*---------------*'
-	npm i amqplib
+	@npm i amqplib
 	AMQP_URL=$(amqp_url) $(addprefix $(cur_dir), verify.js)
 
 # this should run after `before` for each of the version targets

test/instrumentations/distribute-tasks.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python2
+import sys
+import math
+
+node_index = int(sys.argv[1])
+node_total = int(sys.argv[2])
+tasks = sys.argv[3:]
+task_total = len(tasks)
+
+config = [
+        tasks[i * node_total + node_index]
+        for i in range(0, int(math.ceil(task_total / node_total)) + 1)
+        if (i * node_total + node_index) < task_total
+    ]
+print ' '.join(config)

test/instrumentations/index.spec.cls.js

@@ -30,7 +30,7 @@ before_$(target) : before
 	@echo '*---------------*'
 	@echo '| mongodb       |'
 	@echo '*---------------*'
-	npm i mongodb
+	@npm i mongodb
 	$(addprefix $(cur_dir), dbVerify.js) $(db_url)
 
 # this should run after `before` for each of the version targets

test/instrumentations/mongodb/mongodb.mk

@@ -59,7 +59,7 @@ before_$(target) : before
 	@echo '*---------------*'
 	@echo '| mysql         |'
 	@echo '*---------------*'
-	npm i mysql
+	@npm i mysql
 	# this script throws an error if it can't access the db
 	MYSQL_HOST=$(db_host) $(addprefix $(cur_dir), dbVerify.js)
 

test/instrumentations/mysql/mysql.mk

@@ -3,22 +3,10 @@
   "name": "@risingstack/trace-tests-instrumentation",
   "devDependencies": {
     "@risingstack/trace": "../..",
-    "body-parser": "1.15.2",
-    "bookshelf": "0.10.2",
-    "cassandra-driver": "3.1.6",
     "chai": "3.5.0",
     "freshy": "^1.0.2",
-    "ioredis": "2.4.2",
-    "knex": "0.12.6",
-    "koa": "1.2.4",
-    "lodash.defaultsdeep": "^4.5.1",
-    "memcached": "2.2.2",
     "mocha": "3.2.0",
-    "mongoose": "4.7.2",
-    "redis": "2.6.3",
     "sinon": "1.17.6",
-    "sinon-chai": "2.8.0",
-    "superagent": "3.2.1",
-    "supertest": "2.0.1"
+    "sinon-chai": "2.8.0"
   }
 }

test/instrumentations/package.json

@@ -31,8 +31,7 @@ before_$(target) : before
 	@echo '*---------------*'
 	@echo '| pg            |'
 	@echo '*---------------*'
-	npm i pg pg-native
-	npm rebuild
+	@npm i pg pg-native
 	DB_URL=$(db_url) $(addprefix $(cur_dir), dbVerify.js)
 
 # this should run after `before` for each of the version targets