Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions avro-serializer/src/test/resources/log4j.properties

This file was deleted.

13 changes: 13 additions & 0 deletions avro-serializer/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<Configuration name="Log4j2">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="[%d] %v1Level %m (%c:%L)%n" />
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="stdout" />
</Root>
</Loggers>
</Configuration>
53 changes: 0 additions & 53 deletions benchmark/src/main/resources/log4j.properties

This file was deleted.

65 changes: 65 additions & 0 deletions benchmark/src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0"?>
<!--
Copyright 2025 Confluent Inc.

Licensed under the Confluent Community License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at

http://www.confluent.io/confluent-community-license

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
-->

<Configuration name="Log4j2">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="[%d] %v1Level %m (%c:%L)%n" />
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="stdout" />
</Root>

<!-- Disable INFO logs from Config classes, which log out their config on each creation -->
<Logger name="org.apache.kafka.streams.StreamsConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializerConfig"
level="WARN" />
<Logger name="org.apache.kafka.clients.consumer.ConsumerConfig" level="WARN" />
<Logger name="org.apache.kafka.clients.admin.AdminClientConfig" level="WARN" />
<Logger name="io.confluent.connect.protobuf.ProtobufDataConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.KafkaJsonDeserializerConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializerConfig"
level="WARN" />
<Logger name="kafka.server.KafkaConfig" level="WARN" />
<Logger name="org.apache.kafka.connect.json.JsonConverterConfig" level="WARN" />
<Logger name="io.confluent.connect.protobuf.ProtobufConverterConfig" level="WARN" />
<Logger name="io.confluent.connect.json.JsonSchemaConverterConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.KafkaAvroSerializerConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializerConfig"
level="WARN" />
<Logger name="org.apache.kafka.clients.producer.ProducerConfig" level="WARN" />
<Logger name="io.confluent.connect.avro.AvroConverterConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.KafkaAvroDeserializerConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializerConfig"
level="WARN" />
<Logger name="io.confluent.connect.json.JsonSchemaDataConfig" level="WARN" />
<Logger name="io.confluent.connect.avro.AvroDataConfig" level="WARN" />
<Logger name="io.confluent.kafka.serializers.KafkaJsonSerializerConfig" level="WARN" />

<!-- Disable logging of state transitions in KS -->
<Logger name="org.apache.kafka.streams.KafkaStreams" level="WARN" />
<Logger name="org.apache.kafka.streams.processor.internals.StreamThread" level="WARN" />
<Logger name="org.apache.kafka.streams.state.internals.RocksDBTimestampedStore" level="WARN" />

<!-- Disable logging of App info -->
<Logger name="org.apache.kafka.common.utils.AppInfoParser" level="WARN" />

<!-- Disable logging from reflections warning for connect classpath scans -->
<Logger name="org.reflections" level="ERROR" />
</Loggers>
</Configuration>
16 changes: 8 additions & 8 deletions bin/schema-registry-run-class
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,21 @@ if [ ! -d "$LOG_DIR" ]; then
fi

# logj4 settings
if [ "x$SCHEMA_REGISTRY_LOG4J_OPTS" = "x" ]; then
if [ -z "$SCHEMA_REGISTRY_LOG4J_OPTS" ]; then
# Test for files from dev -> packages so this will work as expected in dev if you have packages
# installed
if [ -e "$base_dir/config/log4j.properties" ]; then # Dev environment
LOG4J_DIR="$base_dir/config/log4j.properties"
elif [ -e "$base_dir/etc/schema-registry/log4j.properties" ]; then # Simple zip file layout
LOG4J_DIR="$base_dir/etc/schema-registry/log4j.properties"
elif [ -e "/etc/schema-registry/log4j.properties" ]; then # Normal install layout
LOG4J_DIR="/etc/schema-registry/log4j.properties"
if [ -e "$base_dir/config/log4j2.xml" ]; then # Dev environment
LOG4J_DIR="$base_dir/config/log4j2.xml"
elif [ -e "$base_dir/etc/schema-registry/log4j2.xml" ]; then # Simple zip file layout
LOG4J_DIR="$base_dir/etc/schema-registry/log4j2.xml"
elif [ -e "/etc/schema-registry/log4j2.xml" ]; then # Normal install layout
LOG4J_DIR="/etc/schema-registry/log4j2.xml"
fi

# If Cygwin is detected, LOG4J_DIR is converted to Windows format.
(( CYGWIN )) && LOG4J_DIR=$(cygpath --path --mixed "${LOG4J_DIR}")

SCHEMA_REGISTRY_LOG4J_OPTS="-Dlog4j.configuration=file:${LOG4J_DIR}"
SCHEMA_REGISTRY_LOG4J_OPTS="-Dlog4j2.configurationFile=${LOG4J_DIR}"
fi

# If Cygwin is detected, LOG_DIR is converted to Windows format.
Expand Down
6 changes: 3 additions & 3 deletions bin/windows/schema-registry-run-class.bat
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ for %%i in (confluent-common, rest-utils, schema-registry) do (

rem Log4j settings
IF ["%SCHEMA_REGISTRY_LOG4J_OPTS%"] EQU [""] (
if exist %~dp0../../etc/schema-registry/log4j.properties (
set SCHEMA_REGISTRY_LOG4J_OPTS=-Dlog4j.configuration=file:%~dp0../../etc/schema-registry/log4j.properties
if exist %~dp0../../etc/schema-registry/log4j2.xml (
set SCHEMA_REGISTRY_LOG4J_OPTS=-Dlog4j2.configurationFile=%~dp0../../etc/schema-registry/log4j2.xml
) else (
set SCHEMA_REGISTRY_LOG4J_OPTS=-Dlog4j.configuration=file:%BASE_DIR%/config/log4j.properties
set SCHEMA_REGISTRY_LOG4J_OPTS=-Dlog4j2.configurationFile=%BASE_DIR%/config/log4j2.xml
)
)

Expand Down
17 changes: 0 additions & 17 deletions config/log4j.properties

This file was deleted.

31 changes: 31 additions & 0 deletions config/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0"?>
<Configuration name="Log4j2">
<Appenders>
<RollingFile name="file" fileName="/schema-registry.log"
filePattern="/schema-registry.log.%i">
<PatternLayout pattern="[%d] %v1Level %m (%c)%n" />
<Policies>
<SizeBasedTriggeringPolicy size="10485760" />
</Policies>
<DefaultRolloverStrategy max="1" fileIndex="min" />
</RollingFile>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="[%d] %v1Level %m (%c:%L)%n" />
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="file" />
<AppenderRef ref="stdout" />
</Root>
<Logger name="org.apache.zookeeper" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="org.apache.kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
</Loggers>
</Configuration>
11 changes: 0 additions & 11 deletions core/src/main/resources/log4j.properties

This file was deleted.

25 changes: 25 additions & 0 deletions core/src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<Configuration name="Log4j2">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="[%d] %v1Level %m (%c:%L)%n" />
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="stdout" />
</Root>
<Logger name="org.apache.kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="org.apache.zookeeper" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="org.apache.directory" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
</Loggers>
</Configuration>
28 changes: 0 additions & 28 deletions core/src/test/resources/log4j.properties

This file was deleted.

43 changes: 43 additions & 0 deletions core/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0"?>
<!--
Copyright 2025 Confluent Inc.

Licensed under the Confluent Community License (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
License at

http://www.confluent.io/confluent-community-license

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
-->

<Configuration name="Log4j2">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="[%d] %v1Level %m (%c:%L)%n" />
</Console>
</Appenders>
<Loggers>
<Root level="INFO">
<AppenderRef ref="stdout" />
</Root>
<Logger name="org.apache.kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="org.apache.zookeeper" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="io.confluent" level="DEBUG">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="org.apache.directory" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
<Logger name="kafka" level="ERROR">
<AppenderRef ref="stdout" />
</Logger>
</Loggers>
</Configuration>
20 changes: 0 additions & 20 deletions protobuf-converter/src/test/resources/log4j.properties

This file was deleted.

Loading