Skip to content

Commit 68040b1

Browse files
authored
chore: add os and fs detectors (#280)
1 parent 726edde commit 68040b1

File tree

4 files changed

+29
-26
lines changed

4 files changed

+29
-26
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/github-script@v7
2727
if: ${{ env.PACKAGE }}
2828
with:
29-
github-token: ${{ github.token }}
29+
github-token: ${{ secrets.GITHUB_TOKEN }}
3030
script: |
3131
let tagExists = [];
3232
try {
@@ -67,8 +67,10 @@ jobs:
6767
id: release
6868
if: ${{ env.PACKAGE }}
6969
continue-on-error: true
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7072
with:
71-
github-token: ${{ github.token }}
73+
github-token: ${{ secrets.GITHUB_TOKEN }}
7274
result-encoding: string
7375
script: |
7476
const { repo: { owner, repo }, sha } = context;
@@ -85,13 +87,15 @@ jobs:
8587
8688
release_id = release.data.id;
8789
} catch (e) {
88-
let latest;
89-
if (e.status == 422) { // Release alredy exists
90-
latest = await github.rest.repos.getLatestRelease({
91-
owner, repo
90+
if (e.status == 422) { // Release already exists
91+
const latest = await github.rest.repos.getLatestRelease({
92+
owner,
93+
repo
9294
});
95+
release_id = latest.data.id;
96+
} else {
97+
throw e;
9398
}
94-
release_id = latest.data.id;
9599
}
96100
97101
return release_id

libs/index.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ import {ConnectInstrumentation} from '@opentelemetry/instrumentation-connect';
2424
import {diag, DiagConsoleLogger, DiagLogLevel} from '@opentelemetry/api';
2525
import {DnsInstrumentation} from '@opentelemetry/instrumentation-dns';
2626
import {ExpressInstrumentation} from '@opentelemetry/instrumentation-express';
27-
import {FastifyInstrumentation} from '@opentelemetry/instrumentation-fastify';
2827
import {HttpInstrumentation} from '@opentelemetry/instrumentation-http';
2928
import {NodeTracerProvider} from '@opentelemetry/sdk-trace-node';
3029
import {OTLPTraceExporter} from '@opentelemetry/exporter-trace-otlp-grpc';
3130
import {PinoInstrumentation} from '@opentelemetry/instrumentation-pino';
3231
import {IORedisInstrumentation} from '@opentelemetry/instrumentation-ioredis';
3332
import {registerInstrumentations} from '@opentelemetry/instrumentation';
34-
import {Resource, detectResourcesSync, envDetector, hostDetector, processDetector} from '@opentelemetry/resources';
33+
import { FsInstrumentation } from '@opentelemetry/instrumentation-fs';
34+
import {Resource, detectResourcesSync, envDetector, hostDetector, osDetector, processDetector} from '@opentelemetry/resources';
3535
import {ATTR_SERVICE_NAME} from '@opentelemetry/semantic-conventions';
3636
import {ATTR_CONTAINER_NAME} from '@opentelemetry/semantic-conventions/incubating';
3737

@@ -80,7 +80,7 @@ export function setupTracing(options = {}) {
8080
[ATTR_CONTAINER_NAME]: hostname,
8181
}).merge(
8282
detectResourcesSync({
83-
detectors: [envDetector, processDetector, hostDetector]
83+
detectors: [envDetector, hostDetector, osDetector, processDetector]
8484
})
8585
),
8686
});
@@ -108,12 +108,12 @@ export function setupTracing(options = {}) {
108108
instrumentations: [
109109
new PinoInstrumentation(),
110110
new HttpInstrumentation({ requireParentforOutgoingSpans: false, requireParentforIncomingSpans: false, ignoreIncomingRequestHook, }),
111-
new FastifyInstrumentation(),
112111
new ExpressInstrumentation({ ignoreIncomingRequestHook, }),
113112
new ConnectInstrumentation(),
114113
new AwsInstrumentation({ sqsExtractContextPropagationFromPayload: true, }),
115-
new DnsInstrumentation(),
116114
new IORedisInstrumentation(),
115+
new FsInstrumentation(),
116+
new DnsInstrumentation(),
117117
],
118118
});
119119

package-lock.json

Lines changed: 11 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@saidsef/tracing-node",
3-
"version": "3.4.4",
3+
"version": "3.4.5",
44
"description": "tracing NodeJS - Wrapper for OpenTelemetry instrumentation packages",
55
"main": "libs/index.mjs",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"@opentelemetry/instrumentation-connect": "^0.44.0",
3838
"@opentelemetry/instrumentation-dns": "^0.44.0",
3939
"@opentelemetry/instrumentation-express": "^0.48.0",
40-
"@opentelemetry/instrumentation-fastify": "^0.45.0",
40+
"@opentelemetry/instrumentation-fs": "^0.20.0",
4141
"@opentelemetry/instrumentation-http": "^0.200.0",
4242
"@opentelemetry/instrumentation-ioredis": "^0.48.0",
4343
"@opentelemetry/instrumentation-pino": "^0.47.0",

0 commit comments

Comments
 (0)