Skip to content

Commit 33f2761

Browse files
authored
fix: report connector package version instead of kafka connect version (#266)
* fix: report connector package version instead of kafka connect version * fix: lint
1 parent a14a933 commit 33f2761

File tree

8 files changed

+72
-12
lines changed

8 files changed

+72
-12
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright 2023 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.pubsub.kafka.common;
17+
18+
public class Version {
19+
private static String version = "unknown";
20+
21+
static {
22+
String implementationVersion = Version.class.getPackage().getImplementationVersion();
23+
if (implementationVersion != null) {
24+
version = implementationVersion;
25+
}
26+
}
27+
28+
public static String version() {
29+
return version;
30+
}
31+
}

src/main/java/com/google/pubsub/kafka/sink/CloudPubSubSinkConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.google.pubsub.kafka.sink;
1717

1818
import com.google.pubsub.kafka.common.ConnectorUtils;
19+
import com.google.pubsub.kafka.common.Version;
1920
import java.util.ArrayList;
2021
import java.util.Arrays;
2122
import java.util.HashMap;
@@ -25,7 +26,6 @@
2526
import org.apache.kafka.common.config.ConfigDef.Importance;
2627
import org.apache.kafka.common.config.ConfigDef.Type;
2728
import org.apache.kafka.common.config.ConfigException;
28-
import org.apache.kafka.common.utils.AppInfoParser;
2929
import org.apache.kafka.connect.connector.Task;
3030
import org.apache.kafka.connect.sink.SinkConnector;
3131
import org.slf4j.Logger;
@@ -117,7 +117,7 @@ public void ensureValid(String name, Object o) {
117117

118118
@Override
119119
public String version() {
120-
return AppInfoParser.getVersion();
120+
return Version.version();
121121
}
122122

123123
@Override

src/main/java/com/google/pubsub/kafka/source/CloudPubSubSourceConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.common.annotations.VisibleForTesting;
2222
import com.google.pubsub.kafka.common.ConnectorCredentialsProvider;
2323
import com.google.pubsub.kafka.common.ConnectorUtils;
24+
import com.google.pubsub.kafka.common.Version;
2425
import com.google.pubsub.v1.GetSubscriptionRequest;
2526
import java.util.ArrayList;
2627
import java.util.Arrays;
@@ -31,7 +32,6 @@
3132
import org.apache.kafka.common.config.ConfigDef.Importance;
3233
import org.apache.kafka.common.config.ConfigDef.Type;
3334
import org.apache.kafka.common.config.ConfigException;
34-
import org.apache.kafka.common.utils.AppInfoParser;
3535
import org.apache.kafka.connect.connector.Task;
3636
import org.apache.kafka.connect.errors.ConnectException;
3737
import org.apache.kafka.connect.source.SourceConnector;
@@ -130,7 +130,7 @@ public void ensureValid(String name, Object o) {
130130

131131
@Override
132132
public String version() {
133-
return AppInfoParser.getVersion();
133+
return Version.version();
134134
}
135135

136136
@Override
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Copyright 2023 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.google.pubsublite.kafka.common;
17+
18+
public class Version {
19+
private static String version = "unknown";
20+
21+
static {
22+
String implementationVersion = Version.class.getPackage().getImplementationVersion();
23+
if (implementationVersion != null) {
24+
version = implementationVersion;
25+
}
26+
}
27+
28+
public static String version() {
29+
return version;
30+
}
31+
}

src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package com.google.pubsublite.kafka.sink;
1717

18+
import com.google.pubsublite.kafka.common.Version;
1819
import java.util.Collections;
1920
import java.util.List;
2021
import java.util.Map;
2122
import org.apache.kafka.common.config.ConfigDef;
22-
import org.apache.kafka.common.utils.AppInfoParser;
2323
import org.apache.kafka.connect.connector.Task;
2424
import org.apache.kafka.connect.sink.SinkConnector;
2525

@@ -28,7 +28,7 @@ public class PubSubLiteSinkConnector extends SinkConnector {
2828

2929
@Override
3030
public String version() {
31-
return AppInfoParser.getVersion();
31+
return Version.version();
3232
}
3333

3434
@Override

src/main/java/com/google/pubsublite/kafka/sink/PubSubLiteSinkTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import javax.annotation.Nullable;
3333
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
3434
import org.apache.kafka.common.TopicPartition;
35-
import org.apache.kafka.common.utils.AppInfoParser;
3635
import org.apache.kafka.connect.header.ConnectHeaders;
3736
import org.apache.kafka.connect.header.Header;
3837
import org.apache.kafka.connect.sink.SinkRecord;
@@ -54,7 +53,7 @@ public PubSubLiteSinkTask() {
5453

5554
@Override
5655
public String version() {
57-
return AppInfoParser.getVersion();
56+
return new PubSubLiteSinkConnector().version();
5857
}
5958

6059
@Override

src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceConnector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package com.google.pubsublite.kafka.source;
1717

18+
import com.google.pubsublite.kafka.common.Version;
1819
import java.util.Collections;
1920
import java.util.List;
2021
import java.util.Map;
2122
import org.apache.kafka.common.config.ConfigDef;
22-
import org.apache.kafka.common.utils.AppInfoParser;
2323
import org.apache.kafka.connect.connector.Task;
2424
import org.apache.kafka.connect.source.SourceConnector;
2525

@@ -29,7 +29,7 @@ public class PubSubLiteSourceConnector extends SourceConnector {
2929

3030
@Override
3131
public String version() {
32-
return AppInfoParser.getVersion();
32+
return Version.version();
3333
}
3434

3535
@Override

src/main/java/com/google/pubsublite/kafka/source/PubSubLiteSourceTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.List;
2020
import java.util.Map;
2121
import javax.annotation.Nullable;
22-
import org.apache.kafka.common.utils.AppInfoParser;
2322
import org.apache.kafka.connect.source.SourceRecord;
2423
import org.apache.kafka.connect.source.SourceTask;
2524

@@ -39,7 +38,7 @@ public PubSubLiteSourceTask() {
3938

4039
@Override
4140
public String version() {
42-
return AppInfoParser.getVersion();
41+
return new PubSubLiteSourceConnector().version();
4342
}
4443

4544
@Override

0 commit comments

Comments
 (0)