From 58c115bc5fbc5fb8c423231561ef317809a3a410 Mon Sep 17 00:00:00 2001 From: Ethan Hur Date: Fri, 26 May 2023 19:38:19 +0900 Subject: [PATCH 1/2] fix: report connector package version instead of kafka connect version --- .../google/pubsub/kafka/common/Version.java | 31 +++++++++++++++++++ .../kafka/sink/CloudPubSubSinkConnector.java | 5 +-- .../source/CloudPubSubSourceConnector.java | 4 +-- .../pubsublite/kafka/common/Version.java | 31 +++++++++++++++++++ .../kafka/sink/PubSubLiteSinkConnector.java | 5 +-- .../kafka/sink/PubSubLiteSinkTask.java | 3 +- .../source/PubSubLiteSourceConnector.java | 5 +-- .../kafka/source/PubSubLiteSourceTask.java | 3 +- 8 files changed, 75 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/google/pubsub/kafka/common/Version.java create mode 100644 src/main/java/com/google/pubsublite/kafka/common/Version.java diff --git a/src/main/java/com/google/pubsub/kafka/common/Version.java b/src/main/java/com/google/pubsub/kafka/common/Version.java new file mode 100644 index 00000000..a0f663b4 --- /dev/null +++ b/src/main/java/com/google/pubsub/kafka/common/Version.java @@ -0,0 +1,31 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed 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. + */ +package com.google.pubsub.kafka.common; + +public class Version { + private static String version = "unknown"; + + static { + String implementationVersion = Version.class.getPackage().getImplementationVersion(); + if (implementationVersion != null) { + version = implementationVersion; + } + } + + public static String version() { + return version; + } +} diff --git a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java index e7c56118..c735b6f1 100644 --- a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java +++ b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java @@ -21,11 +21,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + +import com.google.pubsub.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; import org.slf4j.Logger; @@ -117,7 +118,7 @@ public void ensureValid(String name, Object o) { @Override public String version() { - return AppInfoParser.getVersion(); + return Version.version(); } @Override diff --git a/src/main/java/com/google/pubsub/kafka/source/CloudPubSubSourceConnector.java b/src/main/java/com/google/pubsub/kafka/source/CloudPubSubSourceConnector.java index 3f507d2f..e77831f7 100644 --- a/src/main/java/com/google/pubsub/kafka/source/CloudPubSubSourceConnector.java +++ b/src/main/java/com/google/pubsub/kafka/source/CloudPubSubSourceConnector.java @@ -21,6 +21,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.pubsub.kafka.common.ConnectorCredentialsProvider; import com.google.pubsub.kafka.common.ConnectorUtils; +import com.google.pubsub.kafka.common.Version; import com.google.pubsub.v1.GetSubscriptionRequest; import java.util.ArrayList; import java.util.Arrays; @@ -31,7 +32,6 @@ import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.errors.ConnectException; import org.apache.kafka.connect.source.SourceConnector; @@ -130,7 +130,7 @@ public void ensureValid(String name, Object o) { @Override public String version() { - return AppInfoParser.getVersion(); + return Version.version(); } @Override diff --git a/src/main/java/com/google/pubsublite/kafka/common/Version.java b/src/main/java/com/google/pubsublite/kafka/common/Version.java new file mode 100644 index 00000000..cca5c8b5 --- /dev/null +++ b/src/main/java/com/google/pubsublite/kafka/common/Version.java @@ -0,0 +1,31 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed 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. + */ +package com.google.pubsublite.kafka.common; + +public class Version { + private static String version = "unknown"; + + static { + String implementationVersion = Version.class.getPackage().getImplementationVersion(); + if (implementationVersion != null) { + version = implementationVersion; + } + } + + public static String version() { + return version; + } +} diff --git a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java index 67bc2906..e919c6f9 100644 --- a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java +++ b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java @@ -18,8 +18,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; + +import com.google.pubsublite.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; @@ -28,7 +29,7 @@ public class PubSubLiteSinkConnector extends SinkConnector { @Override public String version() { - return AppInfoParser.getVersion(); + return Version.version(); } @Override diff --git a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkTask.java b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkTask.java index 9dd5ab95..4b35ce8b 100644 --- a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkTask.java +++ b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkTask.java @@ -32,7 +32,6 @@ import javax.annotation.Nullable; import org.apache.kafka.clients.consumer.OffsetAndMetadata; import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.header.ConnectHeaders; import org.apache.kafka.connect.header.Header; import org.apache.kafka.connect.sink.SinkRecord; @@ -54,7 +53,7 @@ public PubSubLiteSinkTask() { @Override public String version() { - return AppInfoParser.getVersion(); + return new PubSubLiteSinkConnector().version(); } @Override diff --git a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java index 38414993..f1deba4a 100644 --- a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java +++ b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java @@ -18,8 +18,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; + +import com.google.pubsublite.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector; @@ -29,7 +30,7 @@ public class PubSubLiteSourceConnector extends SourceConnector { @Override public String version() { - return AppInfoParser.getVersion(); + return Version.version(); } @Override diff --git a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceTask.java b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceTask.java index 2ffd01cd..2e16cdc8 100644 --- a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceTask.java +++ b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceTask.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.source.SourceRecord; import org.apache.kafka.connect.source.SourceTask; @@ -39,7 +38,7 @@ public PubSubLiteSourceTask() { @Override public String version() { - return AppInfoParser.getVersion(); + return new PubSubLiteSourceConnector().version(); } @Override From e055a89197e9330f654534e2370eb6b4188badd3 Mon Sep 17 00:00:00 2001 From: Lambert Date: Thu, 1 Jun 2023 11:48:24 +0900 Subject: [PATCH 2/2] fix: lint --- .../google/pubsub/kafka/common/Version.java | 18 +++++++++--------- .../kafka/sink/CloudPubSubSinkConnector.java | 3 +-- .../pubsublite/kafka/common/Version.java | 18 +++++++++--------- .../kafka/sink/PubSubLiteSinkConnector.java | 3 +-- .../source/PubSubLiteSourceConnector.java | 3 +-- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/google/pubsub/kafka/common/Version.java b/src/main/java/com/google/pubsub/kafka/common/Version.java index a0f663b4..f28bf037 100644 --- a/src/main/java/com/google/pubsub/kafka/common/Version.java +++ b/src/main/java/com/google/pubsub/kafka/common/Version.java @@ -16,16 +16,16 @@ package com.google.pubsub.kafka.common; public class Version { - private static String version = "unknown"; + private static String version = "unknown"; - static { - String implementationVersion = Version.class.getPackage().getImplementationVersion(); - if (implementationVersion != null) { - version = implementationVersion; - } + static { + String implementationVersion = Version.class.getPackage().getImplementationVersion(); + if (implementationVersion != null) { + version = implementationVersion; } + } - public static String version() { - return version; - } + public static String version() { + return version; + } } diff --git a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java index c735b6f1..d9736fe1 100644 --- a/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java +++ b/src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java @@ -16,13 +16,12 @@ package com.google.pubsub.kafka.sink; import com.google.pubsub.kafka.common.ConnectorUtils; +import com.google.pubsub.kafka.common.Version; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; - -import com.google.pubsub.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigDef.Importance; import org.apache.kafka.common.config.ConfigDef.Type; diff --git a/src/main/java/com/google/pubsublite/kafka/common/Version.java b/src/main/java/com/google/pubsublite/kafka/common/Version.java index cca5c8b5..47a053fd 100644 --- a/src/main/java/com/google/pubsublite/kafka/common/Version.java +++ b/src/main/java/com/google/pubsublite/kafka/common/Version.java @@ -16,16 +16,16 @@ package com.google.pubsublite.kafka.common; public class Version { - private static String version = "unknown"; + private static String version = "unknown"; - static { - String implementationVersion = Version.class.getPackage().getImplementationVersion(); - if (implementationVersion != null) { - version = implementationVersion; - } + static { + String implementationVersion = Version.class.getPackage().getImplementationVersion(); + if (implementationVersion != null) { + version = implementationVersion; } + } - public static String version() { - return version; - } + public static String version() { + return version; + } } diff --git a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java index e919c6f9..5d8741c8 100644 --- a/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java +++ b/src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java @@ -15,11 +15,10 @@ */ package com.google.pubsublite.kafka.sink; +import com.google.pubsublite.kafka.common.Version; import java.util.Collections; import java.util.List; import java.util.Map; - -import com.google.pubsublite.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.sink.SinkConnector; diff --git a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java index f1deba4a..2ec0d939 100644 --- a/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java +++ b/src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java @@ -15,11 +15,10 @@ */ package com.google.pubsublite.kafka.source; +import com.google.pubsublite.kafka.common.Version; import java.util.Collections; import java.util.List; import java.util.Map; - -import com.google.pubsublite.kafka.common.Version; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.connect.connector.Task; import org.apache.kafka.connect.source.SourceConnector;