diff --git a/agent/pom.xml b/agent/pom.xml index f650fa7a3d17d..9e2616a1ad196 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -23,6 +23,8 @@ com.navercorp.pinpoint pinpoint-profiler-optional + zip + runtime diff --git a/agent/src/assembly/distribution.xml b/agent/src/assembly/distribution.xml index 52390862de3e9..70ef49d03230e 100644 --- a/agent/src/assembly/distribution.xml +++ b/agent/src/assembly/distribution.xml @@ -8,7 +8,7 @@ tar.gz false - + ${basedir}/src/main/resources @@ -23,7 +23,7 @@ script - + @@ -42,11 +42,19 @@ com.navercorp.pinpoint:pinpoint-bootstrap-core com.navercorp.pinpoint:pinpoint-bootstrap com.navercorp.pinpoint:pinpoint-plugins + com.navercorp.pinpoint:pinpoint-profiler-optional lib false true + + + com.navercorp.pinpoint:pinpoint-profiler-optional + + lib + true + com.navercorp.pinpoint:pinpoint-plugins diff --git a/plugins/pom.xml b/plugins/pom.xml index 30c4e32dd242d..bbd90c0b51afc 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -212,6 +212,7 @@ assembly.xml + false diff --git a/pom.xml b/pom.xml index cf95a89235e5a..59dc9b3cb4369 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ thrift test web - java8-test hbase @@ -144,6 +143,13 @@ com.navercorp.pinpoint pinpoint-profiler-optional + pom + ${project.version} + + + com.navercorp.pinpoint + pinpoint-profiler-optional + zip ${project.version} diff --git a/profiler-optional/README.md b/profiler-optional/README.md index 8acd8543de0ac..cf4d292dc63bc 100644 --- a/profiler-optional/README.md +++ b/profiler-optional/README.md @@ -1,31 +1,14 @@ # pinpoint-profiler-optional -**pinpoint-profiler-optional** is an optional package for pinpoint-profiler, adding features that are implemented using APIs available in JDK 7 or later. +Modules under **pinpoint-profiler-optional** contain optional packages for pinpoint-profiler, containing features and codes that must be compiled against specific versions of JDK. + +Additionally, these optional modules may contain vendor-specific stub classes compile against. +These classes are not included in in the final jar packaging, and the vendor-specific implementations that are compiled against these stubs must be loaded with vendor-supplied implementations. ## Requirements -In order to build pinpoint-profiler-optional, the following requirements must be met: +In order to build pinpoint-profiler-optional and it's child modules, the following requirements must be met: -* JDK 7+ installed +* JDK 7 installed * `JAVA_7_HOME` environment variable set to JDK 7 home directory - -Once the `JAVA_7_HOME` environment is set, the *maven-compiler-plugin* invokes the JDK 7 compiler to compile the optional package: - -```xml - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - true - - 1.7 - 1.7 - ${compiler-debug} - true - true - true - 1.7 - ${JAVA_7_HOME}/bin/javac - UTF-8 - - -``` +* JDK 8 installed +* `JAVA_8_HOME` environment variable set to JDK 8 home directory diff --git a/profiler-optional/assembly.xml b/profiler-optional/assembly.xml new file mode 100644 index 0000000000000..8c863ab15c64c --- /dev/null +++ b/profiler-optional/assembly.xml @@ -0,0 +1,24 @@ + + + optional-projects + + zip + + false + + + + ${project.groupId}:pinpoint-profiler-optional-jdk6 + ${project.groupId}:pinpoint-profiler-optional-jdk7 + + + + / + false + false + runtime + + + \ No newline at end of file diff --git a/profiler-optional/pom.xml b/profiler-optional/pom.xml index 9306ebdce6485..144a54924ab03 100644 --- a/profiler-optional/pom.xml +++ b/profiler-optional/pom.xml @@ -8,36 +8,56 @@ pinpoint-profiler-optional pinpoint-profiler-optional + pom pinpoint profiler optional package - - - 1.7 - ${env.JAVA_7_HOME} - - + + + profiler-optional-jdk6 + profiler-optional-jdk7 + profiler-optional-jdk8 + profiler-optional-parent + + com.navercorp.pinpoint - pinpoint-profiler - provided - - - com.navercorp.pinpoint - pinpoint-commons - - - com.navercorp.pinpoint - pinpoint-bootstrap - - - com.navercorp.pinpoint - pinpoint-rpc - - - com.navercorp.pinpoint - pinpoint-thrift - - + pinpoint-profiler-optional-jdk6 + ${project.version} + + + com.navercorp.pinpoint + pinpoint-profiler-optional-jdk7 + ${project.version} + + + com.navercorp.pinpoint + pinpoint-profiler-optional-jdk8 + ${project.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.3 + + + assembly.xml + + false + + + + assemble-optional-projects + package + + single + + + + + + \ No newline at end of file diff --git a/java8-test/.gitignore b/profiler-optional/profiler-optional-jdk6/.gitignore similarity index 100% rename from java8-test/.gitignore rename to profiler-optional/profiler-optional-jdk6/.gitignore index 792ac6a97ed99..31dc463a2a2ba 100644 --- a/java8-test/.gitignore +++ b/profiler-optional/profiler-optional-jdk6/.gitignore @@ -1,5 +1,5 @@ /.settings/ /*.iml +/.project /target/ /.classpath -/.project diff --git a/java8-test/clover.license b/profiler-optional/profiler-optional-jdk6/clover.license similarity index 98% rename from java8-test/clover.license rename to profiler-optional/profiler-optional-jdk6/clover.license index 883220ef15dd8..569fa6175b4c7 100644 --- a/java8-test/clover.license +++ b/profiler-optional/profiler-optional-jdk6/clover.license @@ -1,5 +1,5 @@ -RMRqrdbgbKFhbaVnDxHUdDQvrOQXxIBklnvcmahheubVC -mh2KM35CLkwUHS4DH7QVhxy52J5hnWbyEm6Cyd3KkF + + 4.0.0 + + com.navercorp.pinpoint + pinpoint-profiler-optional-parent + ../profiler-optional-parent + 1.6.0-SNAPSHOT + + + pinpoint-profiler-optional-jdk6 + pinpoint-profiler-optional-jdk6 + jar + pinpoint profiler optional package for jdk 6 + + + 1.6 + ${env.JAVA_6_HOME} + + + \ No newline at end of file diff --git a/profiler-optional/profiler-optional-jdk7/.gitignore b/profiler-optional/profiler-optional-jdk7/.gitignore new file mode 100644 index 0000000000000..31dc463a2a2ba --- /dev/null +++ b/profiler-optional/profiler-optional-jdk7/.gitignore @@ -0,0 +1,5 @@ +/.settings/ +/*.iml +/.project +/target/ +/.classpath diff --git a/profiler-optional/profiler-optional-jdk7/clover.license b/profiler-optional/profiler-optional-jdk7/clover.license new file mode 100644 index 0000000000000..569fa6175b4c7 --- /dev/null +++ b/profiler-optional/profiler-optional-jdk7/clover.license @@ -0,0 +1,5 @@ +RMRqrdbgbKFhbaVnDxHUdDQvrOQXxIBklnvcmahheubVC +mh2KM35CLkwUHS4DH7QVhxy52J5hnWbyEm6Cyd3KkF + + 4.0.0 + + com.navercorp.pinpoint + pinpoint-profiler-optional-parent + ../profiler-optional-parent + 1.6.0-SNAPSHOT + + + pinpoint-profiler-optional-jdk7 + pinpoint-profiler-optional-jdk7 + jar + pinpoint profiler optional package for jdk 7 + + + 1.7 + ${env.JAVA_7_HOME} + + + + + org.javassist + javassist + test + + + org.ow2.asm + asm-debug-all + test + + + + \ No newline at end of file diff --git a/profiler-optional/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java b/profiler-optional/profiler-optional-jdk7/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java similarity index 99% rename from profiler-optional/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java rename to profiler-optional/profiler-optional-jdk7/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java index 6f0224de46cd1..26843a713c104 100644 --- a/profiler-optional/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java +++ b/profiler-optional/profiler-optional-jdk7/src/main/java/com/navercorp/pinpoint/profiler/monitor/codahale/cpu/metric/EnhancedCpuLoadMetricSet.java @@ -49,4 +49,4 @@ public String toString() { return "CpuLoadMetricSet for Java 1.7+"; } -} +} \ No newline at end of file diff --git a/java8-test/src/test/java/bug_regression_jdk7/javassist/CustomURLClassLoader.java b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/CustomURLClassLoader.java similarity index 100% rename from java8-test/src/test/java/bug_regression_jdk7/javassist/CustomURLClassLoader.java rename to profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/CustomURLClassLoader.java diff --git a/java8-test/src/test/java/bug_regression_jdk7/javassist/InvalidStackMapFrame.java b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/InvalidStackMapFrame.java similarity index 100% rename from java8-test/src/test/java/bug_regression_jdk7/javassist/InvalidStackMapFrame.java rename to profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/InvalidStackMapFrame.java diff --git a/java8-test/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java similarity index 86% rename from java8-test/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java rename to profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java index 4b70fa5f917f4..206073ae3c6f0 100644 --- a/java8-test/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java +++ b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/JavassistVerifyErrorTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2016 Naver Corp. + * + * 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 bug_regression_jdk7.javassist; import bug_regression_jdk7.javassist.asm.BytecodeVerifyTestClassVisitor; @@ -50,7 +66,7 @@ public void bug_regression_BytecodeVerifyError_Invalid_StackMapFrame() throws Ex try { Class.forName(INVALID_STACK_MAP_FRAME, true, classLoader); Assert.fail("VerifyError"); - } catch (java.lang.VerifyError e) { + } catch (VerifyError e) { logger.debug("verifyError:{}", e.getMessage(), e); } diff --git a/java8-test/src/test/java/bug_regression_jdk7/javassist/asm/AddIntVariableMethodAdapter.java b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/asm/AddIntVariableMethodAdapter.java similarity index 100% rename from java8-test/src/test/java/bug_regression_jdk7/javassist/asm/AddIntVariableMethodAdapter.java rename to profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/asm/AddIntVariableMethodAdapter.java diff --git a/java8-test/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java similarity index 69% rename from java8-test/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java rename to profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java index 7cb07783afdae..08920254098f7 100644 --- a/java8-test/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java +++ b/profiler-optional/profiler-optional-jdk7/src/test/java/bug_regression_jdk7/javassist/asm/BytecodeVerifyTestClassVisitor.java @@ -1,3 +1,19 @@ +/* + * Copyright 2016 Naver Corp. + * + * 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 bug_regression_jdk7.javassist.asm; import org.objectweb.asm.ClassVisitor; @@ -6,8 +22,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; - /** * @author Woonduk Kang(emeroad) */ @@ -17,7 +31,7 @@ public class BytecodeVerifyTestClassVisitor extends ClassVisitor { private String name; public BytecodeVerifyTestClassVisitor(final ClassVisitor cv) { - super(org.objectweb.asm.Opcodes.ASM5, cv); + super(Opcodes.ASM5, cv); } @Override diff --git a/java8-test/src/test/resources/log4j.xml b/profiler-optional/profiler-optional-jdk7/src/test/resources/log4j.xml similarity index 100% rename from java8-test/src/test/resources/log4j.xml rename to profiler-optional/profiler-optional-jdk7/src/test/resources/log4j.xml diff --git a/profiler-optional/profiler-optional-jdk8/.gitignore b/profiler-optional/profiler-optional-jdk8/.gitignore new file mode 100644 index 0000000000000..31dc463a2a2ba --- /dev/null +++ b/profiler-optional/profiler-optional-jdk8/.gitignore @@ -0,0 +1,5 @@ +/.settings/ +/*.iml +/.project +/target/ +/.classpath diff --git a/java8-test/pom.xml b/profiler-optional/profiler-optional-jdk8/pom.xml similarity index 52% rename from java8-test/pom.xml rename to profiler-optional/profiler-optional-jdk8/pom.xml index 537c20ba26ae3..3b830e8513303 100644 --- a/java8-test/pom.xml +++ b/profiler-optional/profiler-optional-jdk8/pom.xml @@ -1,18 +1,19 @@ - + + 4.0.0 com.navercorp.pinpoint - pinpoint + pinpoint-profiler-optional-parent + ../profiler-optional-parent 1.6.0-SNAPSHOT - pinpoint-java8-test - pinpoint-integration-test-java8 - + pinpoint-profiler-optional-jdk8 + pinpoint-profiler-optional-jdk8 jar + pinpoint profiler optional package for jdk 8 1.8 @@ -35,42 +36,9 @@ spring-context test - - - com.navercorp.pinpoint - pinpoint-profiler - test - - - org.javassist - javassist - test - - - org.ow2.asm - asm-debug-all - test - - - - - ${basedir}/src/main/java - - **/*.java - - - - true - ${basedir}/src/main/resources - - - ${basedir}/src/main/resources-${env} - - - org.apache.maven.plugins @@ -86,7 +54,7 @@ ${jdk.home}/bin/java - false true @@ -94,4 +62,5 @@ - + + \ No newline at end of file diff --git a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java similarity index 98% rename from java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java rename to profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java index 6df6f8698909e..3ea94756ea2b2 100644 --- a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/LambdaIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 NAVER Corp. + * Copyright 2016 Naver Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package com.navercorp.test.pinpoint.jdk8.lambda; -import java.util.function.Predicate; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.navercorp.pinpoint.bootstrap.plugin.test.Expectations; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifier; import com.navercorp.pinpoint.bootstrap.plugin.test.PluginTestVerifierHolder; @@ -30,6 +23,12 @@ import com.navercorp.pinpoint.test.plugin.JvmVersion; import com.navercorp.pinpoint.test.plugin.PinpointConfig; import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import java.util.function.Predicate; @RunWith(PinpointPluginTestSuite.class) @JvmVersion({8}) diff --git a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java similarity index 94% rename from java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java rename to profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java index af67520241619..32400b608be2c 100644 --- a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Maru.java @@ -1,11 +1,12 @@ -/** - * Copyright 2014 NAVER Corp. +/* + * Copyright 2016 Naver Corp. + * * 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. diff --git a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java similarity index 96% rename from java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java rename to profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java index 2c08b9a185a35..8b151b7a36384 100644 --- a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Morae.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 NAVER Corp. + * Copyright 2016 Naver Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java similarity index 96% rename from java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java rename to profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java index 49b448856da0d..21dc330d72d1f 100644 --- a/java8-test/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/lambda/Mozzi.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 NAVER Corp. + * Copyright 2016 Naver Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/java8-test/src/test/resources/lambda-test.xml b/profiler-optional/profiler-optional-jdk8/src/test/resources/lambda-test.xml similarity index 100% rename from java8-test/src/test/resources/lambda-test.xml rename to profiler-optional/profiler-optional-jdk8/src/test/resources/lambda-test.xml diff --git a/java8-test/src/test/resources/pinpoint-lambda-test.config b/profiler-optional/profiler-optional-jdk8/src/test/resources/pinpoint-lambda-test.config similarity index 100% rename from java8-test/src/test/resources/pinpoint-lambda-test.config rename to profiler-optional/profiler-optional-jdk8/src/test/resources/pinpoint-lambda-test.config diff --git a/profiler-optional/profiler-optional-parent/.gitignore b/profiler-optional/profiler-optional-parent/.gitignore new file mode 100644 index 0000000000000..31dc463a2a2ba --- /dev/null +++ b/profiler-optional/profiler-optional-parent/.gitignore @@ -0,0 +1,5 @@ +/.settings/ +/*.iml +/.project +/target/ +/.classpath diff --git a/profiler-optional/profiler-optional-parent/clover.license b/profiler-optional/profiler-optional-parent/clover.license new file mode 100644 index 0000000000000..569fa6175b4c7 --- /dev/null +++ b/profiler-optional/profiler-optional-parent/clover.license @@ -0,0 +1,5 @@ +RMRqrdbgbKFhbaVnDxHUdDQvrOQXxIBklnvcmahheubVC +mh2KM35CLkwUHS4DH7QVhxy52J5hnWbyEm6Cyd3KkF + + 4.0.0 + + com.navercorp.pinpoint + pinpoint + ../.. + 1.6.0-SNAPSHOT + + + pinpoint-profiler-optional-parent + pinpoint-profiler-optional-parent + pom + pinpoint profiler optional package parent + + + + com.navercorp.pinpoint + pinpoint-profiler + provided + + + com.navercorp.pinpoint + pinpoint-commons + + + com.navercorp.pinpoint + pinpoint-bootstrap + + + com.navercorp.pinpoint + pinpoint-rpc + + + com.navercorp.pinpoint + pinpoint-thrift + + + + + \ No newline at end of file