Commit 432a259
authored
Migrate logging API from SLF4J to Log4j 2.x (#459)
* Migrate logging API from SLF4J to Log4j 2.x
Standardize all modules on the Log4j 2.x API so Flume's own logging no
longer goes through the SLF4J facade. Applied the OpenRewrite
Slf4jToLog4j recipe, then normalized the result: drop loggers that were
never used, make every logger field private static final named "logger",
and use the no-arg LogManager.getLogger() since each one named its own
class.
Assisted-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Formatting
* Ban transitive logging implementations and bridges
Dependencies frequently ship a logging backend or an API bridge as a
compile dependency, which then leaks to our consumers. Add a
maven-enforcer rule that bans every known logging implementation/bridge
and whitelists only the real logging APIs.
To satisfy the rule, drop the now-unneeded log4j-1.2-api (no Flume code
path reaches the Hadoop classes that use the org.apache.log4j API) and
exclude the logging backends that Hadoop (reload4j) and ZooKeeper
(logback) pull in. Exclusions live in dependencyManagement so they apply
wherever the dependency is used, and only where the artifact is actually
pulled; the enforcer rule catches anything reintroduced later.
Assisted-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* Pin SLF4J to 2.x and use the SLF4J 2 binding
The ban-logging rule whitelisted the whole log4j2 group, which let the
SLF4J 1.x binding (log4j-slf4j-impl) through. Switch the test bindings to
log4j-slf4j2-impl and import slf4j-bom so conflict resolution cannot
downgrade transitive SLF4J to 1.x.
Drop the log4j-jul and log4j-jcl bridges the tightened rule then flagged,
and manage commons-logging to a current release so transitive deps stop
pulling the ancient 1.2.
Assisted-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 51063b4 commit 432a259
133 files changed
Lines changed: 814 additions & 862 deletions
File tree
- flume-ng-auth
- src/main/java/org/apache/flume/auth
- flume-ng-channels
- flume-file-channel
- src
- main/java/org/apache/flume/channel/file
- encryption
- test/java/org/apache/flume/channel/file
- encryption
- flume-spillable-memory-channel
- src/main/java/org/apache/flume/channel
- flume-ng-configfilters/flume-ng-external-process-config-filter
- src/main/java/org/apache/flume/configfilter
- flume-ng-configuration
- src/main/java/org/apache/flume/conf
- flume-ng-core
- src
- main/java/org/apache/flume
- channel
- event
- formatter/output
- instrumentation/util
- interceptor
- lifecycle
- serialization
- sink
- source
- tools
- test/java/org/apache/flume
- interceptor
- sink
- source
- tools
- flume-ng-dist
- flume-ng-instrumentation
- flume-ganglia-monitor/src/main/java/org/apache/flume/instrumentation/ganglia
- flume-http-monitor/src/main/java/org/apache/flume/instrumentation/http
- flume-prometheus-monitor/src/main/java/org/apache/flume/instrumentation/prometheus
- flume-ng-node
- src
- main/java/org/apache/flume/node
- test/java/org/apache/flume
- node
- sink
- source
- flume-ng-sdk
- src/main/java/org/apache/flume
- api
- instrumentation
- serialization
- util
- flume-ng-sources
- flume-http-source/src
- main/java/org/apache/flume/source/http
- test/java/org/apache/flume/source/http
- flume-netcat-source/src
- main/java/org/apache/flume/source/netcat
- test/java/org/apache/flume/source/netcat
- flume-syslog-source
- src
- main/java/org/apache/flume/source/syslog
- test/java/org/apache/flume/source/syslog
- flume-taildir-source/src/main/java/org/apache/flume/source/taildir
- flume-parent
- flume-tools
- src/main/java/org/apache/flume/tools
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | 47 | | |
53 | 48 | | |
54 | | - | |
55 | | - | |
| 49 | + | |
56 | 50 | | |
57 | 51 | | |
58 | 52 | | |
59 | 53 | | |
60 | | - | |
| 54 | + | |
61 | 55 | | |
62 | 56 | | |
63 | 57 | | |
| |||
77 | 71 | | |
78 | 72 | | |
79 | 73 | | |
| 74 | + | |
80 | 75 | | |
81 | 76 | | |
82 | 77 | | |
| |||
Lines changed: 9 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | | - | |
| 36 | + | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
149 | | - | |
| 149 | + | |
150 | 150 | | |
151 | 151 | | |
152 | 152 | | |
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
162 | 162 | | |
163 | | - | |
| 163 | + | |
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
167 | | - | |
| 167 | + | |
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
| |||
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
190 | | - | |
| 190 | + | |
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
| |||
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
216 | | - | |
| 216 | + | |
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
| 56 | + | |
| 57 | + | |
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
| 90 | + | |
103 | 91 | | |
104 | 92 | | |
105 | 93 | | |
| |||
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
36 | | - | |
| 35 | + | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
| 123 | + | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
138 | | - | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
| |||
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
158 | | - | |
| 158 | + | |
159 | 159 | | |
160 | 160 | | |
161 | 161 | | |
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
231 | | - | |
| 231 | + | |
232 | 232 | | |
233 | 233 | | |
234 | 234 | | |
| |||
241 | 241 | | |
242 | 242 | | |
243 | 243 | | |
244 | | - | |
| 244 | + | |
245 | 245 | | |
246 | 246 | | |
247 | 247 | | |
| |||
Lines changed: 7 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | | - | |
| 24 | + | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
| 101 | + | |
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
| 116 | + | |
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
| |||
Lines changed: 12 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
| 41 | + | |
| 42 | + | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
190 | | - | |
| 190 | + | |
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
| |||
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
228 | | - | |
| 228 | + | |
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
| |||
250 | 250 | | |
251 | 251 | | |
252 | 252 | | |
253 | | - | |
| 253 | + | |
254 | 254 | | |
255 | 255 | | |
256 | 256 | | |
| |||
286 | 286 | | |
287 | 287 | | |
288 | 288 | | |
289 | | - | |
| 289 | + | |
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
| |||
297 | 297 | | |
298 | 298 | | |
299 | 299 | | |
300 | | - | |
| 300 | + | |
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | | - | |
| 305 | + | |
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
| |||
314 | 314 | | |
315 | 315 | | |
316 | 316 | | |
317 | | - | |
| 317 | + | |
318 | 318 | | |
319 | 319 | | |
320 | 320 | | |
321 | 321 | | |
322 | 322 | | |
323 | 323 | | |
324 | 324 | | |
325 | | - | |
| 325 | + | |
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
| |||
0 commit comments