diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8178aea..6a2339a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: uses: actions/github-script@v7 if: ${{ env.PACKAGE }} with: - github-token: ${{ github.token }} + github-token: ${{ secrets.GITHUB_TOKEN }} script: | let tagExists = []; try { @@ -67,8 +67,10 @@ jobs: id: release if: ${{ env.PACKAGE }} continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - github-token: ${{ github.token }} + github-token: ${{ secrets.GITHUB_TOKEN }} result-encoding: string script: | const { repo: { owner, repo }, sha } = context; @@ -85,13 +87,15 @@ jobs: release_id = release.data.id; } catch (e) { - let latest; - if (e.status == 422) { // Release alredy exists - latest = await github.rest.repos.getLatestRelease({ - owner, repo + if (e.status == 422) { // Release already exists + const latest = await github.rest.repos.getLatestRelease({ + owner, + repo }); + release_id = latest.data.id; + } else { + throw e; } - release_id = latest.data.id; } return release_id diff --git a/libs/index.mjs b/libs/index.mjs index 4618e63..de26bc1 100644 --- a/libs/index.mjs +++ b/libs/index.mjs @@ -24,14 +24,14 @@ import {ConnectInstrumentation} from '@opentelemetry/instrumentation-connect'; import {diag, DiagConsoleLogger, DiagLogLevel} from '@opentelemetry/api'; import {DnsInstrumentation} from '@opentelemetry/instrumentation-dns'; import {ExpressInstrumentation} from '@opentelemetry/instrumentation-express'; -import {FastifyInstrumentation} from '@opentelemetry/instrumentation-fastify'; import {HttpInstrumentation} from '@opentelemetry/instrumentation-http'; import {NodeTracerProvider} from '@opentelemetry/sdk-trace-node'; import {OTLPTraceExporter} from '@opentelemetry/exporter-trace-otlp-grpc'; import {PinoInstrumentation} from '@opentelemetry/instrumentation-pino'; import {IORedisInstrumentation} from '@opentelemetry/instrumentation-ioredis'; import {registerInstrumentations} from '@opentelemetry/instrumentation'; -import {Resource, detectResourcesSync, envDetector, hostDetector, processDetector} from '@opentelemetry/resources'; +import { FsInstrumentation } from '@opentelemetry/instrumentation-fs'; +import {Resource, detectResourcesSync, envDetector, hostDetector, osDetector, processDetector} from '@opentelemetry/resources'; import {ATTR_SERVICE_NAME} from '@opentelemetry/semantic-conventions'; import {ATTR_CONTAINER_NAME} from '@opentelemetry/semantic-conventions/incubating'; @@ -80,7 +80,7 @@ export function setupTracing(options = {}) { [ATTR_CONTAINER_NAME]: hostname, }).merge( detectResourcesSync({ - detectors: [envDetector, processDetector, hostDetector] + detectors: [envDetector, hostDetector, osDetector, processDetector] }) ), }); @@ -108,12 +108,12 @@ export function setupTracing(options = {}) { instrumentations: [ new PinoInstrumentation(), new HttpInstrumentation({ requireParentforOutgoingSpans: false, requireParentforIncomingSpans: false, ignoreIncomingRequestHook, }), - new FastifyInstrumentation(), new ExpressInstrumentation({ ignoreIncomingRequestHook, }), new ConnectInstrumentation(), new AwsInstrumentation({ sqsExtractContextPropagationFromPayload: true, }), - new DnsInstrumentation(), new IORedisInstrumentation(), + new FsInstrumentation(), + new DnsInstrumentation(), ], }); diff --git a/package-lock.json b/package-lock.json index 53f8086..9a52601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@saidsef/tracing-node", - "version": "3.4.4", + "version": "3.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@saidsef/tracing-node", - "version": "3.4.4", + "version": "3.4.5", "license": "Apache-2.0", "dependencies": { "@opentelemetry/api": "^1.9.0", @@ -16,7 +16,7 @@ "@opentelemetry/instrumentation-connect": "^0.44.0", "@opentelemetry/instrumentation-dns": "^0.44.0", "@opentelemetry/instrumentation-express": "^0.48.0", - "@opentelemetry/instrumentation-fastify": "^0.45.0", + "@opentelemetry/instrumentation-fs": "^0.20.0", "@opentelemetry/instrumentation-http": "^0.200.0", "@opentelemetry/instrumentation-ioredis": "^0.48.0", "@opentelemetry/instrumentation-pino": "^0.47.0", @@ -1436,15 +1436,14 @@ "@opentelemetry/api": "^1.3.0" } }, - "node_modules/@opentelemetry/instrumentation-fastify": { - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.45.0.tgz", - "integrity": "sha512-m94anTFZ6jpvK0G5fXIiq1sB0gCgY2rAL7Cg7svuOh9Roya2RIQz2E5KfCsO1kWCmnHNeTo7wIofoGN7WLPvsA==", + "node_modules/@opentelemetry/instrumentation-fs": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.20.0.tgz", + "integrity": "sha512-30l45ovjwHb16ImCGVjKCvw5U7X1zKuYY26ii5S+goV8BZ4a/TCpBf2kQxteQjWD05Gl3fzPMZI5aScfPI6Rjw==", "license": "Apache-2.0", "dependencies": { "@opentelemetry/core": "^2.0.0", - "@opentelemetry/instrumentation": "^0.200.0", - "@opentelemetry/semantic-conventions": "^1.27.0" + "@opentelemetry/instrumentation": "^0.200.0" }, "engines": { "node": "^18.19.0 || >=20.6.0" @@ -2578,9 +2577,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.130", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.130.tgz", - "integrity": "sha512-Ou2u7L9j2XLZbhqzyX0jWDj6gA8D3jIfVzt4rikLf3cGBa0VdReuFimBKS9tQJA4+XpeCxj1NoWlfBXzbMa9IA==", + "version": "1.5.131", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.131.tgz", + "integrity": "sha512-fJFRYXVEJgDCiqFOgRGJm8XR97hZ13tw7FXI9k2yC5hgY+nyzC2tMO8baq1cQR7Ur58iCkASx2zrkZPZUnfzPg==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index 97fc51d..ec2eb0b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@saidsef/tracing-node", - "version": "3.4.4", + "version": "3.4.5", "description": "tracing NodeJS - Wrapper for OpenTelemetry instrumentation packages", "main": "libs/index.mjs", "scripts": { @@ -37,7 +37,7 @@ "@opentelemetry/instrumentation-connect": "^0.44.0", "@opentelemetry/instrumentation-dns": "^0.44.0", "@opentelemetry/instrumentation-express": "^0.48.0", - "@opentelemetry/instrumentation-fastify": "^0.45.0", + "@opentelemetry/instrumentation-fs": "^0.20.0", "@opentelemetry/instrumentation-http": "^0.200.0", "@opentelemetry/instrumentation-ioredis": "^0.48.0", "@opentelemetry/instrumentation-pino": "^0.47.0",