Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat + migration: Use Otel logs module #100

Merged
merged 25 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e033a07
feat: migrate logger to otel base
wrn14897 Apr 25, 2024
c280261
feat: install semantic convention pkg
wrn14897 Apr 25, 2024
74241b5
fix: default to disable resources detector
wrn14897 Apr 25, 2024
6f9b9ab
chore: bump winston-transport
wrn14897 Apr 25, 2024
cc25c7e
fix + style: use Attributes + no set global log providder
wrn14897 Apr 25, 2024
1e7503c
feat: handle batch vs queue size
wrn14897 Apr 25, 2024
82d9570
feat: follow the convention (winston-transport)
wrn14897 Apr 26, 2024
52a012e
fix: pino logger 'message' field conflict
wrn14897 Apr 26, 2024
5189700
style: remove unused _logger
wrn14897 Apr 26, 2024
2c76c30
docs: add changeset
wrn14897 Apr 26, 2024
d270a9a
fix: type
wrn14897 Apr 26, 2024
ab5bd35
feat: should extract default endpoint url from the env var
wrn14897 Apr 26, 2024
337effc
test: update dummy testing files
wrn14897 Apr 26, 2024
b586c39
feat: version lock + use getEnv from otel core
wrn14897 Apr 26, 2024
1d683cc
fix: should use getEnvWithoutDefaults
wrn14897 Apr 26, 2024
d27db77
docs: comments
wrn14897 Apr 26, 2024
b9fda6b
fix: duplicate setImmediate
wrn14897 Apr 26, 2024
d458555
feat: emit finish signal (winston close call)
wrn14897 Apr 26, 2024
1f62bb9
style: cleanup
wrn14897 Apr 26, 2024
7263f4d
feat: support OTEL_LOG_LEVEL
wrn14897 Apr 26, 2024
25f2e75
style: move apiKey arg to winston and pino transport level
wrn14897 Apr 26, 2024
f3b0ca4
style: move codes + cleanup otel logger instrumentation setups
wrn14897 Apr 26, 2024
57fb7b1
perf: import lodash sub modules
wrn14897 Apr 26, 2024
6f36203
test: update dummy js
wrn14897 Apr 26, 2024
9018b46
style: cleanups
wrn14897 Apr 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/lazy-donuts-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@hyperdx/node-logger': minor
'@hyperdx/node-opentelemetry': minor
---

feat + migration: Use Otel logs module
25 changes: 19 additions & 6 deletions packages/node-logger/dummy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const express = require('express');
const PORT = parseInt(process.env.PORT || '7777');
const PORT = parseInt(process.env.PORT || '7788');
const winston = require('winston');
const pino = require('pino');
const app = express();
Expand All @@ -10,12 +10,15 @@ const { HyperDXWinston } = require('./build/src');
// RANDOM API KEY
const HDX_API_KEY = '<KEY1>';
const HDX_API_KEY2 = '<KEY2>';
const HDX_API_URL = 'http://localhost:8002';
const HDX_API_URL = 'http://localhost:4318/v1/logs';
const DETECT_RESOURCES = false;

const logger = new Logger({
apiKey: HDX_API_KEY,
baseUrl: HDX_API_URL,
service: 'native',
bufferSize: 100,
queueSize: 10,
});

const winstonLogger = winston.createLogger({
Expand All @@ -24,6 +27,7 @@ const winstonLogger = winston.createLogger({
transports: [
new winston.transports.Console(),
new HyperDXWinston({
detectResources: DETECT_RESOURCES,
apiKey: HDX_API_KEY,
maxLevel: 'info',
service: 'winston',
Expand All @@ -38,6 +42,7 @@ const winstonLogger2 = winston.createLogger({
transports: [
new winston.transports.Console(),
new HyperDXWinston({
detectResources: DETECT_RESOURCES,
apiKey: HDX_API_KEY2,
maxLevel: 'info',
service: 'winston',
Expand All @@ -52,6 +57,7 @@ const pinoLogger = pino(
{
target: './build/src/pino',
options: {
detectResources: DETECT_RESOURCES,
apiKey: HDX_API_KEY,
service: 'pino',
baseUrl: HDX_API_URL,
Expand All @@ -69,13 +75,20 @@ app.get('/', (req, res) => {
url: req.url,
query: req.query,
});
winstonLogger.info('🍕');
winstonLogger.error({
// winstonLogger.info('🍕');
// winstonLogger.error({
// message: 'BANG !!!',
// headers: req.headers,
// });
// winstonLogger2.info('🤯🤯🤯');
pinoLogger.info('🍕');
pinoLogger.error({
message: 'BANG !!!',
headers: req.headers,
});
winstonLogger2.info('🤯🤯🤯');
pinoLogger.info('🍕');
pinoLogger.warn({
foo: 'bar',
});
res.send('Hello World');
});

Expand Down
14 changes: 8 additions & 6 deletions packages/node-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,24 @@
},
"dependencies": {
"@nestjs/common": "^9.4.2",
"axios": "^1.6.8",
"@opentelemetry/api-logs": "~0.51.0",
"@opentelemetry/core": "~1.24.0",
"@opentelemetry/exporter-logs-otlp-http": "~0.51.0",
"@opentelemetry/resources": "~1.24.0",
"@opentelemetry/sdk-logs": "~0.51.0",
"@opentelemetry/semantic-conventions": "~1.24.0",
"debug": "^4.3.4",
"json-stringify-safe": "^5.0.1",
"lodash": "^4.17.21",
"nest-winston": "^1.9.2",
"pino-abstract-transport": "^1.0.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"strip-ansi": "^6.0.1",
"tslib": "^2.5.3",
"winston": "^3.9.0",
"winston-transport": "^4.5.0"
},
"devDependencies": {
"pino": "^8.14.1"
"winston-transport": "^4.7.0"
},
"devDependencies": {},
"peerDependencies": {},
"keywords": [
"winston",
Expand Down
32 changes: 0 additions & 32 deletions packages/node-logger/src/_logger/index.d.ts

This file was deleted.

Loading
Loading