Skip to content

Commit 1b2baf1

Browse files
committed
Remove unused import warnings
1 parent 1a72c79 commit 1b2baf1

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

lib/logger_json/formatters/basic.ex

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ defmodule LoggerJSON.Formatters.Basic do
1515
}
1616
"""
1717
import LoggerJSON.Formatter.{MapBuilder, DateTime, Message, Metadata, RedactorEncoder}
18+
require Jason.Helpers
1819

1920
@behaviour LoggerJSON.Formatter
2021

@@ -71,19 +72,17 @@ defmodule LoggerJSON.Formatters.Basic do
7172
end
7273

7374
if Code.ensure_loaded?(Plug.Conn) do
74-
import Jason.Helpers, only: [json_map: 1]
75-
7675
defp format_http_request(%{conn: %Plug.Conn{} = conn}) do
77-
json_map(
76+
Jason.Helpers.json_map(
7877
connection:
79-
json_map(
78+
Jason.Helpers.json_map(
8079
protocol: Plug.Conn.get_http_protocol(conn),
8180
method: conn.method,
8281
path: conn.request_path,
8382
status: conn.status
8483
),
8584
client:
86-
json_map(
85+
Jason.Helpers.json_map(
8786
user_agent: LoggerJSON.Formatter.Plug.get_header(conn, "user-agent"),
8887
ip: LoggerJSON.Formatter.Plug.remote_ip(conn)
8988
)

lib/logger_json/formatters/datadog.ex

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ defmodule LoggerJSON.Formatters.Datadog do
4242
}
4343
"""
4444
import LoggerJSON.Formatter.{MapBuilder, DateTime, Message, Metadata, Code, RedactorEncoder}
45+
require Jason.Helpers
4546

4647
@behaviour LoggerJSON.Formatter
4748

@@ -194,8 +195,6 @@ defmodule LoggerJSON.Formatters.Datadog do
194195
defp safe_chardata_to_string(other), do: other
195196

196197
if Code.ensure_loaded?(Plug.Conn) do
197-
import Jason.Helpers, only: [json_map: 1]
198-
199198
defp format_http_request(%{conn: %Plug.Conn{} = conn} = meta) do
200199
request_url = Plug.Conn.request_url(conn)
201200
user_agent = LoggerJSON.Formatter.Plug.get_header(conn, "user-agent")
@@ -204,23 +203,23 @@ defmodule LoggerJSON.Formatters.Datadog do
204203

205204
%{
206205
http:
207-
json_map(
206+
Jason.Helpers.json_map(
208207
url: request_url,
209208
status_code: conn.status,
210209
method: conn.method,
211210
referer: referer,
212211
request_id: meta[:request_id],
213212
useragent: user_agent,
214213
url_details:
215-
json_map(
214+
Jason.Helpers.json_map(
216215
host: conn.host,
217216
port: conn.port,
218217
path: conn.request_path,
219218
queryString: conn.query_string,
220219
scheme: conn.scheme
221220
)
222221
),
223-
network: json_map(client: json_map(ip: remote_ip))
222+
network: Jason.Helpers.json_map(client: Jason.Helpers.json_map(ip: remote_ip))
224223
}
225224
end
226225
end

lib/logger_json/formatters/elastic.ex

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ defmodule LoggerJSON.Formatters.Elastic do
9797
```
9898
"""
9999
import LoggerJSON.Formatter.{MapBuilder, DateTime, Message, Metadata, RedactorEncoder}
100+
require Jason.Helpers
100101

101102
@behaviour LoggerJSON.Formatter
102103

@@ -222,15 +223,13 @@ defmodule LoggerJSON.Formatters.Elastic do
222223
defp format_logger_fields(_meta), do: nil
223224

224225
if Code.ensure_loaded?(Plug.Conn) do
225-
import Jason.Helpers, only: [json_map: 1]
226-
227226
# See the formats for the following fields in ECS:
228227
# - client.ip: https://www.elastic.co/guide/en/ecs/8.11/ecs-client.html
229228
# - http.*: https://www.elastic.co/guide/en/ecs/8.11/ecs-http.html
230229
# - url.path: https://www.elastic.co/guide/en/ecs/8.11/ecs-url.html
231230
# - user_agent.original: https://www.elastic.co/guide/en/ecs/8.11/ecs-user_agent.html
232231
defp format_http_request(%{conn: %Plug.Conn{} = conn}) do
233-
json_map(
232+
Jason.Helpers.json_map(
234233
"client.ip": LoggerJSON.Formatter.Plug.remote_ip(conn),
235234
"http.version": Plug.Conn.get_http_protocol(conn),
236235
"http.request.method": conn.method,

0 commit comments

Comments
 (0)