Remove trace implementation

Author: Julia-Garland

CMakeLists.txt

@@ -184,12 +184,6 @@ else ()
    message (FATAL_ERROR "Unknown crypto provider ${MONGOCRYPT_CRYPTO}")
 endif ()
 
-set (MONGOCRYPT_ENABLE_TRACE 0)
-if (ENABLE_TRACE)
-   message (WARNING "Building with trace logging. This is highly insecure. Do not use in a production environment")
-   set (MONGOCRYPT_ENABLE_TRACE 1)
-endif ()
-
 set (BUILD_VERSION "0.0.0" CACHE STRING "Library version")
 if (BUILD_VERSION STREQUAL "0.0.0")
    if (EXISTS ${CMAKE_BINARY_DIR}/VERSION_CURRENT)

bindings/python/pymongocrypt/binding.py

@@ -260,7 +260,6 @@ def _parse_version(version):
     MONGOCRYPT_LOG_LEVEL_ERROR = 1,
     MONGOCRYPT_LOG_LEVEL_WARNING = 2,
     MONGOCRYPT_LOG_LEVEL_INFO = 3,
-    MONGOCRYPT_LOG_LEVEL_TRACE = 4
 } mongocrypt_log_level_t;
 
 /**

integrating.md

@@ -72,8 +72,6 @@ executable included with libmongocrypt. It uses mock responses from
 mongod, mongocryptd, and KMS. Reimplement the state machine loop
 (`_run_state_machine`) in example-state-machine with your binding.
 
-To debug, configure with the cmake option `-DENABLE_TRACE=ON`, and set the environment variable `MONGOCRYPT_TRACE=ON` to log the arguments to mongocrypt functions. Note, this is insecure and should only be used for debugging.
-
 Seek help in the slack channel \#drivers-fle.
 
 ## Part 2: Integrate into Driver ##

src/mongocrypt-config.h.in

@@ -72,16 +72,6 @@
 #endif
 
 
-/*
- * MONGOCRYPT_ENABLE_TRACE is set from configure to determine if we are
- * compiled with tracing support.
- */
-#define MONGOCRYPT_ENABLE_TRACE @MONGOCRYPT_ENABLE_TRACE@
-
-#if MONGOCRYPT_ENABLE_TRACE != 1
-#  undef MONGOCRYPT_ENABLE_TRACE
-#endif
-
 /* clang-format on */
 
 #endif /* MONGOCRYPT_CONFIG_H */

src/mongocrypt-log-private.h

@@ -24,7 +24,6 @@ typedef struct {
     mongocrypt_mutex_t mutex; /* protects fn and ctx. */
     mongocrypt_log_fn_t fn;
     void *ctx;
-    bool trace_enabled;
 } _mongocrypt_log_t;
 
 void _mongocrypt_stdout_log_fn(mongocrypt_log_level_t level, const char *message, uint32_t message_len, void *ctx);
@@ -38,42 +37,11 @@ void _mongocrypt_log_cleanup(_mongocrypt_log_t *log);
 
 void _mongocrypt_log_set_fn(_mongocrypt_log_t *log, mongocrypt_log_fn_t fn, void *ctx);
 
-#ifdef MONGOCRYPT_ENABLE_TRACE
-
-#define CRYPT_TRACEF(log, fmt, ...)                                                                                    \
-    _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "(%s:%d) " fmt, BSON_FUNC, __LINE__, __VA_ARGS__)
-
-#define CRYPT_TRACE(log, msg) CRYPT_TRACEF(crypt, "%s", msg)
-
-#define CRYPT_ENTRY(log) _mongocrypt_log(crypt, MONGOCRYPT_LOG_LEVEL_TRACE, "entry (%s:%d)", BSON_FUNC, __LINE__)
-
-#define CRYPT_EXIT(log)                                                                                                \
-    do {                                                                                                               \
-        _mongocrypt_log(crypt, MONGOCRYPT_LOG_LEVEL_TRACE, "exit (%s:%d)", BSON_FUNC, __LINE__);                       \
-        return;                                                                                                        \
-    } while (0)
-
-#define CRYPT_RETURN(log, x)                                                                                           \
-    do {                                                                                                               \
-        _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "return (%s:%d)", BSON_FUNC, __LINE__);                       \
-        return (x);                                                                                                    \
-    } while (0)
-
-#define CRYPT_GOTO(log, x)                                                                                             \
-    do {                                                                                                               \
-        _mongocrypt_log(log, MONGOCRYPT_LOG_LEVEL_TRACE, "goto (%s:%d)", BSON_FUNC, __LINE__);                         \
-        goto x;                                                                                                        \
-    } while (0)
-
-#else
-
 #define CRYPT_TRACEF(log, fmt, ...)
 #define CRYPT_TRACE(log, msg)
 #define CRYPT_ENTRY(log)
 #define CRYPT_EXIT(log)
 #define CRYPT_RETURN(log, x) return (x);
 #define CRYPT_GOTO(log, x) goto x;
 
-#endif /* MONGOCRYPT_ENABLE_TRACE */
-
 #endif /* MONGOCRYPT_LOG_PRIVATE_H */

src/mongocrypt-log.c

@@ -26,9 +26,6 @@ void _mongocrypt_log_init(_mongocrypt_log_t *log) {
     _mongocrypt_mutex_init(&log->mutex);
     /* Initially, no log function is set. */
     _mongocrypt_log_set_fn(log, NULL, NULL);
-#ifdef MONGOCRYPT_ENABLE_TRACE
-    log->trace_enabled = (getenv("MONGOCRYPT_TRACE") != NULL);
-#endif
 }
 
 void _mongocrypt_log_cleanup(_mongocrypt_log_t *log) {
@@ -47,7 +44,6 @@ void _mongocrypt_stdout_log_fn(mongocrypt_log_level_t level, const char *message
     case MONGOCRYPT_LOG_LEVEL_ERROR: printf("ERROR"); break;
     case MONGOCRYPT_LOG_LEVEL_WARNING: printf("WARNING"); break;
     case MONGOCRYPT_LOG_LEVEL_INFO: printf("INFO"); break;
-    case MONGOCRYPT_LOG_LEVEL_TRACE: printf("TRACE"); break;
     default: printf("UNKNOWN"); break;
     }
     printf(" %s\n", message);
@@ -69,10 +65,6 @@ void _mongocrypt_log(_mongocrypt_log_t *log, mongocrypt_log_level_t level, const
     BSON_ASSERT_PARAM(log);
     BSON_ASSERT_PARAM(format);
 
-    if (level == MONGOCRYPT_LOG_LEVEL_TRACE && !log->trace_enabled) {
-        return;
-    }
-
     va_start(args, format);
     message = bson_strdupv_printf(format, args);
     va_end(args);

src/mongocrypt.h

@@ -255,7 +255,6 @@ typedef enum {
     MONGOCRYPT_LOG_LEVEL_ERROR = 1,
     MONGOCRYPT_LOG_LEVEL_WARNING = 2,
     MONGOCRYPT_LOG_LEVEL_INFO = 3,
-    MONGOCRYPT_LOG_LEVEL_TRACE = 4
 } mongocrypt_log_level_t;
 
 /**