Initialise customer's copy of dd-trace (#190)

* [serverless] add support for initing local dd-trace versions

* Bump dd-trace version

Author: DarcyRaynerDD

package.json

@@ -25,7 +25,7 @@
     "@types/node": "^15.6.1",
     "@types/promise-retry": "^1.1.3",
     "@types/shimmer": "^1.0.1",
-    "dd-trace": "0.33.2",
+    "dd-trace": "0.34.0",
     "jest": "^27.0.1",
     "mock-fs": "4.14.0",
     "nock": "13.0.11",

src/handler.ts

@@ -11,8 +11,11 @@ if (process.env.DD_TRACE_DISABLED_PLUGINS === undefined) {
 }
 
 if (getEnvValue("DD_TRACE_ENABLED", "true").toLowerCase() === "true") {
+  // Looks for the function local version of dd-trace first, before using
+  // the version provided by the layer
+  const path = require.resolve("dd-trace", { paths: ["/var/task/node_modules", ...module.paths] });
   // tslint:disable-next-line:no-var-requires
-  require("dd-trace").init({
+  require(path).init({
     tags: {
       "_dd.origin": "lambda",
     },

yarn.lock

@@ -1212,10 +1212,10 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-dd-trace@0.33.2:
-  version "0.33.2"
-  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-0.33.2.tgz#a3a93f6a0ad190081fb21ddb039fb965618c7df3"
-  integrity sha512-PXn58Nj2Y/rnnj46cgKHhqBBHCRJfAj8HcOtBDp5K6OQbl1BYFRgX9j+xe39zZj+QE9wpRvWbp9A5xRFN2r72A==
+dd-trace@0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-0.34.0.tgz#0c93f6524c56fc4303f397db0e88b57fc916ad15"
+  integrity sha512-X5pyS88NbHTcS8BcnoC79n/xiZdXjwMSAsEtnyRGteU8iYIBkpkSdmyxQdQB+843tLKK6/7Y9kR7qAz9yfAt2g==
   dependencies:
     "@types/node" "^10.12.18"
     form-data "^3.0.0"