pr feedback

win_etw_logger/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "win_etw_logger"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["Arlie Davis <ardavis@microsoft.com>"]
 edition = "2018"
 description = "A Rust log provider which forwards events to Event Tracing for Windows (ETW)."
@@ -12,7 +12,7 @@ readme = "../README.md"
 
 [dependencies]
 log = { version = "^0.4", features = ["std"] }
-win_etw_provider = { version = "0.1.6", path = "../win_etw_provider" }
-win_etw_macros = { version = "0.1.6", path = "../win_etw_macros" }
-win_etw_metadata = { version = "0.1.1", path = "../win_etw_metadata" }
+win_etw_provider = { version = "0.1.7", path = "../win_etw_provider" }
+win_etw_macros = { version = "0.1.7", path = "../win_etw_macros" }
+win_etw_metadata = { version = "0.1.2", path = "../win_etw_metadata" }
 winapi = { version = "^0.3.8" }

win_etw_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "win_etw_macros"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["Arlie Davis <ardavis@microsoft.com>"]
 edition = "2018"
 description = "Enables apps to report events to Event Tracing for Windows (ETW)."
@@ -17,5 +17,5 @@ proc-macro = true
 proc-macro2 = "^1.0"
 syn = { version = "^1.0", features = ["full", "extra-traits"] }
 quote = "^1.0"
-win_etw_metadata = { version = "^0.1.1", path = "../win_etw_metadata" }
+win_etw_metadata = { version = "0.1.2", path = "../win_etw_metadata" }
 uuid = { version = "^1.3" }

win_etw_metadata/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "win_etw_metadata"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Arlie Davis <ardavis@microsoft.com>"]
 edition = "2018"
 description = "Provides metadata definitions for the win_etw_provider and win_etw_macros crates."

win_etw_metadata/src/lib.rs

@@ -232,3 +232,39 @@ bitflags! {
         const DATETIME_UTC = 38;
     }
 }
+
+// Event categories specified via keywords
+/// Event category for critical data (specified via keyword)
+pub const MICROSOFT_KEYWORD_CRITICAL_DATA: u64 = 0x0000_8000_0000_0000;
+/// Event category for measures (specified via keyword)
+pub const MICROSOFT_KEYWORD_MEASURES: u64 = 0x0000_4000_0000_0000;
+/// Event category for telemetry (specified via keyword)
+pub const MICROSOFT_KEYWORD_TELEMETRY: u64 = 0x0000_2000_0000_0000;
+
+// Event categories specified via event tags
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_DROP_USER_IDS: u32 = 0x0000_8000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_AGGREGATE: u32 = 0x0001_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_DROP_PII_EXCEPT_IP: u32 = 0x0002_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_COSTDEFERRED_LATENCY: u32 = 0x0004_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_CORE_DATA: u32 = 0x0008_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_INJECT_XTOKEN: u32 = 0x0010_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_REALTIME_LATENCY: u32 = 0x0020_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_NORMAL_LATENCY: u32 = 0x0040_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_CRITICAL_PERSISTENCE: u32 = 0x0080_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_NORMAL_PERSISTENCE: u32 = 0x0100_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_DROP_PII: u32 = 0x0200_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_HASH_PII: u32 = 0x0400_0000;
+/// Event category defined by WIL
+pub const MICROSOFT_EVENTTAG_MARK_PII: u32 = 0x0800_0000;

win_etw_provider/Cargo.toml

@@ -13,7 +13,7 @@ readme = "../README.md"
 [dependencies]
 widestring = "^1.0"
 zerocopy = "^0.6"
-win_etw_metadata = { version = "^0.1.1", path = "../win_etw_metadata" }
+win_etw_metadata = { version = "^0.1.2", path = "../win_etw_metadata" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "^0.3", features = ["evntprov", "winerror", "evntrace"] }

win_etw_tracing/Cargo.toml

@@ -15,7 +15,7 @@ bytes = "1"
 tracing = "0.1"
 tracing-log = { version = "0.1", optional = true, default-features = false, features = ["log-tracer", "std"] }
 tracing-subscriber = "0.3.7"
-win_etw_metadata = { path = "../win_etw_metadata", version = "0.1.1" }
+win_etw_metadata = { path = "../win_etw_metadata", version = "0.1.2" }
 win_etw_provider = { path = "../win_etw_provider", version = "0.1.7" }
 
 [dev-dependencies]

win_etw_tracing/src/lib.rs

@@ -63,8 +63,9 @@ impl TracelogSubscriber {
             if enabled {
                 !0_u64
             } else {
-                // MICROSOFT_KEYWORD_CRITICAL_DATA | MICROSOFT_KEYWORD_MEASURES | MICROSOFT_KEYWORD_TELEMETRY
-                !0x0000e00000000000
+                !(win_etw_metadata::MICROSOFT_KEYWORD_CRITICAL_DATA
+                    | win_etw_metadata::MICROSOFT_KEYWORD_MEASURES
+                    | win_etw_metadata::MICROSOFT_KEYWORD_TELEMETRY)
             },
             Ordering::Relaxed,
         );