Merge remote-tracking branch 'upstream/master' into object_keys_on_null

.drone.yml

@@ -0,0 +1,12 @@
+image: node
+git:
+  depth: 1
+script:
+  - bash -c 'source /home/ubuntu/nvm/nvm.sh && nvm install 0.10 && curl -L https://npmjs.org/install.sh | sh && echo "Running tests for node.js latest 0.10" && npm test'
+services:
+  - orchardup/mysql
+  - dockerfile/mongodb
+  - borja/docker-memcached
+  - library/redis
+  - zmarcantel/cassandra
+  - zaiste/postgresql

.eslintrc

@@ -0,0 +1,29 @@
+{
+  "env": {
+    "node": true
+  },
+  "global": [
+    "after",
+    "afterEach",
+    "before",
+    "beforeEach",
+    "describe",
+    "it"
+  ],
+  "rules": {
+    "eqeqeq": 2,
+    "guard-for-in": 2,
+    "wrap-iife": 2,
+    "no-unused-vars": 2,
+    "no-undef": 0, //this seems broken
+    "max-len": [2, 90],
+    "max-depth": [2, 3],
+    "max-params": [2, 4],
+    "new-cap": 2,
+    "no-new": 2,
+    "semi": [2, "never"],
+    "dot-notation": 0,
+    "shadow": false,
+    "quotes": [0, "single"],
+  }
+}

.jshintrc

@@ -6,12 +6,13 @@
   "immed": true,
   "unused": true,
   "undef": true,
-  "latedef": true,
   "maxlen": 90,
   "maxdepth": 3,
   "maxparams": 4,
   "newcap": true,
   "nonew": true,
+  "asi": true,
+  "lastsemic": true,
   "sub": true,
   "shadow": false,
   "predef": [

Makefile

@@ -3,8 +3,10 @@ MOCHA_NOBIN  = node_modules/.bin/_mocha
 COVER        = node_modules/.bin/cover
 TAP          = node_modules/.bin/tap
 NODE_VERSION = $(shell node --version)
-INTEGRATION  =  $(wildcard test/integration/*.tap.js)
-INTEGRATION  += $(wildcard test/versioned/*/*.tap.js)
+INTEGRATION  =  test/integration/*.tap.js
+INTEGRATION  += test/integration/*/*.tap.js
+INTEGRATION  += test/integration/*/*/*.tap.js
+INTEGRATION  += test/versioned/*/*.tap.js
 # subcomponents manage their own modules
 NPMDIRS =  $(wildcard test/lib/bootstrap/*)
 NPMDIRS += $(wildcard test/versioned/*)
@@ -49,12 +51,12 @@ test-clean:
 
 test-ci: node_modules sub_node_modules $(CERTIFICATE)
 	@rm -f newrelic_agent.log
-	@$(MOCHA) --reporter min
+	@$(MOCHA) test/unit --recursive --reporter min
 	@$(TAP) $(INTEGRATION)
 
 unit: node_modules
 	@rm -f newrelic_agent.log
-	@$(MOCHA)
+	@$(MOCHA) test/unit --recursive
 
 sub_node_modules: $(SUBNPM)
 
@@ -78,7 +80,7 @@ integration: node_modules sub_node_modules ca-gen $(CERTIFICATE)
 	time $(TAP) $(INTEGRATION)
 
 coverage: clean node_modules $(CERTIFICATE)
-	@$(COVER) run $(MOCHA_NOBIN)
+	@$(COVER) run $(MOCHA_NOBIN) -- test/unit --recursive
 	@for tapfile in $(INTEGRATION) ; do \
 		$(COVER) run $$tapfile ; \
 	done
@@ -94,10 +96,10 @@ notes:
 	      -type f -exec egrep -n -H --color=always -C 2 'FIXME|TODO|NOTE|TBD|hax|HAX' {} \; | less -r
 
 pending: node_modules
-	@$(MOCHA) --reporter list | egrep '^\s+\-'
+	@$(MOCHA) test/unit --recursive --reporter list | egrep '^\s+\-'
 
 pending-core: node_modules
-	@$(MOCHA) --reporter list | egrep '^\s+\-' | grep -v 'agent instrumentation of'
+	@$(MOCHA) test/unit --recursive --reporter list | egrep '^\s+\-' | grep -v 'agent instrumentation of'
 
 ssl: $(CERTIFICATE)
 
@@ -168,3 +170,8 @@ services:
 
 	@echo "\nTo run individual integration tests, run 'source test/docker_env_vars.sh' to set\
 	 the environment variables for all services.\n"
+
+update_cross_agent_tests:
+	rm -rf test/lib/cross_agent_tests
+	git clone [email protected]:newrelic/cross_agent_tests.git test/lib/cross_agent_tests
+	rm -rf test/lib/cross_agent_tests/.git

NEWS.md

@@ -1,3 +1,44 @@
+### v1.12.0 (2014-10-06):
+
+* Added support for Cross Application Tracing
+
+  The agent now supports Cross Application Tracing, which allows the New Relic
+  APM UI to display traces that span multiple applications.
+  https://docs.newrelic.com/docs/apm/traces/cross-application-traces/cross-application-traces
+
+* Fixed a bug that would cause application to crash on request when using the
+  kraken framework.
+
+* Loosened the restrictions on the `app_name` setting. Application names may now
+  include any Unicode characters.
+
+### v1.11.5 (2014-10-06):
+
+* Fixed a type error while checking the payload size to be sent to the New Relic
+  servers.
+
+  When this happened the agent would fail to send the payload to New Relic. This
+  was more likely to occur in higher throughput applications.
+
+### v1.11.4 (2014-10-03):
+
+* Fixed a bug where mutibyte characters would cause an error when sending data
+  to the New Relic servers.
+
+### v1.11.3 (2014-09-26):
+
+* Updated hapi instrumentation to support the recently released v6.9.
+
+* Fixed a bug where an invalid package.json could cause the agent to crash while
+  it recursed through `node_modules` gathering version details.
+
+* Properly name `other` SQL queries.
+
+  Previously when the agent failed to parse SQL it would create a metric stating
+  the database type, query type, and query table were all unknown. This has been
+  changed to keep track of database type and create an appropriate `other`
+  operation metric like other agents.
+
 ### v1.11.2 (2014-09-19):
 
 * Custom Instrumentation functions now pass through the return value of their