Merge pull request #56 from comicrelief/fix_iopipe

Fix iopipe

Author: adamclark-dev

package.json

@@ -42,9 +42,9 @@
     ]
   },
   "dependencies": {
-    "@iopipe/iopipe": "1.15.0",
+    "@iopipe/iopipe": "1.15.1",
     "@iopipe/profiler": "2.1.2",
-    "@iopipe/trace": "1.4.1",
+    "@iopipe/trace": "1.5.1",
     "alai": "1.0.3",
     "async": "2.6.3",
     "aws-sdk": "2.493.0",

src/Service/Logger.service.js

@@ -1,6 +1,5 @@
 import Winston from 'winston';
 import Raven from 'raven';
-import { label, metric } from '@iopipe/iopipe';
 
 import DependencyAwareClass from '../DependencyInjection/DependencyAware.class';
 import DependencyInjection from '../DependencyInjection/DependencyInjection.class';
@@ -114,7 +113,7 @@ export default class LoggerService extends DependencyAwareClass {
    */
   label(descriptor, silent = false) {
     if (typeof process.env.IOPIPE_TOKEN === 'string' && process.env.IOPIPE_TOKEN !== 'undefined') {
-      label(descriptor);
+      this.getContainer().getContext().iopipe.label(descriptor);
     }
 
     if (silent === false) {
@@ -130,7 +129,7 @@ export default class LoggerService extends DependencyAwareClass {
    */
   metric(descriptor, stat, silent = false) {
     if (typeof process.env.IOPIPE_TOKEN === 'string' && process.env.IOPIPE_TOKEN !== 'undefined') {
-      metric(descriptor, stat);
+      this.getContainer().getContext().iopipe.metric(descriptor, stat);
     }
 
     if (silent === false) {

src/Service/Timer.service.js

@@ -1,5 +1,3 @@
-import { mark } from '@iopipe/iopipe';
-
 import DependencyAwareClass from '../DependencyInjection/DependencyAware.class';
 import DependencyInjection from '../DependencyInjection/DependencyInjection.class';
 import { DEFINITIONS } from '../Config/Dependencies';
@@ -25,7 +23,7 @@ export default class TimerService extends DependencyAwareClass {
     this.timers[identifier] = new Date().getTime();
 
     if (typeof process.env.IOPIPE_TOKEN === 'string' && process.env.IOPIPE_TOKEN !== 'undefined') {
-      mark.start(identifier);
+      this.getContainer().getContext().iopipe.mark.start(identifier);
     }
   }
 
@@ -41,7 +39,7 @@ export default class TimerService extends DependencyAwareClass {
     }
 
     if (typeof process.env.IOPIPE_TOKEN === 'string' && process.env.IOPIPE_TOKEN !== 'undefined') {
-      mark.end(identifier);
+      this.getContainer().getContext().iopipe.mark.end(identifier);
     }
   }
 }

yarn.lock

@@ -110,16 +110,16 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@iopipe/config@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@iopipe/config/-/config-1.4.1.tgz#0a80dd9fece853768401e646320620a2308a6987"
-  integrity sha512-jV9d1JRGPfZwKg7zg/BvqY9NDLBbw7pVQveCoqBwEFQjL1mG1dfZ8YPMzNJ1C4yRbcupIfF8NxeU/1EeAxMxYQ==
+"@iopipe/config@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@iopipe/config/-/config-1.4.2.tgz#791d7e3132b70e8d710fb2f1a383a99532671e7a"
+  integrity sha512-tfojIkxLTnW69GRIfKceuJpWRnMJ82u5649akg7lYwQi1jzYGZqy+RonOci+kPHWr5o0+LFTh9c0MJqW1f/Rcw==
   dependencies:
     "@iopipe/event-info" "^1.3.1"
-    "@iopipe/profiler" "^2.1.0"
+    "@iopipe/profiler" "^2.1.2"
     "@iopipe/trace" "^1.4.1"
 
-"@iopipe/core@^1.19.0":
+"@iopipe/core@^1.19.1":
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/@iopipe/core/-/core-1.19.1.tgz#19da388f0c900f4551915c71993b4c1269979970"
   integrity sha512-JyEcARVnE+TMYodEu9jV61CpWGqmBaAqfvUWX1m5ot1kzbXDS5gvnD/opYsNRteALluiLcb42TRxlEuPCTmijQ==
@@ -136,15 +136,15 @@
     flat "^4.0.0"
     lodash.get "^4.4.2"
 
-"@iopipe/iopipe@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@iopipe/iopipe/-/iopipe-1.15.0.tgz#231729a4141e09ed241d0d62a2b5d1e629c0bae4"
-  integrity sha512-WaGDpoInvopGQh/8RegQm+viLW7KIY+hUFinlmHMnoNApSQEjSSRWWs8rHM4n1AACQrvOYo/G9TSs9K89s2YaA==
+"@iopipe/iopipe@1.15.1":
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/@iopipe/iopipe/-/iopipe-1.15.1.tgz#d8f84b6dbf4ff92a0ff8aca38dd707fd9fb4c5ac"
+  integrity sha512-LIJPA1+Ggqa0SU0Rqr3qnWehhtBSNVq50q8zfhwYKjzQNSE5uJg6DTFpEnnKOid0vvOixDIhJmpmQjAwb/0ogA==
   dependencies:
-    "@iopipe/config" "^1.4.1"
-    "@iopipe/core" "^1.19.0"
+    "@iopipe/config" "^1.4.2"
+    "@iopipe/core" "^1.19.1"
 
-"@iopipe/profiler@2.1.2", "@iopipe/profiler@^2.1.0":
+"@iopipe/profiler@2.1.2", "@iopipe/profiler@^2.1.2":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@iopipe/profiler/-/profiler-2.1.2.tgz#8d17a175450827caf110b410796c776a18bc1e18"
   integrity sha512-crrdK1Ywftn4qn2Heq7Eq3i6THdZtF+5O3RAUqf+w4rk1xyDNvDMiINejBvPVEa/jLlbpU0kqnYK5JsExG2YHw==
@@ -153,7 +153,20 @@
     lodash.get "^4.4.2"
     simple-get "^3.0.3"
 
-"@iopipe/trace@1.4.1", "@iopipe/trace@^1.4.1":
+"@iopipe/trace@1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@iopipe/trace/-/trace-1.5.1.tgz#a8332c9747f35ffd3b05d7ffe27464ce675f6d2e"
+  integrity sha512-egKW72exXGMucc0RTNpV5lw13UBa4i++lgYwqBM5RI3yBI9LfwwuBlBzeJacPbswv+tXKEwFj+JbSzdvYMnNng==
+  dependencies:
+    flat "^4.0.0"
+    isarray "^2.0.4"
+    lodash.pickby "^4.6.0"
+    performance-node "^0"
+    semver "^6.3.0"
+    shimmer "^1.2.1"
+    uuid "^3.2.1"
+
+"@iopipe/trace@^1.4.1":
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@iopipe/trace/-/trace-1.4.1.tgz#dd773b0bf33e563940e13b37d1b6b818e331f001"
   integrity sha512-9QBkTSfLPDV22dJeCP+pIT8Qg6bLel61nezZyn8lB3wOoktp41FcCK/xrWqwNSWORGYMNwVwKs506cyxK6lrLg==
@@ -2291,7 +2304,7 @@ debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -3843,7 +3856,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -4585,7 +4598,7 @@ libnpm@^3.0.0:
     read-package-json "^2.0.13"
     stringify-package "^1.0.0"
 
-libnpmaccess@*, libnpmaccess@^3.0.1:
+libnpmaccess@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8"
   integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA==
@@ -4614,7 +4627,7 @@ libnpmhook@^5.0.2:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmorg@*, libnpmorg@^1.0.0:
+libnpmorg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.0.tgz#979b868c48ba28c5820e3bb9d9e73c883c16a232"
   integrity sha512-o+4eVJBoDGMgRwh2lJY0a8pRV2c/tQM/SxlqXezjcAg26Qe9jigYVs+Xk0vvlYDWCDhP0g74J8UwWeAgsB7gGw==
@@ -4648,7 +4661,7 @@ libnpmsearch@^2.0.0, libnpmsearch@^2.0.1:
     get-stream "^4.0.0"
     npm-registry-fetch "^3.8.0"
 
-libnpmteam@*, libnpmteam@^1.0.1:
+libnpmteam@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.1.tgz#ff704b1b6c06ea674b3b1101ac3e305f5114f213"
   integrity sha512-gDdrflKFCX7TNwOMX1snWojCoDE5LoRWcfOC0C/fqF7mBq8Uz9zWAX4B2RllYETNO7pBupBaSyBDkTAC15cAMg==
@@ -4742,11 +4755,6 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -4755,33 +4763,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -4847,11 +4833,6 @@ lodash.pickby@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
   integrity sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
@@ -5514,7 +5495,7 @@ npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@*, npm-profile@^4.0.1:
+npm-profile@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.1.tgz#d350f7a5e6b60691c7168fbb8392c3603583f5aa"
   integrity sha512-NQ1I/1Q7YRtHZXkcuU1/IyHeLy6pd+ScKg4+DQHdfsm769TGq6HPrkbuNJVJS4zwE+0mvvmeULzQdWn2L2EsVA==
@@ -6170,7 +6151,7 @@ pathval@^1.1.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
   integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
 
-performance-node@^0.2.0:
+performance-node@^0, performance-node@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-node/-/performance-node-0.2.0.tgz#03abf74ac0c455f333be505165dacab9110ef5b3"
   integrity sha1-A6v3SsDEVfMzvlBRZdrKuREO9bM=
@@ -6981,6 +6962,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
   integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"