@moreapp/common-nodejs 0.11.2 → 0.12.0

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/dist/logger.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  export declare const logger: import("winston").Logger;
2
2
  export declare const formatters: {
3
3
  errorFormat: import("logform").FormatWrap;
4
- stackdriverTracingFormat: import("logform").FormatWrap;
5
4
  };
package/dist/logger.js CHANGED
@@ -2,15 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.formatters = exports.logger = void 0;
4
4
  const winston_1 = require("winston");
5
- const entry_1 = require("@google-cloud/logging/build/src/entry");
6
- const stackdriverTracingFormat = (0, winston_1.format)((info) => {
7
- if (info["trace_id"] && info["span_id"]) {
8
- info[entry_1.TRACE_KEY] = info["trace_id"];
9
- info[entry_1.SPAN_ID_KEY] = info["span_id"];
10
- info[entry_1.TRACE_SAMPLED_KEY] = true;
11
- }
12
- return info;
13
- });
14
5
  const errorFormat = (0, winston_1.format)((info) => {
15
6
  for (const prop in info) {
16
7
  if (info[prop] instanceof Error) {
@@ -33,9 +24,8 @@ const transformError = (error) => {
33
24
  exports.logger = (0, winston_1.createLogger)({
34
25
  level: "info",
35
26
  transports: [new winston_1.transports.Console()],
36
- format: winston_1.format.combine(stackdriverTracingFormat(), errorFormat(), winston_1.format.json()),
27
+ format: winston_1.format.combine(errorFormat(), winston_1.format.json()),
37
28
  });
38
29
  exports.formatters = {
39
30
  errorFormat,
40
- stackdriverTracingFormat,
41
31
  };
@@ -40,22 +40,3 @@ describe("errorFormat", () => {
40
40
  });
41
41
  });
42
42
  });
43
- describe("tracingFormat", () => {
44
- test("should transform tracing data to Stackdriver format", () => {
45
- const formatted = logger_1.formatters.stackdriverTracingFormat().transform({
46
- level: "error",
47
- message: "Something went wrong",
48
- trace_id: "TRACE_ID",
49
- span_id: "SPAN_ID",
50
- });
51
- expect(formatted).toStrictEqual({
52
- level: "error",
53
- message: "Something went wrong",
54
- trace_id: "TRACE_ID",
55
- span_id: "SPAN_ID",
56
- "logging.googleapis.com/trace": "TRACE_ID",
57
- "logging.googleapis.com/spanId": "SPAN_ID",
58
- "logging.googleapis.com/trace_sampled": true,
59
- });
60
- });
61
- });
package/dist/tracer.js CHANGED
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.tracer = void 0;
4
4
  const api_1 = require("@opentelemetry/api");
5
5
  const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
6
- const opentelemetry_cloud_trace_exporter_1 = require("@google-cloud/opentelemetry-cloud-trace-exporter");
7
6
  const instrumentation_1 = require("@opentelemetry/instrumentation");
8
7
  const instrumentation_dns_1 = require("@opentelemetry/instrumentation-dns");
9
8
  const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
@@ -14,6 +13,7 @@ const resources_1 = require("@opentelemetry/resources");
14
13
  const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
15
14
  const propagator_b3_1 = require("@opentelemetry/propagator-b3");
16
15
  const utils_1 = require("./utils");
16
+ const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
17
17
  const tracer = (serviceName, { http = {
18
18
  portsToInstrument: [3000],
19
19
  }, extraInstrumentations = [], debug = false, }) => {
@@ -27,11 +27,7 @@ const tracer = (serviceName, { http = {
27
27
  }),
28
28
  spanProcessors: [
29
29
  ...((0, utils_1.environmentVariable)("STACKDRIVER_TRACING_ENABLED", false)
30
- ? [
31
- new sdk_trace_base_1.BatchSpanProcessor(new opentelemetry_cloud_trace_exporter_1.TraceExporter({
32
- resourceFilter: /^service\./,
33
- })),
34
- ]
30
+ ? [new sdk_trace_base_1.BatchSpanProcessor(new exporter_trace_otlp_grpc_1.OTLPTraceExporter())]
35
31
  : []),
36
32
  ...(debug ? [new sdk_trace_base_1.BatchSpanProcessor(new sdk_trace_node_1.ConsoleSpanExporter())] : []),
37
33
  ],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@moreapp/common-nodejs",
3
- "version": "0.11.2",
3
+ "version": "0.12.0",
4
4
  "license": "UNLICENSED",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -29,49 +29,48 @@
29
29
  "dist/**/*"
30
30
  ],
31
31
  "dependencies": {
32
- "@google-cloud/logging": "11.2.1",
33
- "@google-cloud/opentelemetry-cloud-trace-exporter": "3.0.0",
34
32
  "@opentelemetry/api": "1.9.1",
35
33
  "@opentelemetry/core": "2.7.1",
36
- "@opentelemetry/instrumentation": "0.216.0",
37
- "@opentelemetry/instrumentation-dns": "0.59.0",
38
- "@opentelemetry/instrumentation-express": "0.64.0",
39
- "@opentelemetry/instrumentation-http": "0.216.0",
40
- "@opentelemetry/instrumentation-winston": "0.60.0",
34
+ "@opentelemetry/exporter-trace-otlp-grpc": "0.218.0",
35
+ "@opentelemetry/instrumentation": "0.218.0",
36
+ "@opentelemetry/instrumentation-dns": "0.61.0",
37
+ "@opentelemetry/instrumentation-express": "0.66.0",
38
+ "@opentelemetry/instrumentation-http": "0.218.0",
39
+ "@opentelemetry/instrumentation-winston": "0.62.0",
41
40
  "@opentelemetry/resources": "2.7.1",
42
- "@opentelemetry/sdk-node": "0.216.0",
41
+ "@opentelemetry/sdk-node": "0.218.0",
43
42
  "@opentelemetry/sdk-trace-base": "2.7.1",
44
43
  "@opentelemetry/sdk-trace-node": "2.7.1",
45
- "@opentelemetry/semantic-conventions": "1.40.0",
44
+ "@opentelemetry/semantic-conventions": "1.41.1",
46
45
  "axios": "1.16.0",
47
46
  "content-disposition-parser": "1.0.2",
48
- "date-and-time": "4.4.0",
47
+ "date-and-time": "4.5.0",
49
48
  "express": "5.2.1",
50
49
  "lodash": "4.18.1",
51
50
  "prom-client": "15.1.3",
52
51
  "winston": "3.19.0",
53
- "zod": "4.4.2"
52
+ "zod": "4.4.3"
54
53
  },
55
54
  "devDependencies": {
56
55
  "@types/express": "5.0.6",
57
56
  "@types/jest": "30.0.0",
58
57
  "@types/lodash": "4.17.24",
59
- "@types/node": "24.12.2",
60
- "@typescript-eslint/eslint-plugin": "8.59.1",
61
- "@typescript-eslint/parser": "8.59.1",
58
+ "@types/node": "24.12.3",
59
+ "@typescript-eslint/eslint-plugin": "8.59.2",
60
+ "@typescript-eslint/parser": "8.59.2",
62
61
  "eslint": "9.39.4",
63
62
  "eslint-config-prettier": "10.1.8",
64
63
  "eslint-plugin-prettier": "5.5.5",
65
64
  "husky": "9.1.7",
66
- "jest": "30.3.0",
65
+ "jest": "30.4.1",
67
66
  "jest-mock-extended": "4.0.1",
68
- "lint-staged": "16.4.0",
69
- "nock": "14.0.14",
67
+ "lint-staged": "17.0.2",
68
+ "nock": "14.0.15",
70
69
  "prettier": "3.8.3",
71
70
  "ts-jest": "29.4.9",
72
71
  "ts-node": "10.9.2",
73
72
  "typescript": "5.9.3",
74
- "typescript-eslint": "8.59.1"
73
+ "typescript-eslint": "8.59.2"
75
74
  },
76
75
  "prettier": {
77
76
  "printWidth": 100,