From 3c0adace1669845349b67757d86b27a8b08f15af Mon Sep 17 00:00:00 2001
From: Luke Imhoff <luke.imhoff@dockyard.com>
Date: Wed, 19 Dec 2018 11:02:01 -0600
Subject: [PATCH] Include import_id and transaction_id in logger metadata

When `import_id` and `transaction_id` was added in Logger calls, they
were not added to the metadata allowed to be shown and so weren't
appearing in the logs.
---
 apps/block_scout_web/config/config.exs  | 2 +-
 apps/ethereum_jsonrpc/config/config.exs | 2 +-
 apps/explorer/config/config.exs         | 2 +-
 apps/indexer/config/config.exs          | 2 +-
 config/config.exs                       | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/block_scout_web/config/config.exs b/apps/block_scout_web/config/config.exs
index 38d5b3cd1f..b3f1f379f8 100644
--- a/apps/block_scout_web/config/config.exs
+++ b/apps/block_scout_web/config/config.exs
@@ -50,7 +50,7 @@ config :logger, :block_scout_web,
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a,
+       block_number step count error_count shrunk import_id transaction_id)a,
   metadata_filter: [application: :block_scout_web]
 
 config :spandex_phoenix, tracer: BlockScoutWeb.Tracer
diff --git a/apps/ethereum_jsonrpc/config/config.exs b/apps/ethereum_jsonrpc/config/config.exs
index 42e20c2b7b..bc82001113 100644
--- a/apps/ethereum_jsonrpc/config/config.exs
+++ b/apps/ethereum_jsonrpc/config/config.exs
@@ -19,7 +19,7 @@ config :logger, :ethereum_jsonrpc,
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a,
+       block_number step count error_count shrunk import_id transaction_id)a,
   metadata_filter: [application: :ethereum_jsonrpc]
 
 # Import environment specific config. This must remain at the bottom
diff --git a/apps/explorer/config/config.exs b/apps/explorer/config/config.exs
index c58234ec9b..d5ccdaa619 100644
--- a/apps/explorer/config/config.exs
+++ b/apps/explorer/config/config.exs
@@ -58,7 +58,7 @@ config :logger, :explorer,
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a,
+       block_number step count error_count shrunk import_id transaction_id)a,
   metadata_filter: [application: :explorer]
 
 config :spandex_ecto, SpandexEcto.EctoLogger,
diff --git a/apps/indexer/config/config.exs b/apps/indexer/config/config.exs
index 619d66f561..8ab7dafef2 100644
--- a/apps/indexer/config/config.exs
+++ b/apps/indexer/config/config.exs
@@ -21,7 +21,7 @@ config :logger, :indexer,
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a,
+       block_number step count error_count shrunk import_id transaction_id)a,
   metadata_filter: [application: :indexer]
 
 # Import environment specific config. This must remain at the bottom
diff --git a/config/config.exs b/config/config.exs
index a2784b5e86..dd53c84375 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -34,14 +34,14 @@ config :logger, :console,
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a
+       block_number step count error_count shrunk import_id transaction_id)a
 
 config :logger, :ecto,
   # Use same format for all loggers, even though the level should only ever be `:error` for `:error` backend
   format: "$dateT$time $metadata[$level] $message\n",
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a,
+       block_number step count error_count shrunk import_id transaction_id)a,
   metadata_filter: [application: :ecto]
 
 config :logger, :error,
@@ -50,7 +50,7 @@ config :logger, :error,
   level: :error,
   metadata:
     ~w(application fetcher request_id first_block_number last_block_number missing_block_range_count missing_block_count
-       block_number step count error_count shrunk)a
+       block_number step count error_count shrunk import_id transaction_id)a
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.