Merge pull request #1056 from NoudH/master

Datadog logger
moleculerjs · Jan 17, 2022 · b951993 · b951993
2 parents d88abb1 + 1cdbc57
commit b951993
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/loggers/datadog.js b/src/loggers/datadog.js
@@ -36,7 +36,7 @@ class DatadogLogger extends BaseLogger {
 		super(opts);
 
 		this.opts = _.defaultsDeep(this.opts, {
-			url: "https://http-intake.logs.datadoghq.com/v1/input/",
+			url: "https://http-intake.logs.datadoghq.com/api/v2/logs/",
 			apiKey: process.env.DATADOG_API_KEY,
 			ddSource: "moleculer",
 			env: undefined,
@@ -159,10 +159,11 @@ class DatadogLogger extends BaseLogger {
 				};
 			});
 
-			return fetch(this.opts.url + this.opts.apiKey, {
+			return fetch(this.opts.url, {
 				method: "post",
 				body: JSON.stringify(data),
 				headers: {
+					"DD-API-KEY": this.opts.apiKey,
 					"Content-Type": "application/json"
 				}
 			})

diff --git a/test/unit/loggers/datadog.spec.js b/test/unit/loggers/datadog.spec.js
@@ -24,7 +24,7 @@ describe("Test Datadog logger class", () => {
 			expect(logger.opts).toEqual({
 				createLogger: null,
 				level: "info",
-				url: "https://http-intake.logs.datadoghq.com/v1/input/",
+				url: "https://http-intake.logs.datadoghq.com/api/v2/logs/",
 				apiKey: "datadog-api-key",
 				ddSource: "moleculer",
 				env: undefined,
@@ -51,7 +51,7 @@ describe("Test Datadog logger class", () => {
 			expect(logger.opts).toEqual({
 				createLogger: expect.any(Function),
 				level: "debug",
-				url: "https://http-intake.logs.datadoghq.com/v1/input/",
+				url: "https://http-intake.logs.datadoghq.com/api/v2/logs/",
 				apiKey: "datadog-api-key",
 				ddSource: "my-app",
 				env: "production",
@@ -363,11 +363,12 @@ describe("Test Datadog logger class", () => {
 
 			expect(fetch).toHaveBeenCalledTimes(1);
 			expect(fetch).toHaveBeenCalledWith(
-				"https://http-intake.logs.datadoghq.com/v1/input/datadog-api-key",
+				"https://http-intake.logs.datadoghq.com/api/v2/logs/",
 				{
 					method: "post",
 					headers: {
-						"Content-Type": "application/json"
+						"Content-Type": "application/json",
+						"DD-API-KEY": "datadog-api-key"
 					},
 					body: '[{"timestamp":0,"level":"fatal","message":"message { a: 5 }","nodeID":"node-1","ddsource":"moleculer","ddtags":"env:,nodeID:node-1,namespace:undefined","hostname":"my-host"},{"timestamp":0,"level":"error","message":"message { a: 5 }","nodeID":"node-1","ddsource":"moleculer","ddtags":"env:,nodeID:node-1,namespace:undefined","hostname":"my-host"}]'
 				}