libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

[PERF] OpenTelemetry is initialized even when disabled (#34031)

Browse source 
Change host reference in logging guide

Fixes #33948

Signed-off-by: Martin Bartoš <mabartos@redhat.com>
This commit is contained in:
Martin Bartoš 2024-10-17 14:08:50 +01:00 committed by GitHub
parent 553b891a7f
commit 637ca2e138
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/guides/server/logging.adoc
View file

@ -340,7 +340,7 @@ To use structured JSON log output instead, enter the following command:
.Example Log Message
[source, bash]
----
2024-04-05T12:32:20.616+02:00 mabartos keycloak 2788276 io.quarkus - {"timestamp":"2024-04-05T12:32:20.616208533+02:00","sequence":9948,"loggerClassName":"org.jboss.logging.Logger","loggerName":"io.quarkus","level":"INFO","message":"Profile prod activated. ","threadName":"main","threadId":1,"mdc":{},"ndc":"","hostName":"host","processName":"QuarkusEntryPoint","processId":2788276}
2024-04-05T12:32:20.616+02:00 host keycloak 2788276 io.quarkus - {"timestamp":"2024-04-05T12:32:20.616208533+02:00","sequence":9948,"loggerClassName":"org.jboss.logging.Logger","loggerName":"io.quarkus","level":"INFO","message":"Profile prod activated. ","threadName":"main","threadId":1,"mdc":{},"ndc":"","hostName":"host","processName":"QuarkusEntryPoint","processId":2788276}
----
When using JSON output, colors are disabled and the format settings set by `--log-syslog-format` will not apply.
@ -352,7 +352,7 @@ To use unstructured logging, enter the following command:
.Example Log Message
[source, bash]
----
2024-04-05T12:31:38.473+02:00 mabartos keycloak 2787568 io.quarkus - 2024-04-05 12:31:38,473 INFO [io.quarkus] (main) Profile prod activated.
2024-04-05T12:31:38.473+02:00 host keycloak 2787568 io.quarkus - 2024-04-05 12:31:38,473 INFO [io.quarkus] (main) Profile prod activated.
----
As you can see, the timestamp is present twice, so you can amend it correspondingly via the `--log-syslog-format` property.

2
quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TracingPropertyMappers.java
View file

@ -49,7 +49,7 @@ public class TracingPropertyMappers {
return new PropertyMapper[]{
fromOption(TRACING_ENABLED)
.isEnabled(TracingPropertyMappers::isFeatureEnabled, OTEL_FEATURE_ENABLED_MSG)
.to("quarkus.otel.traces.enabled")
.to("quarkus.otel.enabled") // enable/disable whole OTel, tracing is enabled by default
.build(),
fromOption(TRACING_ENDPOINT)
.isEnabled(TracingPropertyMappers::isTracingEnabled, TRACING_ENABLED_MSG)

8
quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/test/TracingConfigurationTest.java
View file

@ -46,7 +46,7 @@ public class TracingConfigurationTest extends AbstractConfigurationTest {
assertConfig("tracing-service-name", "keycloak");
assertExternalConfig(Map.of(
"quarkus.otel.traces.enabled", "false",
"quarkus.otel.enabled", "false",
"quarkus.otel.service.name", "keycloak",
"quarkus.otel.exporter.otlp.traces.endpoint", "http://localhost:4317",
"quarkus.otel.exporter.otlp.traces.protocol", "grpc",
@ -96,7 +96,7 @@ public class TracingConfigurationTest extends AbstractConfigurationTest {
));
assertExternalConfig(Map.of(
"quarkus.otel.traces.enabled", "true",
"quarkus.otel.enabled", "true",
"quarkus.otel.exporter.otlp.traces.endpoint", "http://something:4444",
"quarkus.otel.exporter.otlp.traces.protocol", "http/protobuf",
"quarkus.datasource.jdbc.telemetry", "false",
@ -194,7 +194,7 @@ public class TracingConfigurationTest extends AbstractConfigurationTest {
));
assertExternalConfig(Map.of(
"quarkus.otel.traces.enabled", "true",
"quarkus.otel.enabled", "true",
"quarkus.log." + loggerType.name() + ".format", expectedFormat
));
@ -210,7 +210,7 @@ public class TracingConfigurationTest extends AbstractConfigurationTest {
));
assertExternalConfig(Map.of(
"quarkus.otel.traces.enabled", "true",
"quarkus.otel.enabled", "true",
"quarkus.log." + loggerType.name() + ".format", "someFormat"
));
}