Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#8470] Update Java11 #8471

Merged
merged 2 commits into from
Dec 8, 2021
Merged

[#8470] Update Java11 #8471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22d308
[#8470] Update Java11
emeroad Dec 8, 2021
3ecf097
[#8470] Remove unnecessary reflection to support reuseport
emeroad Dec 8, 2021
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
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ For a more intimate guide, please check out our *[Introduction to Pinpoint](http

Java version required to run Pinpoint:
<!-- <compatibilityJava.md> -->
Pinpoint Version | Agent | Collector | Web
---------------- | ----- | --------- | ---
1.8.0 | 6-10 | 8 | 8
1.8.1+ | 6-11 | 8 | 8
2.0.x | 6-13 | 8 | 8
2.1.x | 6-14 | 8 | 8
2.2.x | 7-14 | 8 | 8
2.3.x | 7-17 | 8 | 8
2.4.x | 7-18 | 8 | 8
Pinpoint Version | Agent | Collector | Web | Flink
---------------- | ----- | --------- | --- | ---
1.8.0 | 6-10 | 8 | 8 | 8
1.8.1+ | 6-11 | 8 | 8 | 8
2.0.x | 6-13 | 8 | 8 | 8
2.1.x | 6-14 | 8 | 8 | 8
2.2.x | 7-14 | 8 | 8 | 8
2.3.x | 7-17 | 8 | 8 | 8
2.4.x | 7-18 | 11 | 11 | 11
<!-- </compatibilityJava.md> -->
HBase compatibility table:
<!-- <compatibilityHbase.md> -->
Expand Down
6 changes: 3 additions & 3 deletions batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<artifactId>pinpoint-batch</artifactId>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
<thrift.version>${thrift-jdk8.version}</thrift.version>
Expand Down
6 changes: 3 additions & 3 deletions collector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<guava.version>${guava-jdk8.version}</guava.version>
<javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
Expand Down
51 changes: 18 additions & 33 deletions ...va/com/navercorp/pinpoint/collector/receiver/thrift/udp/ReusePortSocketOptionApplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@

package com.navercorp.pinpoint.collector.receiver.thrift.udp;

import com.navercorp.pinpoint.common.util.OsType;
import com.navercorp.pinpoint.common.util.OsUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;

import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.DatagramSocket;
import java.net.SocketOption;
import java.net.StandardSocketOptions;

/**
Expand All @@ -33,9 +32,7 @@ public class ReusePortSocketOptionApplier {

private static final Logger LOGGER = LogManager.getLogger(ReusePortSocketOptionApplier.class);

private static final String FIELD_NAME_SO_REUSEPORT = "SO_REUSEPORT";

private static final SocketOption REUSE_PORT_SOCKET_OPTION = getReusePortSocketOption();
private static final OsType[] UNSUPPORTED_OS = new OsType[]{OsType.WINDOW, OsType.SOLARIS};

private final boolean reusePortEnable;
private final int socketCount;
Expand All @@ -50,14 +47,9 @@ public void apply(DatagramSocket socket) throws IOException {
return;
}
try {
Method setOptionMethod = DatagramSocket.class.getDeclaredMethod("setOption", SocketOption.class, Object.class);
setOptionMethod.invoke(socket, REUSE_PORT_SOCKET_OPTION, true);
} catch (Exception e) {
socket.setOption(StandardSocketOptions.SO_REUSEPORT, true);
} catch (IOException e) {
LOGGER.warn("setOption invoke error", e);
if (e instanceof IOException) {
throw (IOException)e;
}
throw new IOException("setOption invoke error", e);
}
}

Expand All @@ -70,31 +62,24 @@ public int getSocketCount() {
}

public static ReusePortSocketOptionApplier create(boolean reusePort, int socketCount) {
if (REUSE_PORT_SOCKET_OPTION != null) {
return new ReusePortSocketOptionApplier(reusePort, socketCount);
}
if (reusePort) {
LOGGER.warn("ReusePort not supported, Please use Jvm9+ for using ReusePort SocketOption");
if (isUnsupportedOS()) {
if (reusePort) {
LOGGER.warn("ReusePort not supported, OS:{}", OsUtils.getType());
}
return new ReusePortSocketOptionApplier(false, socketCount);
}
return new ReusePortSocketOptionApplier(false, socketCount);

return new ReusePortSocketOptionApplier(reusePort, socketCount);
}

private static SocketOption getReusePortSocketOption() {
try {
Field[] declaredFields = StandardSocketOptions.class.getDeclaredFields();
for (Field declaredField : declaredFields) {
if (declaredField.getName().equals(FIELD_NAME_SO_REUSEPORT)) {
Object socketOption = declaredField.get(null);
if (socketOption instanceof SocketOption) {
LOGGER.info("{} option found", FIELD_NAME_SO_REUSEPORT);
return (SocketOption) socketOption;
}
}
private static boolean isUnsupportedOS() {
final OsType osType = OsUtils.getType();
for (OsType unsupportedO : UNSUPPORTED_OS) {
if (osType.equals(unsupportedO)) {
return true;
}
} catch (Exception ignore) {
// ignores
}
return null;
return false;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions commons-hbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions commons-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
<test.jdk.home>${jdk.home}</test.jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>

<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
<guava.version>${guava-jdk8.version}</guava.version>
Expand Down
7 changes: 4 additions & 3 deletions flink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
<name>pinpoint-flink</name>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
<thrift.version>${thrift-jdk8.version}</thrift.version>
</properties>
Expand Down
21 changes: 21 additions & 0 deletions hbase/hbase-schema-definition/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,25 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.3</version>
<scope>runtime</scope>
</dependency>
</dependencies>


</project>
7 changes: 4 additions & 3 deletions hbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
<packaging>pom</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions hbase2-module/hbase2-batch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
<log4j2.version>${log4j2-jdk8.version}</log4j2.version>

<pinpoint.batch.executable.name>${project.artifactId}-${project.version}</pinpoint.batch.executable.name>
Expand Down
6 changes: 3 additions & 3 deletions hbase2-module/hbase2-collector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<guava.version>${guava-jdk8.version}</guava.version>
<javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
Expand Down
6 changes: 3 additions & 3 deletions hbase2-module/hbase2-flink/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<artifactId>pinpoint-hbase2-flink</artifactId>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
<log4j2.version>${log4j2-jdk8.version}</log4j2.version>
</properties>

Expand Down
7 changes: 4 additions & 3 deletions hbase2-module/hbase2-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<grunt.build.command>build_release_without_lint</grunt.build.command>

<!-- java back-end development option -->
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<plugin.pmd.version>3.14.0</plugin.pmd.version>

<plugin.enforcer.version>3.0.0</plugin.enforcer.version>
<plugin.animal-sniffer.version>1.19</plugin.animal-sniffer.version>
<plugin.animal-sniffer.version>1.20</plugin.animal-sniffer.version>

<sniffer.artifactid>java17</sniffer.artifactid>

Expand Down
7 changes: 4 additions & 3 deletions web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
<packaging>jar</packaging>

<properties>
<jdk.version>1.8</jdk.version>
<jdk.home>${env.JAVA_8_HOME}</jdk.home>
<sniffer.artifactid>java18</sniffer.artifactid>
<jdk.version>11</jdk.version>
<jdk.home>${env.JAVA_11_HOME}</jdk.home>
<plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>

<grunt.build.command>build_release_without_lint</grunt.build.command>

<!-- java back-end development option -->
Expand Down