Skip to content

Commit 74b4581

Browse files
Cesar Alvernazgsmet
authored andcommitted
migrate to ConfigMapping configs
1 parent 456df79 commit 74b4581

File tree

49 files changed

+869
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+869
-335
lines changed

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Quarkus logging extension outputting the logging in json.
1414

1515
# Configuration
1616
The extension is enabled by default for console, when added to the project.
17-
Console logging can be disabled using configuration: `quarkus.log.json.console.enable=false`
17+
Console logging can be disabled using configuration: `quarkus.log.json.console.enabled=false`
1818

1919
To see additional configuration options take a look at [Config](https://quarkiverse.github.io/quarkiverse-docs/quarkus-logging-json/dev/index.html)
2020

@@ -63,6 +63,16 @@ public class MyJsonProvider implements JsonProvider {
6363
}
6464
```
6565

66+
## Property Relocation
67+
68+
This project includes a configuration property relocation mechanism using SmallRye Config's `RelocateConfigSourceInterceptor`.
69+
It supports backward compatibility by allowing both old and new property names:
70+
71+
- Old: `quarkus.log.console.json.enable` → New: `quarkus.log.console.json.enabled`
72+
- Old: `quarkus.log.file.json.enable` → New: `quarkus.log.file.json.enabled`
73+
74+
When using the old property names, a log message will be generated advising to update to the new property names.
75+
6676
## Contributors ✨
6777

6878
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -81,3 +91,5 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
8191
<!-- ALL-CONTRIBUTORS-LIST:END -->
8292

8393
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
94+
95+
`
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
quarkus.log.level=INFO
22
quarkus.log.console.enable=true
33
quarkus.log.console.level=WARNING
4-
quarkus.log.json.console.enable=true
4+
quarkus.log.json.console.enabled=true
55
quarkus.log.json.log-format=ecs
66
quarkus.log.json.fields.arguments.include-non-structured-arguments=true
77
quarkus.log.json.additional-field."service.name".value=deployment-test
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
quarkus.log.level=INFO
22
quarkus.log.console.enable=true
33
quarkus.log.console.level=WARNING
4-
quarkus.log.json.console.enable=true
4+
quarkus.log.json.console.enabled=true
55
quarkus.log.json.fields.arguments.include-non-structured-arguments=true
66
quarkus.log.json.additional-field.serviceName.value=deployment-test
7-
quarkus.log.json.file.enable=true
7+
quarkus.log.json.file.enabled=true

docs/modules/ROOT/pages/includes/quarkus-log-json.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ h|[[quarkus-log-json_configuration]]link:#quarkus-log-json_configuration[Configu
1010
h|Type
1111
h|Default
1212

13-
a| [[quarkus-log-json_quarkus.log.json.console.enable]]`link:#quarkus-log-json_quarkus.log.json.console.enable[quarkus.log.json.console.enable]`
13+
a| [[quarkus-log-json_quarkus.log.json.console.enabled]]`link:#quarkus-log-json_quarkus.log.json.console.enabled[quarkus.log.json.console.enabled]`
1414

1515
[.description]
1616
--
1717
Determine whether to enable the JSON console formatting extension, which disables "normal" console formatting.
1818

1919
ifdef::add-copy-button-to-env-var[]
20-
Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_CONSOLE_ENABLE+++[]
20+
Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_CONSOLE_ENABLED+++[]
2121
endif::add-copy-button-to-env-var[]
2222
ifndef::add-copy-button-to-env-var[]
23-
Environment variable: `+++QUARKUS_LOG_JSON_CONSOLE_ENABLE+++`
23+
Environment variable: `+++QUARKUS_LOG_JSON_CONSOLE_ENABLED+++`
2424
endif::add-copy-button-to-env-var[]
2525
--|boolean
2626
|`true`
2727

2828

29-
a| [[quarkus-log-json_quarkus.log.json.file.enable]]`link:#quarkus-log-json_quarkus.log.json.file.enable[quarkus.log.json.file.enable]`
29+
a| [[quarkus-log-json_quarkus.log.json.file.enabled]]`link:#quarkus-log-json_quarkus.log.json.file.enabled[quarkus.log.json.file.enabled]`
3030

3131
[.description]
3232
--
3333
Determine whether to enable the JSON file formatting extension, which disables "normal" file formatting.
3434

3535
ifdef::add-copy-button-to-env-var[]
36-
Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FILE_ENABLE+++[]
36+
Environment variable: env_var_with_copy_button:+++QUARKUS_LOG_JSON_FILE_ENABLED+++[]
3737
endif::add-copy-button-to-env-var[]
3838
ifndef::add-copy-button-to-env-var[]
3939
Environment variable: `+++QUARKUS_LOG_JSON_FILE_ENABLE+++`

runtime/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<version>${quarkus.version}</version>
7474
</path>
7575
</annotationProcessorPaths>
76-
<compilerArgs>
77-
<arg>-AlegacyConfigRoot=true</arg>
78-
</compilerArgs>
7976
</configuration>
8077
</plugin>
8178
</plugins>

runtime/src/main/java/io/quarkiverse/loggingjson/JsonFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class JsonFormatter extends ExtFormatter {
1515
public JsonFormatter(List<JsonProvider> providers, JsonFactory jsonFactory, Config config) {
1616
this.providers = providers;
1717
this.jsonFactory = jsonFactory;
18-
this.recordDelimiter = config.recordDelimiter;
18+
this.recordDelimiter = config.recordDelimiter();
1919
}
2020

2121
@Override

runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public class LoggingJsonRecorder {
2323

2424
public RuntimeValue<Optional<Formatter>> initializeConsoleJsonLogging(Config config,
2525
JsonFactory jsonFactory) {
26-
return initializeJsonLogging(config.console, config, jsonFactory);
26+
return initializeJsonLogging(config.console(), config, jsonFactory);
2727
}
2828

2929
public RuntimeValue<Optional<Formatter>> initializeFileJsonLogging(Config config,
3030
JsonFactory jsonFactory) {
31-
return initializeJsonLogging(config.file, config, jsonFactory);
31+
return initializeJsonLogging(config.file(), config, jsonFactory);
3232
}
3333

3434
public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter formatter, Config config,
@@ -39,7 +39,7 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
3939

4040
List<JsonProvider> providers;
4141

42-
if (config.logFormat == Config.LogFormat.ECS) {
42+
if (config.logFormat() == Config.LogFormat.ECS) {
4343
providers = ecsFormat(config);
4444
} else {
4545
providers = defaultFormat(config);
@@ -68,42 +68,42 @@ public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter f
6868

6969
private List<JsonProvider> defaultFormat(Config config) {
7070
List<JsonProvider> providers = new ArrayList<>();
71-
providers.add(new TimestampJsonProvider(config.fields.timestamp));
72-
providers.add(new SequenceJsonProvider(config.fields.sequence));
73-
providers.add(new LoggerClassNameJsonProvider(config.fields.loggerClassName));
74-
providers.add(new LoggerNameJsonProvider(config.fields.loggerName));
75-
providers.add(new LogLevelJsonProvider(config.fields.level));
76-
providers.add(new MessageJsonProvider(config.fields.message));
77-
providers.add(new ThreadNameJsonProvider(config.fields.threadName));
78-
providers.add(new ThreadIdJsonProvider(config.fields.threadId));
79-
providers.add(new MDCJsonProvider(config.fields.mdc));
80-
providers.add(new NDCJsonProvider(config.fields.ndc));
81-
providers.add(new HostNameJsonProvider(config.fields.hostname));
82-
providers.add(new ProcessNameJsonProvider(config.fields.processName));
83-
providers.add(new ProcessIdJsonProvider(config.fields.processId));
84-
providers.add(new StackTraceJsonProvider(config.fields.stackTrace));
85-
providers.add(new ErrorTypeJsonProvider(config.fields.errorType));
86-
providers.add(new ErrorMessageJsonProvider(config.fields.errorMessage));
87-
providers.add(new ArgumentsJsonProvider(config.fields.arguments));
88-
providers.add(new AdditionalFieldsJsonProvider(config.additionalField));
71+
providers.add(new TimestampJsonProvider(config.fields().timestamp()));
72+
providers.add(new SequenceJsonProvider(config.fields().sequence()));
73+
providers.add(new LoggerClassNameJsonProvider(config.fields().loggerClassName()));
74+
providers.add(new LoggerNameJsonProvider(config.fields().loggerName()));
75+
providers.add(new LogLevelJsonProvider(config.fields().level()));
76+
providers.add(new MessageJsonProvider(config.fields().message()));
77+
providers.add(new ThreadNameJsonProvider(config.fields().threadName()));
78+
providers.add(new ThreadIdJsonProvider(config.fields().threadId()));
79+
providers.add(new MDCJsonProvider(config.fields().mdc()));
80+
providers.add(new NDCJsonProvider(config.fields().ndc()));
81+
providers.add(new HostNameJsonProvider(config.fields().hostname()));
82+
providers.add(new ProcessNameJsonProvider(config.fields().processName()));
83+
providers.add(new ProcessIdJsonProvider(config.fields().processId()));
84+
providers.add(new StackTraceJsonProvider(config.fields().stackTrace()));
85+
providers.add(new ErrorTypeJsonProvider(config.fields().errorType()));
86+
providers.add(new ErrorMessageJsonProvider(config.fields().errorMessage()));
87+
providers.add(new ArgumentsJsonProvider(config.fields().arguments()));
88+
providers.add(new AdditionalFieldsJsonProvider(config.additionalField()));
8989
return providers;
9090
}
9191

9292
private List<JsonProvider> ecsFormat(Config config) {
9393
List<JsonProvider> providers = new ArrayList<>();
94-
providers.add(new TimestampJsonProvider(config.fields.timestamp, "@timestamp"));
95-
providers.add(new LoggerNameJsonProvider(config.fields.loggerName, "log.logger"));
96-
providers.add(new LogLevelJsonProvider(config.fields.level, "log.level"));
97-
providers.add(new ThreadNameJsonProvider(config.fields.threadName, "process.thread.name"));
98-
providers.add(new ThreadIdJsonProvider(config.fields.threadId, "process.thread.id"));
99-
providers.add(new MDCJsonProvider(config.fields.mdc));
100-
providers.add(new HostNameJsonProvider(config.fields.hostname, "host.name"));
101-
providers.add(new StackTraceJsonProvider(config.fields.stackTrace, "error.stack_trace"));
102-
providers.add(new ErrorTypeJsonProvider(config.fields.errorType, "error.type"));
103-
providers.add(new ErrorMessageJsonProvider(config.fields.errorMessage, "error.message"));
104-
providers.add(new ArgumentsJsonProvider(config.fields.arguments));
105-
providers.add(new AdditionalFieldsJsonProvider(config.additionalField));
106-
providers.add(new MessageJsonProvider(config.fields.message));
94+
providers.add(new TimestampJsonProvider(config.fields().timestamp(), "@timestamp"));
95+
providers.add(new LoggerNameJsonProvider(config.fields().loggerName(), "log.logger"));
96+
providers.add(new LogLevelJsonProvider(config.fields().level(), "log.level"));
97+
providers.add(new ThreadNameJsonProvider(config.fields().threadName(), "process.thread.name"));
98+
providers.add(new ThreadIdJsonProvider(config.fields().threadId(), "process.thread.id"));
99+
providers.add(new MDCJsonProvider(config.fields().mdc()));
100+
providers.add(new HostNameJsonProvider(config.fields().hostname(), "host.name"));
101+
providers.add(new StackTraceJsonProvider(config.fields().stackTrace(), "error.stack_trace"));
102+
providers.add(new ErrorTypeJsonProvider(config.fields().errorType(), "error.type"));
103+
providers.add(new ErrorMessageJsonProvider(config.fields().errorMessage(), "error.message"));
104+
providers.add(new ArgumentsJsonProvider(config.fields().arguments()));
105+
providers.add(new AdditionalFieldsJsonProvider(config.additionalField()));
106+
providers.add(new MessageJsonProvider(config.fields().message()));
107107
providers.add(new StaticKeyValueProvider("ecs.version", "1.12.1"));
108108
return providers;
109109
}

0 commit comments

Comments
 (0)