@google-cloud/profiler 4.1.5 → 4.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,13 @@
4
4
 
5
5
  [1]: https://www.npmjs.com/package/@google-cloud/profiler?activeTab=versions
6
6
 
7
+ ### [4.1.6](https://www.github.com/googleapis/cloud-profiler-nodejs/compare/v4.1.5...v4.1.6) (2021-12-20)
8
+
9
+
10
+ ### Bug Fixes
11
+
12
+ * log to console using structured logging ([#780](https://www.github.com/googleapis/cloud-profiler-nodejs/issues/780)) ([6b96e00](https://www.github.com/googleapis/cloud-profiler-nodejs/commit/6b96e007418bd6074c2bf9de64df0742e6a6d4ae))
13
+
7
14
  ### [4.1.5](https://www.github.com/googleapis/cloud-profiler-nodejs/compare/v4.1.4...v4.1.5) (2021-10-06)
8
15
 
9
16
 
@@ -68,7 +68,7 @@ export declare const defaultConfig: {
68
68
  heapMaxStackDepth: number;
69
69
  ignoreHeapSamplesPath: string;
70
70
  initialBackoffMillis: number;
71
- backoffCapMillis: number | null;
71
+ backoffCapMillis: number;
72
72
  backoffMultiplier: number;
73
73
  apiEndpoint: string;
74
74
  serverBackoffCapMillis: number;
@@ -197,7 +197,25 @@ async function startLocal(config = {}) {
197
197
  setInterval(() => {
198
198
  const curTime = Date.now();
199
199
  const { rss, heapTotal, heapUsed } = process.memoryUsage();
200
- logger.debug(new Date().toISOString(), 'rss', (rss / (1024 * 1024)).toFixed(3), 'MiB,', 'heap total', (heapTotal / (1024 * 1024)).toFixed(3), 'MiB,', 'heap used', (heapUsed / (1024 * 1024)).toFixed(3), 'MiB,', 'heap profile collection rate', ((heapProfileCount * 1000) / (curTime - prevLogTime)).toFixed(3), 'profiles/s,', 'time profile collection rate', ((timeProfileCount * 1000) / (curTime - prevLogTime)).toFixed(3), 'profiles/s');
200
+ const debugInfo = [
201
+ new Date().toISOString(),
202
+ 'rss',
203
+ (rss / (1024 * 1024)).toFixed(3),
204
+ 'MiB,',
205
+ 'heap total',
206
+ (heapTotal / (1024 * 1024)).toFixed(3),
207
+ 'MiB,',
208
+ 'heap used',
209
+ (heapUsed / (1024 * 1024)).toFixed(3),
210
+ 'MiB,',
211
+ 'heap profile collection rate',
212
+ ((heapProfileCount * 1000) / (curTime - prevLogTime)).toFixed(3),
213
+ 'profiles/s,',
214
+ 'time profile collection rate',
215
+ ((timeProfileCount * 1000) / (curTime - prevLogTime)).toFixed(3),
216
+ 'profiles/s',
217
+ ].map(v => v + '');
218
+ logger.debug(debugInfo.join(' '));
201
219
  heapProfileCount = 0;
202
220
  timeProfileCount = 0;
203
221
  prevLogTime = curTime;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,12 @@
1
- import * as consoleLogLevel from 'console-log-level';
2
- export declare function createLogger(level?: number): Record<consoleLogLevel.LogLevelNames, (...args: any[]) => void>;
1
+ export declare class Logger {
2
+ readonly level?: number | undefined;
3
+ private log;
4
+ private severityThreshold;
5
+ constructor(level?: number | undefined);
6
+ debug(msg: string): void;
7
+ info(msg: string): void;
8
+ warn(msg: string): void;
9
+ error(msg: string): void;
10
+ private toOneLine;
11
+ }
12
+ export declare function createLogger(level?: number): Logger;
@@ -13,37 +13,65 @@
13
13
  // See the License for the specific language governing permissions and
14
14
  // limitations under the License.
15
15
  Object.defineProperty(exports, "__esModule", { value: true });
16
- exports.createLogger = void 0;
17
- const consoleLogLevel = require("console-log-level");
16
+ exports.createLogger = exports.Logger = void 0;
17
+ /* eslint-disable @typescript-eslint/no-explicit-any */
18
18
  const config_1 = require("./config");
19
+ const logging_min_1 = require("@google-cloud/logging-min");
20
+ const logging = new logging_min_1.Logging();
21
+ // migrating from 'console-log-level' package we keep
22
+ // min and max log levels numeric interface used there
23
+ const [MIN_LEVEL, MAX_LEVEL] = [0, 4];
24
+ logging.setProjectId().catch(err => {
25
+ console.error(`failed to set logging project id ${err}`);
26
+ });
27
+ logging.setDetectedResource().catch(err => {
28
+ console.error(`failed to discover resource metadata ${err}`);
29
+ });
19
30
  // eslint-disable-next-line @typescript-eslint/no-var-requires
20
31
  const pjson = require('../../package.json');
21
- const LEVEL_NAMES = [
22
- 'fatal',
23
- 'error',
24
- 'warn',
25
- 'info',
26
- 'debug',
27
- 'trace',
28
- ];
29
- function logLevelToName(level) {
30
- if (level === undefined) {
31
- level = config_1.defaultConfig.logLevel;
32
+ class Logger {
33
+ constructor(level) {
34
+ this.level = level;
35
+ if (level === undefined) {
36
+ level = config_1.defaultConfig.logLevel;
37
+ }
38
+ if (level < MIN_LEVEL) {
39
+ level = MIN_LEVEL;
40
+ }
41
+ else if (level > MAX_LEVEL) {
42
+ level = MAX_LEVEL;
43
+ }
44
+ this.severityThreshold = level;
45
+ this.log = logging.logSync(pjson.name);
32
46
  }
33
- else if (level < 0) {
34
- level = 0;
47
+ debug(msg) {
48
+ if (this.severityThreshold > 3) {
49
+ this.log.debug(this.log.entry(this.toOneLine(msg)));
50
+ }
35
51
  }
36
- else if (level > 4) {
37
- level = 4;
52
+ info(msg) {
53
+ if (this.severityThreshold > 2) {
54
+ this.log.info(this.log.entry(this.toOneLine(msg)));
55
+ }
56
+ }
57
+ warn(msg) {
58
+ if (this.severityThreshold > 1) {
59
+ this.log.warning(this.log.entry(this.toOneLine(msg)));
60
+ }
61
+ }
62
+ error(msg) {
63
+ if (this.severityThreshold > 0) {
64
+ this.log.error(this.log.entry(this.toOneLine(msg)));
65
+ }
66
+ }
67
+ toOneLine(msg) {
68
+ const temp = msg.replace('\r\n', '\\r\\n');
69
+ return temp.replace('\n', '\\n');
38
70
  }
39
- return LEVEL_NAMES[level];
40
71
  }
72
+ exports.Logger = Logger;
41
73
  function createLogger(level) {
42
- return consoleLogLevel({
43
- stderr: true,
44
- prefix: pjson.name,
45
- level: logLevelToName(level),
46
- });
74
+ return new Logger(level);
47
75
  }
48
76
  exports.createLogger = createLogger;
49
77
  //# sourceMappingURL=logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,qDAAqD;AACrD,qCAAuC;AAEvC,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5C,MAAM,WAAW,GAAoC;IACnD,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;CACR,CAAC;AAEF,SAAS,cAAc,CAAC,KAAc;IACpC,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,KAAK,GAAG,sBAAa,CAAC,QAAQ,CAAC;KAChC;SAAM,IAAI,KAAK,GAAG,CAAC,EAAE;QACpB,KAAK,GAAG,CAAC,CAAC;KACX;SAAM,IAAI,KAAK,GAAG,CAAC,EAAE;QACpB,KAAK,GAAG,CAAC,CAAC;KACX;IACD,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,YAAY,CAAC,KAAc;IACzC,OAAO,eAAe,CAAC;QACrB,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,KAAK,CAAC,IAAI;QAClB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAND,oCAMC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,uDAAuD;AAEvD,qCAAuC;AACvC,2DAA2D;AAE3D,MAAM,OAAO,GAAG,IAAI,qBAAO,EAAE,CAAC;AAE9B,qDAAqD;AACrD,sDAAsD;AACtD,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEtC,OAAO,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IACjC,OAAO,CAAC,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AACH,OAAO,CAAC,mBAAmB,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IACxC,OAAO,CAAC,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5C,MAAa,MAAM;IAIjB,YAAqB,KAAc;QAAd,UAAK,GAAL,KAAK,CAAS;QACjC,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,KAAK,GAAG,sBAAa,CAAC,QAAQ,CAAC;SAChC;QACD,IAAI,KAAK,GAAG,SAAS,EAAE;YACrB,KAAK,GAAG,SAAS,CAAC;SACnB;aAAM,IAAI,KAAK,GAAG,SAAS,EAAE;YAC5B,KAAK,GAAG,SAAS,CAAC;SACnB;QACD,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACrD;IACH,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACpD;IACH,CAAC;IAED,IAAI,CAAC,GAAW;QACd,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACvD;IACH,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,IAAI,CAAC,iBAAiB,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACrD;IACH,CAAC;IAEO,SAAS,CAAC,GAAW;QAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AA7CD,wBA6CC;AAED,SAAgB,YAAY,CAAC,KAAc;IACzC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAFD,oCAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@google-cloud/profiler",
3
- "version": "4.1.5",
3
+ "version": "4.1.6",
4
4
  "description": "Adds support for Cloud Profiler to Node.js applications",
5
5
  "repository": "googleapis/cloud-profiler-nodejs",
6
6
  "main": "build/src/index.js",
@@ -29,6 +29,7 @@
29
29
  "license": "Apache-2.0",
30
30
  "dependencies": {
31
31
  "@google-cloud/common": "^3.0.0",
32
+ "@google-cloud/logging-min": "^9.6.3",
32
33
  "@types/console-log-level": "^1.4.0",
33
34
  "@types/semver": "^7.0.0",
34
35
  "console-log-level": "^1.4.0",
@@ -47,10 +48,10 @@
47
48
  "@types/long": "^4.0.0",
48
49
  "@types/mocha": "^8.0.0",
49
50
  "@types/nock": "^10.0.0",
50
- "@types/node": "^14.0.0",
51
+ "@types/node": "^16.0.0",
51
52
  "@types/pretty-ms": "^4.0.0",
52
53
  "@types/sinon": "^10.0.0",
53
- "@types/tmp": "0.2.1",
54
+ "@types/tmp": "0.2.3",
54
55
  "c8": "^7.0.0",
55
56
  "codecov": "^3.0.0",
56
57
  "gts": "^2.0.0",
@@ -61,7 +62,7 @@
61
62
  "linkinator": "^2.0.0",
62
63
  "mocha": "^8.0.0",
63
64
  "nock": "^13.0.0",
64
- "sinon": "^11.0.0",
65
+ "sinon": "^12.0.0",
65
66
  "source-map": "^0.7.0",
66
67
  "tmp": "0.2.1",
67
68
  "typescript": "^3.8.3"