From cfdc12c0928026007f413f7e9c70c3cbcb3038c7 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 13 Dec 2017 18:05:42 +0800 Subject: [PATCH 1/2] Removed all occurences of type for logstash 6.0.0 --- lib/logger_logstash_backend.ex | 4 ---- test/logger_logstash_backend_test.exs | 3 --- 2 files changed, 7 deletions(-) diff --git a/lib/logger_logstash_backend.ex b/lib/logger_logstash_backend.ex index 905adaa..7e1199d 100644 --- a/lib/logger_logstash_backend.ex +++ b/lib/logger_logstash_backend.ex @@ -54,7 +54,6 @@ defmodule LoggerLogstashBackend do level, msg, ts, md, %{ host: host, port: port, - type: type, metadata: metadata, socket: socket } @@ -71,7 +70,6 @@ defmodule LoggerLogstashBackend do ) ts = Timex.to_datetime ts, Timezone.local {:ok, json} = JSX.encode %{ - type: type, "@timestamp": Timex.format!(ts, "{ISO:Extended}"), message: to_string(msg), fields: fields @@ -86,7 +84,6 @@ defmodule LoggerLogstashBackend do level = Keyword.get opts, :level, :debug metadata = Keyword.get opts, :metadata, [] - type = Keyword.get opts, :type, "elixir" host = Keyword.get opts, :host port = Keyword.get opts, :port {:ok, socket} = :gen_udp.open 0 @@ -96,7 +93,6 @@ defmodule LoggerLogstashBackend do port: port, level: level, socket: socket, - type: type, metadata: metadata } end diff --git a/test/logger_logstash_backend_test.exs b/test/logger_logstash_backend_test.exs index 20ea190..fdef0db 100644 --- a/test/logger_logstash_backend_test.exs +++ b/test/logger_logstash_backend_test.exs @@ -26,7 +26,6 @@ defmodule LoggerLogstashBackendTest do host: "127.0.0.1", port: 10001, level: :info, - type: "some_app", metadata: [ some_metadata: "go here" ] @@ -42,7 +41,6 @@ defmodule LoggerLogstashBackendTest do Logger.info "hello world", [key1: "field1"] json = get_log() {:ok, data} = JSX.decode json - assert data["type"] === "some_app" assert data["message"] === "hello world" expected = %{ "function" => "test can log/1", @@ -65,7 +63,6 @@ defmodule LoggerLogstashBackendTest do Logger.info "pid", [pid_key: self()] json = get_log() {:ok, data} = JSX.decode json - assert data["type"] === "some_app" assert data["message"] === "pid" expected = %{ "function" => "test can log pids/1", From fa066ee0f7f534feb4c0ff672d646e7de00e88f1 Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 13 Dec 2017 18:26:17 +0800 Subject: [PATCH 2/2] Updated tests --- test/logger_logstash_backend_test.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/logger_logstash_backend_test.exs b/test/logger_logstash_backend_test.exs index fdef0db..4d046ba 100644 --- a/test/logger_logstash_backend_test.exs +++ b/test/logger_logstash_backend_test.exs @@ -48,7 +48,7 @@ defmodule LoggerLogstashBackendTest do "module" => "Elixir.LoggerLogstashBackendTest", "pid" => (inspect self()), "some_metadata" => "go here", - "line" => 42, + "line" => 41, "key1" => "field1" } assert contains?(data["fields"], expected) @@ -71,7 +71,7 @@ defmodule LoggerLogstashBackendTest do "pid" => (inspect self()), "pid_key" => inspect(self()), "some_metadata" => "go here", - "line" => 65 + "line" => 63 } assert contains?(data["fields"], expected) {:ok, ts} = Timex.parse data["@timestamp"], "{ISO:Extended}"