switch order of new and old names in transmform_event_names

Author: s-fleck

R/LayoutJson.R

@@ -63,8 +63,7 @@ LayoutJson <- R6::R6Class(
     #'
     #' @param transform_event_names
     #' * `NULL`: don't process names
-    #' * a named `character` vector where the names are the original field names
-    #'   and the values the desired new field names,
+    #' * a named `character` vector of the format `new_name = old_name`
     #' * or a `function` with a single mandatory argument that accepts a
     #'   `character` vector of field names. Applied after `transform_event`.
     #'
@@ -241,8 +240,8 @@ apply_event_name_transformer = function(x, f){
   }
 
   if (is.character(f)){
-    rename_idx <- match(x, names(f), nomatch = 0L)
-    x[rename_idx > 0L] <- f[rename_idx[rename_idx > 0L]]
+    rename_idx <- match(x, f, nomatch = 0L)
+    x[rename_idx > 0L] <- names(f)[rename_idx[rename_idx > 0L]]
     return(x)
   }
 

tests/testthat/test_LayoutJson.R

@@ -90,81 +90,6 @@ test_that("formatting timestamps with LayoutJson works", {
 })
 
 
-test_that("LayoutJson.format_event() - with default settings - format event correctly", {
-
-  # Arrange
-  event <- LogEvent$new(
-    logger = Logger$new("dum/my"),
-    level = 200L,
-    timestamp = structure(1541175573.9308, class = c("POSIXct", "POSIXt")),
-    caller = NA_character_,
-    msg = "foo bar",
-    rawMsg = "foobar-raw"
-  )
-
-  lo <- LayoutJson$new(
-    transform_event_names = c(
-      "msg" = "content",
-      "level" = "loglevel",
-      "logger" = "log.logger",
-      "caller" = "code.function",
-      "rawMsg" = "log.record.template"
-    ),
-    excluded_fields = NULL
-  )
-
-  # Act
-  res <- jsonlite::fromJSON(lo$format_event(event))
-
-  # Assert
-  expect_setequal(
-    names(res),
-    c("content",
-      "loglevel",
-      "log.logger",
-      "timestamp",
-      "code.function",
-      "log.record.template"))
-})
-
-
-test_that("LayoutJson.format_event() - with excluded fields - excludes field correctly", {
-
-  # Arrange
-  event <- LogEvent$new(
-    logger = Logger$new("dum/my"),
-    level = 200L,
-    timestamp = structure(1541175573.9308, class = c("POSIXct", "POSIXt")),
-    caller = NA_character_,
-    msg = "foo bar",
-    rawMsg = "foobar-raw"
-  )
-
-  lo <- LayoutJson$new(
-    transform_event_names = c(
-      "msg" = "content",
-      "level" = "loglevel",
-      "logger" = "log.logger",
-      "caller" = "code.function",
-      "rawMsg" = "log.record.template"
-    ),
-    excluded_fields = c("log.record.template", "code.function")
-  )
-
-  # Act
-  res <- jsonlite::fromJSON(lo$format_event(event))
-
-  # Assert
-  expect_setequal(
-    names(res),
-    c("content", "loglevel", "log.logger", "timestamp"))
-
-  expect_identical(res$content, "foo bar")
-  expect_identical(res$loglevel, 200L)
-  expect_identical(res$log.logger, "dum/my")
-})
-
-
 test_that("LayoutJson.format_event() - with field rename function - renames fields correctly", {
 
   # Arrange