aws-embedded-metrics - npm Package Compare versions

Comparing version 1.1.1 to 2.0.0-rc1

lib/Constants.d.ts

 export declare enum Constants {
     MAX_DIMENSIONS = 9,
     DEFAULT_NAMESPACE = "aws-embedded-metrics",
-    MAX_METRICS_PER_EVENT = 100
+    MAX_METRICS_PER_EVENT = 100,
+    DEFAULT_AGENT_HOST = "0.0.0.0",
+    DEFAULT_AGENT_PORT = 25888
 }

lib/Constants.js

@@ -22,2 +22,4 @@ "use strict";
     Constants[Constants["MAX_METRICS_PER_EVENT"] = 100] = "MAX_METRICS_PER_EVENT";
+    Constants["DEFAULT_AGENT_HOST"] = "0.0.0.0";
+    Constants[Constants["DEFAULT_AGENT_PORT"] = 25888] = "DEFAULT_AGENT_PORT";
 })(Constants = exports.Constants || (exports.Constants = {}));

lib/environment/EC2Environment.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -23,0 +24,0 @@ });

lib/environment/EnvironmentDetector.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -28,2 +29,3 @@ });
 const DefaultEnvironment_1 = require("./DefaultEnvironment");
+const ECSEnvironment_1 = require("./ECSEnvironment");
 const EC2Environment_1 = require("./EC2Environment");
@@ -35,5 +37,10 @@ const LambdaEnvironment_1 = require("./LambdaEnvironment");
 const lambdaEnvironment = new LambdaEnvironment_1.LambdaEnvironment();
+const ecsEnvironment = new ECSEnvironment_1.ECSEnvironment();
 const ec2Environment = new EC2Environment_1.EC2Environment();
 const defaultEnvironment = new DefaultEnvironment_1.DefaultEnvironment();
-const environments = [lambdaEnvironment, ec2Environment];
+// ordering of this array matters
+// both Lambda and ECS can be determined from environment variables
+// making the entire detection process fast an cheap
+// EC2 can only be determined by making a remote HTTP request
+const environments = [lambdaEnvironment, ecsEnvironment, ec2Environment];
 let environment = undefined;
@@ -49,2 +56,4 @@ const getEnvironmentFromOverride = () => {
             return lambdaEnvironment;
+        case Environments_1.default.ECS:
+            return ecsEnvironment;
         case Environments_1.default.Local:
@@ -57,3 +66,3 @@ return new LocalEnvironment_1.LocalEnvironment();
 };
-const discoverEnvironment = () => __awaiter(this, void 0, void 0, function* () {
+const discoverEnvironment = () => __awaiter(void 0, void 0, void 0, function* () {
     Logger_1.LOG(`Discovering environment`);
@@ -73,3 +82,3 @@ for (const envUnderTest of environments) {
 });
-const _resolveEnvironment = () => __awaiter(this, void 0, void 0, function* () {
+const _resolveEnvironment = () => __awaiter(void 0, void 0, void 0, function* () {
     Logger_1.LOG('Resolving environment');
@@ -98,7 +107,9 @@ if (environment) {
 const environmentPromise = _resolveEnvironment();
-const resolveEnvironment = () => __awaiter(this, void 0, void 0, function* () {
+const resolveEnvironment = () => __awaiter(void 0, void 0, void 0, function* () {
     return environmentPromise;
 });
 exports.resolveEnvironment = resolveEnvironment;
-const cleanResolveEnvironment = () => __awaiter(this, void 0, void 0, function* () {
+// this method is used for testing to bypass the cached environmentPromise result
+const cleanResolveEnvironment = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield environmentPromise;
     environment = undefined;
@@ -105,0 +116,0 @@ return yield _resolveEnvironment();

lib/environment/Environments.d.ts

@@ -6,4 +6,5 @@ declare enum Environments {
     EC2 = "EC2",
+    ECS = "ECS",
     Unknown = ""
 }
 export default Environments;

lib/environment/Environments.js

@@ -9,4 +9,5 @@ "use strict";
     Environments["EC2"] = "EC2";
+    Environments["ECS"] = "ECS";
     Environments["Unknown"] = "";
 })(Environments || (Environments = {}));
 exports.default = Environments;

lib/logger/MetricsContext.js

@@ -124,3 +124,3 @@ "use strict";
         return this.dimensions.map(custom => {
-            return Object.assign({}, this.defaultDimensions, custom);
+            return Object.assign(Object.assign({}, this.defaultDimensions), custom);
         });
@@ -127,0 +127,0 @@ }

lib/logger/MetricScope.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -32,3 +33,3 @@ });
 const metricScope = (handler) => {
-    const wrappedHandler = (...args) => __awaiter(this, void 0, void 0, function* () {
+    const wrappedHandler = (...args) => __awaiter(void 0, void 0, void 0, function* () {
         const metrics = MetricsLoggerFactory_1.createMetricsLogger();
@@ -35,0 +36,0 @@ let exception;

lib/logger/MetricsLogger.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -23,0 +24,0 @@ });

lib/serializers/LogSerializer.js

@@ -38,7 +38,7 @@ "use strict";
             dimensionKeys.push(keys);
-            dimensionProperties = Object.assign({}, dimensionProperties, d);
+            dimensionProperties = Object.assign(Object.assign({}, dimensionProperties), d);
         });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const createBody = () => {
-            return Object.assign({}, dimensionProperties, context.properties, { _aws: Object.assign({}, context.meta, { CloudWatchMetrics: [
+            return Object.assign(Object.assign(Object.assign({}, dimensionProperties), context.properties), { _aws: Object.assign(Object.assign({}, context.meta), { CloudWatchMetrics: [
                         {
@@ -45,0 +45,0 @@ Dimensions: dimensionKeys,

lib/sinks/AgentSink.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -23,0 +24,0 @@ });

lib/sinks/connections/TcpClient.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -23,0 +24,0 @@ });

lib/sinks/connections/UdpClient.js

@@ -17,6 +17,7 @@ "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -23,0 +24,0 @@ });

package.json

 {
   "name": "aws-embedded-metrics",
-  "version": "1.1.1",
+  "version": "2.0.0-rc1",
   "description": "AWS Embedded Metrics Client Library",
@@ -38,14 +38,14 @@ "main": "lib/index.js",
     "@types/node": "^12.0.8",
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^2.23.0",
+    "@typescript-eslint/parser": "^2.23.0",
     "aws-sdk": "^2.551.0",
-    "eslint": "^6.7.2",
-    "eslint-config-prettier": "^6.7.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.0",
+    "eslint-plugin-prettier": "^3.1.2",
     "faker": "^4.1.0",
     "jest": "^24.8.0",
     "npm-pack-zip": "^1.2.7",
-    "prettier": "^1.18.2",
+    "prettier": "^1.19.1",
     "ts-jest": "^24.0.2",
-    "typescript": "^3.5.2"
+    "typescript": "^3.8.0"
   },
@@ -52,0 +52,0 @@ "files": [

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 2 instances in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

111140

increased by7.35%

Number of package files

68

increased by3.03%

Lines of code

2168

increased by7.75%

Worsened metrics

Number of low quality alerts

2

increased by100%

Number of low supply chain risk alerts

16

increased by33.33%

No dependency changes