Skip to content

Commit 6fc1ca9

Browse files
committed
Start using message attribute instead of log for binary messages
Data from message is used to build a nicer view for log messages in Stackdriver UI. Closes #14.
1 parent 36abf9d commit 6fc1ca9

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

lib/logger_json/formatters/google_cloud_logger.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ defmodule LoggerJSON.Formatters.GoogleCloudLogger do
3030
%{
3131
time: format_timestamp(ts),
3232
severity: unquote(gcp_level),
33-
log: IO.iodata_to_binary(msg)
33+
message: IO.iodata_to_binary(msg)
3434
},
3535
format_metadata(md, md_keys)
3636
)
@@ -42,7 +42,7 @@ defmodule LoggerJSON.Formatters.GoogleCloudLogger do
4242
%{
4343
time: format_timestamp(ts),
4444
severity: "DEFAULT",
45-
log: IO.iodata_to_binary(msg)
45+
message: IO.iodata_to_binary(msg)
4646
},
4747
format_metadata(md, md_keys)
4848
)

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule LoggerJSON.Mixfile do
22
use Mix.Project
33

4-
@version "3.1.2"
4+
@version "3.2.0"
55

66
def project do
77
[

test/unit/logger_json/ecto_test.exs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ defmodule LoggerJSON.EctoTest do
3333
end)
3434

3535
assert %{
36-
"log" => "done",
36+
"message" => "done",
3737
"query" => %{
3838
"decode_time_μs" => 500,
3939
"latency_μs" => 2700,
@@ -53,7 +53,7 @@ defmodule LoggerJSON.EctoTest do
5353
end)
5454

5555
assert %{
56-
"log" => "done",
56+
"message" => "done",
5757
"query" => %{
5858
"decode_time_μs" => 500,
5959
"latency_μs" => 2700,
@@ -95,7 +95,7 @@ defmodule LoggerJSON.EctoTest do
9595
end)
9696

9797
assert %{
98-
"log" => "begin",
98+
"message" => "begin",
9999
"query" => %{
100100
"latency_μs" => 3036,
101101
"execution_time_μs" => 2930,

test/unit/logger_json/plug_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ defmodule LoggerJSON.PlugTest do
3333
end)
3434

3535
assert %{
36-
"log" => "",
36+
"message" => "",
3737
"httpRequest" => %{
3838
"latency" => latency,
3939
"referer" => nil,

test/unit/logger_json_test.exs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ defmodule LoggerJSONTest do
4141
|> capture_log()
4242
|> Jason.decode!()
4343

44-
assert %{"log" => ""} = log
44+
assert %{"message" => ""} = log
4545
end
4646

4747
test "logs binary messages" do
@@ -52,7 +52,7 @@ defmodule LoggerJSONTest do
5252
|> capture_log()
5353
|> Jason.decode!()
5454

55-
assert %{"log" => "hello"} = log
55+
assert %{"message" => "hello"} = log
5656
end
5757

5858
test "logs empty iodata messages" do
@@ -63,7 +63,7 @@ defmodule LoggerJSONTest do
6363
|> capture_log()
6464
|> Jason.decode!()
6565

66-
assert %{"log" => ""} = log
66+
assert %{"message" => ""} = log
6767
end
6868

6969
test "logs iodata messages" do
@@ -74,7 +74,7 @@ defmodule LoggerJSONTest do
7474
|> capture_log()
7575
|> Jason.decode!()
7676

77-
assert %{"log" => "hello"} = log
77+
assert %{"message" => "hello"} = log
7878
end
7979

8080
test "log message does not break escaping" do
@@ -85,14 +85,14 @@ defmodule LoggerJSONTest do
8585
|> capture_log()
8686
|> Jason.decode!()
8787

88-
assert %{"log" => "\"h"} = log
88+
assert %{"message" => "\"h"} = log
8989

9090
log =
9191
fn -> Logger.debug("\"h") end
9292
|> capture_log()
9393
|> Jason.decode!()
9494

95-
assert %{"log" => "\"h"} = log
95+
assert %{"message" => "\"h"} = log
9696
end
9797

9898
test "does not start when there is no user" do
@@ -160,7 +160,7 @@ defmodule LoggerJSONTest do
160160
|> capture_log()
161161
|> Jason.decode!()
162162

163-
assert %{"log" => "hello"} = log
163+
assert %{"message" => "hello"} = log
164164
end
165165
end
166166

0 commit comments

Comments
 (0)