Skip to content

Commit 073e947

Browse files
ga-ramga-ram
committed
[#5053] Add support to kafka plugin (version 2.8 ~ 3.2)
1 parent ca19baa commit 073e947

35 files changed

+694
-116
lines changed

‎plugins-it/kafka-it/kafka-2-it/pom.xml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<groupId>com.navercorp.pinpoint</groupId>
7+
<artifactId>pinpoint-kafka-plugin-it</artifactId>
8+
<version>2.5.0-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>pinpoint-kafka-2-plugin-it</artifactId>
13+
14+
<packaging>jar</packaging>
15+
16+
<properties>
17+
<jdk.version>1.8</jdk.version>
18+
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>com.navercorp.pinpoint</groupId>
24+
<artifactId>pinpoint-kafka-it-commons</artifactId>
25+
<version>${project.version}</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.apache.kafka</groupId>
30+
<artifactId>kafka_2.12</artifactId>
31+
<version>2.6.0</version>
32+
<scope>test</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>com.navercorp.pinpoint</groupId>
36+
<artifactId>pinpoint-plugin-it-utils</artifactId>
37+
<version>${project.version}</version>
38+
<scope>test</scope>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-surefire-plugin</artifactId>
47+
<configuration>
48+
<skip>true</skip>
49+
</configuration>
50+
</plugin>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-failsafe-plugin</artifactId>
54+
</plugin>
55+
</plugins>
56+
</build>
57+
58+
</project>

‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient2ITBase.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright 2020 NAVER Corp.
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+
17+
package com.navercorp.pinpoint.plugin.kafka;
18+
19+
import org.junit.AfterClass;
20+
import org.junit.BeforeClass;
21+
import test.pinpoint.plugin.kafka.Kafka2UnitServer;
22+
import test.pinpoint.plugin.kafka.KafkaUnitServer;
23+
24+
public abstract class KafkaClient2ITBase extends KafkaClientITBase {
25+
26+
private static final KafkaUnitServer KAFKA_UNIT_SERVER = new Kafka2UnitServer(2189, 9092);
27+
28+
@BeforeClass
29+
public static void beforeClass() {
30+
KAFKA_UNIT_SERVER.startup();
31+
TEST_CONSUMER.start();
32+
}
33+
34+
@AfterClass
35+
public static void afterClass() throws InterruptedException {
36+
TEST_CONSUMER.shutdown();
37+
KAFKA_UNIT_SERVER.shutdown();
38+
}
39+
}

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_0_11_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_0_11_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.*;
2122
import org.junit.Test;
@@ -34,10 +35,10 @@
3435
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
3536
@Dependency({
3637
"org.apache.kafka:kafka_2.12:[0.11.0.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
37-
"org.apache.kafka:kafka-clients:[0.11.0.0,0.11.max]",
38+
"org.apache.kafka:kafka-clients:[0.11.0.0,0.11.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
3839
})
3940
@JvmVersion(8)
40-
public class KafkaClient_0_11_x_IT extends KafkaClientITBase {
41+
public class KafkaClient_0_11_x_IT extends KafkaClient2ITBase {
4142

4243
@Test
4344
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_1_0_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_1_0_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.*;
2122
import org.junit.Test;
@@ -36,10 +37,10 @@
3637
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
3738
@Dependency({
3839
"org.apache.kafka:kafka_2.12:[1.0.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
39-
"org.apache.kafka:kafka-clients:[1.0.0,1.0.max]"
40+
"org.apache.kafka:kafka-clients:[1.0.0,1.0.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
4041
})
4142
@JvmVersion(8)
42-
public class KafkaClient_1_0_x_IT extends KafkaClientITBase {
43+
public class KafkaClient_1_0_x_IT extends KafkaClient2ITBase {
4344

4445
@Test
4546
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_1_1_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_1_1_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.*;
2122
import org.junit.Test;
@@ -36,10 +37,10 @@
3637
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
3738
@Dependency({
3839
"org.apache.kafka:kafka_2.12:[1.1.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
39-
"org.apache.kafka:kafka-clients:[1.1.0,1.1.max]"
40+
"org.apache.kafka:kafka-clients:[1.1.0,1.1.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
4041
})
4142
@JvmVersion(8)
42-
public class KafkaClient_1_1_x_IT extends KafkaClientITBase {
43+
public class KafkaClient_1_1_x_IT extends KafkaClient2ITBase {
4344

4445
@Test
4546
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_0_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_0_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.*;
2122
import org.junit.Test;
@@ -36,10 +37,10 @@
3637
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
3738
@Dependency({
3839
"org.apache.kafka:kafka_2.12:[2.0.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
39-
"org.apache.kafka:kafka-clients:[2.0.0,2.0.max]",
40+
"org.apache.kafka:kafka-clients:[2.0.0,2.0.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
4041
})
4142
@JvmVersion(8)
42-
public class KafkaClient_2_0_x_IT extends KafkaClientITBase {
43+
public class KafkaClient_2_0_x_IT extends KafkaClient2ITBase {
4344

4445
@Test
4546
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_2_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_2_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.*;
2122
import org.junit.Test;
@@ -36,10 +37,10 @@
3637
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
3738
@Dependency({
3839
"org.apache.kafka:kafka_2.12:[2.2.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
39-
"org.apache.kafka:kafka-clients:[2.2.0,2.2.max]",
40+
"org.apache.kafka:kafka-clients:[2.2.0,2.2.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
4041
})
4142
@JvmVersion(8)
42-
public class KafkaClient_2_2_x_IT extends KafkaClientITBase {
43+
public class KafkaClient_2_2_x_IT extends KafkaClient2ITBase {
4344

4445
@Test
4546
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_3_0_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_3_0_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.kafka;
22

3+
import com.navercorp.pinpoint.common.Version;
34
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
45
import com.navercorp.pinpoint.test.plugin.*;
56
import org.junit.Test;
@@ -20,10 +21,10 @@
2021
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
2122
@Dependency({
2223
"org.apache.kafka:kafka_2.12:[2.3.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
23-
"org.apache.kafka:kafka-clients:[2.3.0]",
24+
"org.apache.kafka:kafka-clients:[2.3.0]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
2425
})
2526
@JvmVersion(8)
26-
public class KafkaClient_2_3_0_IT extends KafkaClientITBase {
27+
public class KafkaClient_2_3_0_IT extends KafkaClient2ITBase {
2728

2829
@Test
2930
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_3_1_to_max_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_3_1_to_max_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.kafka;
22

3+
import com.navercorp.pinpoint.common.Version;
34
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
45
import com.navercorp.pinpoint.test.plugin.*;
56
import org.junit.Test;
@@ -20,10 +21,10 @@
2021
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
2122
@Dependency({
2223
"org.apache.kafka:kafka_2.12:[2.3.1]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
23-
"org.apache.kafka:kafka-clients:[2.3.1,2.3.max]",
24+
"org.apache.kafka:kafka-clients:[2.3.1,2.3.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
2425
})
2526
@JvmVersion(8)
26-
public class KafkaClient_2_3_1_to_max_IT extends KafkaClientITBase {
27+
public class KafkaClient_2_3_1_to_max_IT extends KafkaClient2ITBase {
2728

2829
@Test
2930
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_4_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_4_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.kafka;
22

3+
import com.navercorp.pinpoint.common.Version;
34
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
45
import com.navercorp.pinpoint.test.plugin.*;
56
import org.junit.Test;
@@ -20,10 +21,10 @@
2021
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
2122
@Dependency({
2223
"org.apache.kafka:kafka_2.12:[2.4.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
23-
"org.apache.kafka:kafka-clients:[2.4.0,2.4.max]"
24+
"org.apache.kafka:kafka-clients:[2.4.0,2.4.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
2425
})
2526
@JvmVersion(8)
26-
public class KafkaClient_2_4_x_IT extends KafkaClientITBase {
27+
public class KafkaClient_2_4_x_IT extends KafkaClient2ITBase {
2728

2829
@Test
2930
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_5_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_5_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.kafka;
22

3+
import com.navercorp.pinpoint.common.Version;
34
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
45
import com.navercorp.pinpoint.test.plugin.*;
56
import org.junit.Test;
@@ -20,10 +21,10 @@
2021
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
2122
@Dependency({
2223
"org.apache.kafka:kafka_2.12:[2.5.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
23-
"org.apache.kafka:kafka-clients:[2.5.0,2.5.max]"
24+
"org.apache.kafka:kafka-clients:[2.5.0,2.5.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
2425
})
2526
@JvmVersion(8)
26-
public class KafkaClient_2_5_x_IT extends KafkaClientITBase {
27+
public class KafkaClient_2_5_x_IT extends KafkaClient2ITBase {
2728

2829
@Test
2930
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_6_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_6_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.navercorp.pinpoint.plugin.kafka;
22

3+
import com.navercorp.pinpoint.common.Version;
34
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
45
import com.navercorp.pinpoint.test.plugin.*;
56
import org.junit.Test;
@@ -20,10 +21,10 @@
2021
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
2122
@Dependency({
2223
"org.apache.kafka:kafka_2.12:[2.6.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
23-
"org.apache.kafka:kafka-clients:[2.6.0,2.6.x]"
24+
"org.apache.kafka:kafka-clients:[2.6.0,2.6.x]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
2425
})
2526
@JvmVersion(8)
26-
public class KafkaClient_2_6_x_IT extends KafkaClientITBase {
27+
public class KafkaClient_2_6_x_IT extends KafkaClient2ITBase {
2728

2829
@Test
2930
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_7_x_IT.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClient_2_7_x_IT.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.navercorp.pinpoint.plugin.kafka;
1818

19+
import com.navercorp.pinpoint.common.Version;
1920
import com.navercorp.pinpoint.pluginit.utils.AgentPath;
2021
import com.navercorp.pinpoint.test.plugin.Dependency;
2122
import com.navercorp.pinpoint.test.plugin.ImportPlugin;
@@ -42,10 +43,10 @@
4243
@ImportPlugin({"com.navercorp.pinpoint:pinpoint-kafka-plugin"})
4344
@Dependency({
4445
"org.apache.kafka:kafka_2.12:[2.7.0]", "log4j:log4j:[1.2.17]", "commons-io:commons-io:[2.5.0]",
45-
"org.apache.kafka:kafka-clients:[2.7.0,)"
46+
"org.apache.kafka:kafka-clients:[2.7.0,2.7.max]", "com.navercorp.pinpoint:pinpoint-kafka-it-commons:"+ Version.VERSION
4647
})
4748
@JvmVersion(8)
48-
public class KafkaClient_2_7_x_IT extends KafkaClientITBase {
49+
public class KafkaClient_2_7_x_IT extends KafkaClient2ITBase {
4950

5051
@Test
5152
public void producerSendTest() throws NoSuchMethodException {

‎plugins-it/kafka-it/src/test/java/test/pinpoint/plugin/kafka/KafkaUnitServer.java renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/java/test/pinpoint/plugin/kafka/Kafka2UnitServer.java

+7-22
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,27 @@
1919
import kafka.server.KafkaConfig;
2020
import kafka.server.KafkaServerStartable;
2121
import org.apache.commons.io.FileUtils;
22-
import org.apache.logging.log4j.Logger;
2322
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2424

25-
import java.io.File;
2625
import java.io.IOException;
2726
import java.nio.file.Files;
28-
import java.util.Properties;
2927

3028
/**
3129
* Copy of https://github.com/chbatey/kafka-unit/blob/master/src/main/java/info/batey/kafka/unit/KafkaUnit.java
3230
* Some codes have been modified for testing from the copied code.
3331
*/
34-
public class KafkaUnitServer {
35-
36-
private static final Logger logger = LogManager.getLogger(KafkaUnitServer.class);
37-
private String zookeeperString;
38-
private String brokerString;
39-
private int zkPort;
40-
private int brokerPort;
41-
private Properties kafkaBrokerConfig;
42-
private int zkMaxConnections;
32+
public class Kafka2UnitServer extends KafkaUnitServer {
33+
private static final Logger logger = LogManager.getLogger(Kafka2UnitServer.class);
4334
private KafkaServerStartable broker;
44-
private ZookeeperUnitServer zookeeper;
45-
private File logDir;
4635

47-
public KafkaUnitServer(int zkPort, int brokerPort) {
36+
37+
public Kafka2UnitServer(int zkPort, int brokerPort) {
4838
this(zkPort, brokerPort, 16);
4939
}
5040

51-
public KafkaUnitServer(int zkPort, int brokerPort, int zkMaxConnections) {
52-
this.kafkaBrokerConfig = new Properties();
53-
this.zkPort = zkPort;
54-
this.brokerPort = brokerPort;
55-
this.zookeeperString = "localhost:" + zkPort;
56-
this.brokerString = "localhost:" + brokerPort;
57-
this.zkMaxConnections = zkMaxConnections;
41+
public Kafka2UnitServer(int zkPort, int brokerPort, int zkMaxConnections) {
42+
super(zkPort, brokerPort, zkMaxConnections);
5843
}
5944

6045
public void startup() {

‎plugins-it/kafka-it/src/test/resources/pinpoint-kafka-client.config renamed to ‎plugins-it/kafka-it/kafka-2-it/src/test/resources/pinpoint-kafka-client.config

File renamed without changes.

0 commit comments

Comments
 (0)