skuba 16.0.6 → 16.0.7
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/lib/cli/migrate/esm/patchInstrumentation.js +8 -5
- package/lib/cli/migrate/esm/patchInstrumentation.js.map +2 -2
- package/package.json +5 -5
- package/template/express-rest-api/package.json +5 -5
- package/template/koa-rest-api/package.json +5 -5
- package/template/lambda-sqs-worker-cdk/package.json +4 -4
- package/template/oss-npm-package/.github/workflows/release.yml +1 -1
- package/template/oss-npm-package/.github/workflows/validate.yml +1 -1
|
@@ -43,32 +43,35 @@ export const patchInstrumentation = async ({
|
|
|
43
43
|
const hasDDTraceImport = tsFiles.some(
|
|
44
44
|
({ content }) => /from\s+['"]dd-trace['"]/.test(content)
|
|
45
45
|
);
|
|
46
|
+
const hasDDTraceInitImport = tsFiles.some(
|
|
47
|
+
({ content }) => /from\s+['"]dd-trace\/init['"]/.test(content)
|
|
48
|
+
);
|
|
46
49
|
const otelImports = tsFiles.filter(
|
|
47
50
|
({ content }) => /from\s+['"]@opentelemetry\/api['"]/.test(content)
|
|
48
51
|
);
|
|
49
52
|
const hasOpenTelemetryImport = otelImports.length > 0;
|
|
50
|
-
if (!hasDDTraceImport && !hasOpenTelemetryImport) {
|
|
53
|
+
if (!hasDDTraceImport && !hasDDTraceInitImport && !hasOpenTelemetryImport) {
|
|
51
54
|
return {
|
|
52
55
|
result: "skip",
|
|
53
56
|
reason: "no imports for Datadog or OpenTelemetry instrumentation found in source files"
|
|
54
57
|
};
|
|
55
58
|
}
|
|
56
|
-
const confused = hasDDTraceImport && hasOpenTelemetryImport;
|
|
59
|
+
const confused = (hasDDTraceImport || hasDDTraceInitImport) && hasOpenTelemetryImport;
|
|
57
60
|
if (confused) {
|
|
58
61
|
log.warn(
|
|
59
62
|
"Found imports for both Datadog and OpenTelemetry instrumentation in source files, unsure which to patch"
|
|
60
63
|
);
|
|
61
64
|
}
|
|
62
|
-
const warning =
|
|
65
|
+
const warning = confused ? "TODO: skuba failed to determine whether to add dd-trace or OpenTelemetry flags, please choose the appropriate flags to add to your Dockerfile " : "";
|
|
63
66
|
const commandsToAdd = [
|
|
64
|
-
hasDDTraceImport ? "--import dd-trace/
|
|
67
|
+
hasDDTraceImport ? "--import dd-trace/register.js" : "",
|
|
65
68
|
hasOpenTelemetryImport ? "--experimental-loader @opentelemetry/instrumentation/hook.mjs" : ""
|
|
66
69
|
].filter(Boolean);
|
|
67
70
|
const patched = dockerFiles.map(({ filePath, content }) => {
|
|
68
71
|
if (filePath.includes("dev-deps")) {
|
|
69
72
|
return null;
|
|
70
73
|
}
|
|
71
|
-
if (content.includes("dd-trace/initialize.mjs") || content.includes("@opentelemetry/instrumentation/hook.mjs")) {
|
|
74
|
+
if (content.includes("dd-trace/initialize.mjs") || content.includes("dd-trace/register.js") || content.includes("@opentelemetry/instrumentation/hook.mjs")) {
|
|
72
75
|
return null;
|
|
73
76
|
}
|
|
74
77
|
const cmd = /^CMD\s+(.+)$/m.exec(content)?.[1];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/cli/migrate/esm/patchInstrumentation.ts"],
|
|
4
|
-
"sourcesContent": ["import { dirname } from 'path';\nimport { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec } from '../../../utils/exec.js';\nimport { log } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport type { PatchFunction } from '../../lint/internalLints/upgrade/index.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport const patchInstrumentation: PatchFunction = async ({\n mode,\n packageManager,\n}) => {\n const [dockerfilePaths, tsPaths] = await Promise.all([\n fg(['**/Dockerfile*'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/*.ts'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n if (!dockerfilePaths.length) {\n return {\n result: 'skip',\n reason: 'no Dockerfile files found',\n };\n }\n\n const [dockerFiles, tsFiles] = await Promise.all([\n Promise.all(\n dockerfilePaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n Promise.all(\n tsPaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n ]);\n\n const hasDDTraceImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace['\"]/.test(content),\n );\n const otelImports = tsFiles.filter(({ content }) =>\n /from\\s+['\"]@opentelemetry\\/api['\"]/.test(content),\n );\n\n const hasOpenTelemetryImport = otelImports.length > 0;\n\n if (!hasDDTraceImport && !hasOpenTelemetryImport) {\n return {\n result: 'skip',\n reason:\n 'no imports for Datadog or OpenTelemetry instrumentation found in source files',\n };\n }\n\n const confused
|
|
5
|
-
"mappings": ";AAAA,SAAS,eAAe;AACxB,SAAS,eAAe;AAExB,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,mBAAmB;AAE1B,SAAS,kBAAkB;AAC3B,SAAS,WAAW;AACpB,SAAS,2BAA2B;AAGpC,SAAS,WAAW;AAEb,aAAM,uBAAsC,OAAO;AAAA,EACxD;AAAA,EACA;AACF,MAAM;AACJ,QAAM,CAAC,iBAAiB,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IACnD,GAAG,CAAC,gBAAgB,GAAG;AAAA,MACrB,QAAQ,CAAC,WAAW,iBAAiB;AAAA,IACvC,CAAC;AAAA,IACD,GAAG,CAAC,SAAS,GAAG;AAAA,MACd,QAAQ,CAAC,WAAW,iBAAiB;AAAA,IACvC,CAAC;AAAA,EACH,CAAC;AAED,MAAI,CAAC,gBAAgB,QAAQ;AAC3B,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,CAAC,aAAa,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC/C,QAAQ;AAAA,MACN,gBAAgB,IAAI,OAAO,cAAc;AAAA,QACvC;AAAA,QACA,SAAS,MAAM,GAAG,SAAS,SAAS,UAAU,OAAO;AAAA,MACvD,EAAE;AAAA,IACJ;AAAA,IACA,QAAQ;AAAA,MACN,QAAQ,IAAI,OAAO,cAAc;AAAA,QAC/B;AAAA,QACA,SAAS,MAAM,GAAG,SAAS,SAAS,UAAU,OAAO;AAAA,MACvD,EAAE;AAAA,IACJ;AAAA,EACF,CAAC;AAED,QAAM,mBAAmB,QAAQ;AAAA,IAAK,CAAC,EAAE,QAAQ,MAC/C,0BAA0B,KAAK,OAAO;AAAA,EACxC;AACA,QAAM,cAAc,QAAQ;AAAA,IAAO,CAAC,EAAE,QAAQ,MAC5C,qCAAqC,KAAK,OAAO;AAAA,EACnD;AAEA,QAAM,yBAAyB,YAAY,SAAS;AAEpD,MAAI,CAAC,oBAAoB,CAAC,wBAAwB;
|
|
4
|
+
"sourcesContent": ["import { dirname } from 'path';\nimport { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec } from '../../../utils/exec.js';\nimport { log } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport type { PatchFunction } from '../../lint/internalLints/upgrade/index.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport const patchInstrumentation: PatchFunction = async ({\n mode,\n packageManager,\n}) => {\n const [dockerfilePaths, tsPaths] = await Promise.all([\n fg(['**/Dockerfile*'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/*.ts'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n if (!dockerfilePaths.length) {\n return {\n result: 'skip',\n reason: 'no Dockerfile files found',\n };\n }\n\n const [dockerFiles, tsFiles] = await Promise.all([\n Promise.all(\n dockerfilePaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n Promise.all(\n tsPaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n ]);\n\n const hasDDTraceImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace['\"]/.test(content),\n );\n const hasDDTraceInitImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace\\/init['\"]/.test(content),\n );\n const otelImports = tsFiles.filter(({ content }) =>\n /from\\s+['\"]@opentelemetry\\/api['\"]/.test(content),\n );\n\n const hasOpenTelemetryImport = otelImports.length > 0;\n\n if (!hasDDTraceImport && !hasDDTraceInitImport && !hasOpenTelemetryImport) {\n return {\n result: 'skip',\n reason:\n 'no imports for Datadog or OpenTelemetry instrumentation found in source files',\n };\n }\n\n const confused =\n (hasDDTraceImport || hasDDTraceInitImport) && hasOpenTelemetryImport;\n\n if (confused) {\n log.warn(\n 'Found imports for both Datadog and OpenTelemetry instrumentation in source files, unsure which to patch',\n );\n }\n\n const warning = confused\n ? 'TODO: skuba failed to determine whether to add dd-trace or OpenTelemetry flags, please choose the appropriate flags to add to your Dockerfile '\n : '';\n\n const commandsToAdd = [\n hasDDTraceImport ? '--import dd-trace/register.js' : '',\n hasOpenTelemetryImport\n ? '--experimental-loader @opentelemetry/instrumentation/hook.mjs'\n : '',\n ].filter(Boolean);\n\n const patched = dockerFiles\n .map(({ filePath, content }) => {\n if (filePath.includes('dev-deps')) {\n return null;\n }\n\n if (\n content.includes('dd-trace/initialize.mjs') ||\n content.includes('dd-trace/register.js') ||\n content.includes('@opentelemetry/instrumentation/hook.mjs')\n ) {\n return null;\n }\n\n const cmd = /^CMD\\s+(.+)$/m.exec(content)?.[1];\n\n if (!cmd) {\n return null;\n }\n\n // check if CMD is in shell or exec form\n const isShellForm = !cmd.startsWith('[');\n\n if (isShellForm) {\n if (cmd.startsWith('node ')) {\n const patchedCmd = cmd.replace(\n 'node ',\n `node ${warning}${commandsToAdd.join(' ')} `,\n );\n return { filePath, content: content.replace(cmd, patchedCmd) };\n }\n\n return {\n filePath,\n content: content.replace(\n cmd,\n `${warning}${commandsToAdd.join(' ')} ${cmd}`,\n ),\n };\n }\n\n const flags = commandsToAdd\n .map((f) => f.split(' '))\n .flat()\n .map((f) => `\"${f}\"`)\n .join(', ');\n\n if (/^\\s*\\[\\s*\"node\"\\s*[,\\]]/.test(cmd)) {\n const patchedCmd = cmd.replace(\n /^(\\s*\\[\\s*\"node\"\\s*)([,\\]])/,\n `$1, ${warning}${flags}$2`,\n );\n\n return { filePath, content: content.replace(cmd, patchedCmd) };\n }\n\n const patchedCmd = cmd.replace(/^\\s*\\[/, `[${warning}${flags}, `);\n return { filePath, content: content.replace(cmd, patchedCmd) };\n })\n .filter((patch) => patch !== null);\n\n if (!patched.length) {\n return {\n result: 'skip',\n reason: 'no CMD instructions found in Dockerfiles to patch',\n };\n }\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n if (hasOpenTelemetryImport) {\n const packageJsons = await Promise.all(\n otelImports.map(async ({ filePath }) =>\n getConsumerManifest(dirname(filePath)),\n ),\n );\n\n const filteredPackageJsons = packageJsons.filter(\n (pkg) => pkg !== undefined,\n );\n await Promise.all(\n filteredPackageJsons.map(async (pkg) => {\n const { packageJson, path } = pkg;\n\n if (\n packageJson.dependencies?.['@opentelemetry/instrumentation'] ||\n packageJson.devDependencies?.['@opentelemetry/instrumentation']\n ) {\n return;\n }\n\n const fallbackVersion = '0.216.0';\n\n const existingVersion =\n packageJson.dependencies?.['@opentelemetry/instrumentation-http'] ??\n packageJson.dependencies?.['@opentelemetry/sdk-node'];\n\n const versionToUse =\n existingVersion?.startsWith('catalog:') ||\n existingVersion === undefined\n ? fallbackVersion\n : await latestVersion('@opentelemetry/instrumentation', {\n version: `<=${existingVersion}`,\n });\n\n packageJson.dependencies ??= {};\n\n packageJson.dependencies['@opentelemetry/instrumentation'] =\n versionToUse;\n\n await fs.promises.writeFile(\n path,\n JSON.stringify(packageJson, null, 2),\n 'utf-8',\n );\n }),\n );\n\n const gitRoot =\n (await Git.findRoot({ dir: process.cwd() })) ?? process.cwd();\n\n const rootExec = createExec({ cwd: gitRoot });\n\n try {\n await rootExec(\n packageManager.command,\n 'install',\n ...(packageManager.command === 'pnpm'\n ? ['--frozen-lockfile=false']\n : []),\n '--prefer-offline',\n '--ignore-scripts',\n );\n } catch (error) {\n log.warn('Failed to install dependencies after OpenTelemetry patch');\n log.subtle(inspect(error));\n }\n }\n\n await Promise.all(\n patched.map(({ filePath, content }) =>\n fs.promises.writeFile(filePath, content, 'utf-8'),\n ),\n );\n\n return {\n result: 'apply',\n };\n};\n\nexport const tryPatchInstrumentation: PatchFunction = async (opts) => {\n try {\n return await patchInstrumentation(opts);\n } catch (err) {\n log.warn(\n 'Failed to patch Datadog or OpenTelemetry instrumentation, skipping',\n );\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["patchedCmd"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skuba",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.0.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "SEEK development toolkit for backend applications and packages",
|
|
6
6
|
"homepage": "https://github.com/seek-oss/skuba#readme",
|
|
@@ -106,9 +106,9 @@
|
|
|
106
106
|
"typescript": "~5.9.0",
|
|
107
107
|
"vitest": "^4.1.4",
|
|
108
108
|
"zod": "^4.3.5",
|
|
109
|
-
"@skuba-lib/api": "^2.1.2",
|
|
110
109
|
"eslint-config-skuba": "9.0.0",
|
|
111
|
-
"pnpm-plugin-skuba": "3.0.0"
|
|
110
|
+
"pnpm-plugin-skuba": "3.0.0",
|
|
111
|
+
"@skuba-lib/api": "^2.1.2"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@changesets/cli": "2.31.0",
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
"@types/picomatch": "4.0.3",
|
|
128
128
|
"@types/semver": "7.7.1",
|
|
129
129
|
"@types/supertest": "7.2.0",
|
|
130
|
-
"enhanced-resolve": "5.21.
|
|
130
|
+
"enhanced-resolve": "5.21.3",
|
|
131
131
|
"express": "5.2.1",
|
|
132
132
|
"fastify": "5.8.5",
|
|
133
133
|
"jsonfile": "6.2.1",
|
|
@@ -135,7 +135,7 @@
|
|
|
135
135
|
"memfs": "4.57.2",
|
|
136
136
|
"remark-cli": "12.0.1",
|
|
137
137
|
"remark-preset-lint-recommended": "7.0.1",
|
|
138
|
-
"semver": "7.
|
|
138
|
+
"semver": "7.8.0",
|
|
139
139
|
"supertest": "7.2.2",
|
|
140
140
|
"type-fest": "2.19.0",
|
|
141
141
|
"@skuba-lib/changesets-changelog": "^1.0.1"
|
|
@@ -22,12 +22,12 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@opentelemetry/api": "^1.9.0",
|
|
24
24
|
"@opentelemetry/core": "~2.7.0",
|
|
25
|
-
"@opentelemetry/exporter-trace-otlp-grpc": "~0.
|
|
26
|
-
"@opentelemetry/instrumentation": "~0.
|
|
27
|
-
"@opentelemetry/instrumentation-aws-sdk": "^0.
|
|
28
|
-
"@opentelemetry/instrumentation-http": "~0.
|
|
25
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "~0.218.0",
|
|
26
|
+
"@opentelemetry/instrumentation": "~0.218.0",
|
|
27
|
+
"@opentelemetry/instrumentation-aws-sdk": "^0.73.0",
|
|
28
|
+
"@opentelemetry/instrumentation-http": "~0.218.0",
|
|
29
29
|
"@opentelemetry/propagator-b3": "^2.0.0",
|
|
30
|
-
"@opentelemetry/sdk-node": "~0.
|
|
30
|
+
"@opentelemetry/sdk-node": "~0.218.0",
|
|
31
31
|
"@seek/logger": "^12.0.0",
|
|
32
32
|
"express": "^5.0.0",
|
|
33
33
|
"hot-shots": "^14.3.1",
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
"@koa/router": "15.5.0",
|
|
25
25
|
"@opentelemetry/api": "^1.9.0",
|
|
26
26
|
"@opentelemetry/core": "~2.7.0",
|
|
27
|
-
"@opentelemetry/exporter-trace-otlp-grpc": "~0.
|
|
28
|
-
"@opentelemetry/instrumentation": "~0.
|
|
29
|
-
"@opentelemetry/instrumentation-aws-sdk": "^0.
|
|
30
|
-
"@opentelemetry/instrumentation-http": "~0.
|
|
27
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "~0.218.0",
|
|
28
|
+
"@opentelemetry/instrumentation": "~0.218.0",
|
|
29
|
+
"@opentelemetry/instrumentation-aws-sdk": "^0.73.0",
|
|
30
|
+
"@opentelemetry/instrumentation-http": "~0.218.0",
|
|
31
31
|
"@opentelemetry/propagator-b3": "^2.0.0",
|
|
32
|
-
"@opentelemetry/sdk-node": "~0.
|
|
32
|
+
"@opentelemetry/sdk-node": "~0.218.0",
|
|
33
33
|
"@seek/logger": "^12.0.0",
|
|
34
34
|
"hot-shots": "^14.3.1",
|
|
35
35
|
"koa": "^3.0.1",
|
|
@@ -23,23 +23,23 @@
|
|
|
23
23
|
"@aws-sdk/client-lambda": "^3.363.0",
|
|
24
24
|
"@aws-sdk/client-secrets-manager": "^3.363.0",
|
|
25
25
|
"@aws-sdk/client-sns": "^3.363.0",
|
|
26
|
-
"@seek/aws-codedeploy-hooks": "^
|
|
26
|
+
"@seek/aws-codedeploy-hooks": "^4.0.0",
|
|
27
27
|
"@seek/logger": "^12.0.0",
|
|
28
28
|
"skuba-dive": "^4.1.0",
|
|
29
29
|
"zod": "^4.3.5"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@seek/aws-codedeploy-infra": "^
|
|
32
|
+
"@seek/aws-codedeploy-infra": "^5.0.0",
|
|
33
33
|
"@types/aws-lambda": "^8.10.82",
|
|
34
34
|
"@types/chance": "^1.1.3",
|
|
35
35
|
"@types/node": "^24.10.2",
|
|
36
36
|
"aws-cdk": "^2.1010.0",
|
|
37
|
-
"aws-cdk-lib": "
|
|
37
|
+
"aws-cdk-lib": "^2.253.0",
|
|
38
38
|
"aws-sdk-client-mock": "^4.0.0",
|
|
39
39
|
"aws-sdk-client-mock-vitest": "^7.0.0",
|
|
40
40
|
"chance": "^1.1.8",
|
|
41
41
|
"constructs": "^10.0.17",
|
|
42
|
-
"datadog-cdk-constructs-v2": "^
|
|
42
|
+
"datadog-cdk-constructs-v2": "^4.0.0",
|
|
43
43
|
"datadog-lambda-js": "^12.0.0",
|
|
44
44
|
"dd-trace": "^5.0.0",
|
|
45
45
|
"pino-pretty": "^13.0.0",
|
|
@@ -23,7 +23,7 @@ jobs:
|
|
|
23
23
|
fetch-depth: 0
|
|
24
24
|
|
|
25
25
|
- name: Set up pnpm
|
|
26
|
-
uses: pnpm/action-setup@
|
|
26
|
+
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
|
|
27
27
|
|
|
28
28
|
- name: Set up Node.js
|
|
29
29
|
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
|
@@ -19,7 +19,7 @@ jobs:
|
|
|
19
19
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
20
20
|
|
|
21
21
|
- name: Set up pnpm
|
|
22
|
-
uses: pnpm/action-setup@
|
|
22
|
+
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
|
|
23
23
|
|
|
24
24
|
- name: Set up Node.js
|
|
25
25
|
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|