Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
myrotvorets-team committed Sep 30, 2023
1 parent 254587e commit 02bfc6e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist/**
node_modules/**
*.js
*.cjs
*.mjs
2 changes: 2 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
"@myrotvorets/express-microservice-middlewares": "^1.5.7",
"@myrotvorets/oav-installer": "^4.0.1",
"@myrotvorets/opentelemetry-configurator": "^5.0.0",
"@opentelemetry/api-logs": "^0.43.0",
"@opentelemetry/instrumentation-express": "^0.33.0",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/sdk-logs": "^0.43.0",
"@wwa/statvfs": "^1.1.13",
"envalid": "^8.0.0",
"express": "^4.17.1",
Expand Down
2 changes: 2 additions & 0 deletions src/lib/tracing.mts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
import { OpenTelemetryConfigurator } from '@myrotvorets/opentelemetry-configurator';
import { BatchLogRecordProcessor, ConsoleLogRecordExporter } from '@opentelemetry/sdk-logs';

if (!+(process.env.ENABLE_TRACING || 0)) {
process.env.OTEL_SDK_DISABLED = 'true';
Expand All @@ -10,6 +11,7 @@ if (!+(process.env.ENABLE_TRACING || 0)) {
const configurator = new OpenTelemetryConfigurator({
serviceName: 'psb-api-identigraf-uploader',
instrumentations: [new ExpressInstrumentation(), new HttpInstrumentation()],
logRecordProcessor: new BatchLogRecordProcessor(new ConsoleLogRecordExporter()),
});

configurator.start();
Expand Down
9 changes: 9 additions & 0 deletions src/server.mts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { cleanUploadedFilesMiddleware } from '@myrotvorets/clean-up-after-multer
import { createServer } from '@myrotvorets/create-server';
import morgan from 'morgan';
import { memoryStorage } from 'multer';
import { logs } from '@opentelemetry/api-logs';

import { environment } from './lib/environment.mjs';

Expand Down Expand Up @@ -71,6 +72,14 @@ export function setupApp(): Express {
),
);

app.use((req, res, next) => {
const logger = logs.getLogger('default');
logger.emit({
body: `${req.method} ${req.url} ${req.ip}`,
});
next();
});

return app;
}

Expand Down

0 comments on commit 02bfc6e

Please sign in to comment.