diff --git a/avro-serializer/src/test/resources/log4j.properties b/avro-serializer/src/test/resources/log4j.properties deleted file mode 100644 index 6347c995933..00000000000 --- a/avro-serializer/src/test/resources/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n diff --git a/avro-serializer/src/test/resources/log4j2.xml b/avro-serializer/src/test/resources/log4j2.xml new file mode 100644 index 00000000000..3c2833c07b3 --- /dev/null +++ b/avro-serializer/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/benchmark/src/main/resources/log4j.properties b/benchmark/src/main/resources/log4j.properties deleted file mode 100644 index f36934c666e..00000000000 --- a/benchmark/src/main/resources/log4j.properties +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright 2020 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. -# - -log4j.rootLogger=INFO,stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n - -# Disable INFO logs from Config classes, which log out their config on each creation: -log4j.logger.io.confluent.connect.avro.AvroConverterConfig=WARN -log4j.logger.io.confluent.connect.avro.AvroDataConfig=WARN -log4j.logger.io.confluent.kafka.serializers.KafkaAvroDeserializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.KafkaAvroSerializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.KafkaJsonDeserializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.KafkaJsonSerializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializerConfig=WARN -log4j.logger.io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializerConfig=WARN -log4j.logger.kafka.server.KafkaConfig=WARN -log4j.logger.org.apache.kafka.clients.admin.AdminClientConfig=WARN -log4j.logger.org.apache.kafka.clients.consumer.ConsumerConfig=WARN -log4j.logger.org.apache.kafka.clients.producer.ProducerConfig=WARN -log4j.logger.org.apache.kafka.connect.json.JsonConverterConfig=WARN -log4j.logger.io.confluent.connect.json.JsonSchemaDataConfig=WARN -log4j.logger.io.confluent.connect.json.JsonSchemaConverterConfig=WARN -log4j.logger.io.confluent.connect.protobuf.ProtobufDataConfig=WARN -log4j.logger.io.confluent.connect.protobuf.ProtobufConverterConfig=WARN -log4j.logger.org.apache.kafka.streams.StreamsConfig=WARN - -# Disable logging of state transitions in KS: -log4j.logger.org.apache.kafka.streams.KafkaStreams=WARN -log4j.logger.org.apache.kafka.streams.processor.internals.StreamThread=WARN -log4j.logger.org.apache.kafka.streams.state.internals.RocksDBTimestampedStore=WARN - -# Disable logging of App info -log4j.logger.org.apache.kafka.common.utils.AppInfoParser=WARN - -# Disable logging from reflections warning for connect classpath scans -log4j.logger.org.reflections=ERROR diff --git a/benchmark/src/main/resources/log4j2.xml b/benchmark/src/main/resources/log4j2.xml new file mode 100644 index 00000000000..6d3251bc9c4 --- /dev/null +++ b/benchmark/src/main/resources/log4j2.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/schema-registry-run-class b/bin/schema-registry-run-class index 52bf6bd07e7..8a33efe3559 100755 --- a/bin/schema-registry-run-class +++ b/bin/schema-registry-run-class @@ -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. diff --git a/bin/windows/schema-registry-run-class.bat b/bin/windows/schema-registry-run-class.bat index 17dcb92884c..b91eff92bc7 100644 --- a/bin/windows/schema-registry-run-class.bat +++ b/bin/windows/schema-registry-run-class.bat @@ -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 ) ) diff --git a/config/log4j.properties b/config/log4j.properties deleted file mode 100644 index ad95627461f..00000000000 --- a/config/log4j.properties +++ /dev/null @@ -1,17 +0,0 @@ -log4j.rootLogger=INFO, stdout, file - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n - -log4j.logger.kafka=ERROR, stdout -log4j.logger.org.apache.zookeeper=ERROR, stdout -log4j.logger.org.apache.kafka=ERROR, stdout -log4j.additivity.kafka.server=false - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.maxBackupIndex=10 -log4j.appender.file.maxFileSize=100MB -log4j.appender.file.File=${schema-registry.log.dir}/schema-registry.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=[%d] %p %m (%c)%n diff --git a/config/log4j2.xml b/config/log4j2.xml new file mode 100644 index 00000000000..20ab10a3e73 --- /dev/null +++ b/config/log4j2.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/main/resources/log4j.properties b/core/src/main/resources/log4j.properties deleted file mode 100644 index beb86fb46f8..00000000000 --- a/core/src/main/resources/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n - -log4j.logger.kafka=ERROR, stdout -log4j.logger.org.apache.zookeeper=ERROR, stdout -log4j.logger.org.apache.kafka=ERROR, stdout -log4j.logger.org.apache.directory=ERROR, stdout -log4j.additivity.kafka.server=false diff --git a/core/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml new file mode 100644 index 00000000000..c38053655f6 --- /dev/null +++ b/core/src/main/resources/log4j2.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties deleted file mode 100644 index 8c1844ecbe9..00000000000 --- a/core/src/test/resources/log4j.properties +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2018 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. -# - -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n - -log4j.logger.io.confluent=DEBUG, stdout -log4j.additivity.io.confluent=false -log4j.logger.kafka=ERROR, stdout -log4j.logger.org.apache.zookeeper=ERROR, stdout -log4j.logger.org.apache.kafka=ERROR, stdout -log4j.logger.org.apache.directory=ERROR, stdout -log4j.additivity.kafka.server=false diff --git a/core/src/test/resources/log4j2.xml b/core/src/test/resources/log4j2.xml new file mode 100644 index 00000000000..a170d4e0ae4 --- /dev/null +++ b/core/src/test/resources/log4j2.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/protobuf-converter/src/test/resources/log4j.properties b/protobuf-converter/src/test/resources/log4j.properties deleted file mode 100644 index aa1e3735dd6..00000000000 --- a/protobuf-converter/src/test/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to you under the Apache License, Version 2.0 -# (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.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -log4j.rootLogger=TRACE, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n diff --git a/protobuf-converter/src/test/resources/log4j2.xml b/protobuf-converter/src/test/resources/log4j2.xml new file mode 100644 index 00000000000..fcdb0e6123a --- /dev/null +++ b/protobuf-converter/src/test/resources/log4j2.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java b/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java index 8bc2ebd3ff4..67968c0f1b6 100644 --- a/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java +++ b/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java @@ -62,7 +62,7 @@ public com.google.protobuf.ByteString getValue() { private int precision_ = 0; /** * 
-   * The precision
+   * The precision (zero indicates unlimited precision)
    *
* * uint32 precision = 2; @@ -474,7 +474,7 @@ public Builder clearValue() { private int precision_ ; /** * 
-     * The precision
+     * The precision (zero indicates unlimited precision)
      *
* * uint32 precision = 2; @@ -486,7 +486,7 @@ public int getPrecision() { } /** * 
-     * The precision
+     * The precision (zero indicates unlimited precision)
      *
* * uint32 precision = 2; @@ -502,7 +502,7 @@ public Builder setPrecision(int value) { } /** * 
-     * The precision
+     * The precision (zero indicates unlimited precision)
      *
* * uint32 precision = 2; diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java index 7d12ce3c3e7..9fee7f0c859 100644 --- a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java +++ b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java @@ -21,7 +21,7 @@ public interface DecimalOrBuilder extends /** * 
-   * The precision
+   * The precision (zero indicates unlimited precision)
    *
* * uint32 precision = 2; diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java index 88273b78365..654b26a9731 100644 --- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java +++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java @@ -995,7 +995,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(16, (io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii) piiOneof_); } if (piiOneofCase_ == 17) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 17, piiOneof_); + com.google.protobuf.GeneratedMessage.writeString(output, 17, piiOneof_); } getUnknownFields().writeTo(output); } @@ -1078,7 +1078,7 @@ public int getSerializedSize() { .computeMessageSize(16, (io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii) piiOneof_); } if (piiOneofCase_ == 17) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, piiOneof_); + size += com.google.protobuf.GeneratedMessage.computeStringSize(17, piiOneof_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -2781,7 +2781,7 @@ public Builder clearVersion() { return this; } - private com.google.protobuf.SingleFieldBuilderV3< + private com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder> oneofMessageBuilder_; /** * .io.confluent.kafka.schemaregistry.rules.widget.Pii oneof_message = 16; @@ -2904,14 +2904,14 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder getOneof /** * .io.confluent.kafka.schemaregistry.rules.widget.Pii oneof_message = 16; */ - private com.google.protobuf.SingleFieldBuilderV3< + private com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder> getOneofMessageFieldBuilder() { if (oneofMessageBuilder_ == null) { if (!(piiOneofCase_ == 16)) { piiOneof_ = io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance(); } - oneofMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + oneofMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder>( (io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii) piiOneof_, getParentForChildren(), @@ -3015,18 +3015,6 @@ public Builder setOneofStringBytes( onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:io.confluent.kafka.schemaregistry.rules.widget.Widget) } diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java index 488a0b54453..d44dc43e158 100644 --- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java +++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java @@ -1137,7 +1137,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) output.writeMessage(16, (io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii) piiOneof_); } if (piiOneofCase_ == 17) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 17, piiOneof_); + com.google.protobuf.GeneratedMessage.writeString(output, 17, piiOneof_); } getUnknownFields().writeTo(output); } @@ -1220,7 +1220,7 @@ public int getSerializedSize() { .computeMessageSize(16, (io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii) piiOneof_); } if (piiOneofCase_ == 17) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, piiOneof_); + size += com.google.protobuf.GeneratedMessage.computeStringSize(17, piiOneof_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -3083,7 +3083,7 @@ public Builder clearVersion() { return this; } - private com.google.protobuf.SingleFieldBuilderV3< + private com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder> oneofMessageBuilder_; /** * .io.confluent.kafka.schemaregistry.rules.widget2.Pii oneof_message = 16; @@ -3206,14 +3206,14 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder getOneo /** * .io.confluent.kafka.schemaregistry.rules.widget2.Pii oneof_message = 16; */ - private com.google.protobuf.SingleFieldBuilderV3< + private com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder> getOneofMessageFieldBuilder() { if (oneofMessageBuilder_ == null) { if (!(piiOneofCase_ == 16)) { piiOneof_ = io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.getDefaultInstance(); } - oneofMessageBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + oneofMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder>( (io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii) piiOneof_, getParentForChildren(), @@ -3318,18 +3318,6 @@ public Builder setOneofStringBytes( onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:io.confluent.kafka.schemaregistry.rules.widget2.Widget2) } diff --git a/schema-rules/src/test/resources/log4j.properties b/schema-rules/src/test/resources/log4j.properties deleted file mode 100644 index 6347c995933..00000000000 --- a/schema-rules/src/test/resources/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -log4j.rootLogger=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c:%L)%n diff --git a/schema-rules/src/test/resources/log4j2.xml b/schema-rules/src/test/resources/log4j2.xml new file mode 100644 index 00000000000..3c2833c07b3 --- /dev/null +++ b/schema-rules/src/test/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file