From b5b197f0c9aa0c44d8e104d50819d2f194f9cf71 Mon Sep 17 00:00:00 2001 From: Khushboo Rajput <59671881+khushbr@users.noreply.github.com> Date: Wed, 31 May 2023 11:11:30 -0700 Subject: [PATCH] Fix 'getClassLoader' Exception in AD Collector initialization (#474) (#475) * Fix SHA update for PA-Commons repo in build.gradle * Adding getClassLoader permission * Addressing failure in AdmissionControlMetricsCollector initialization * Adding getClassLoader for AdmissionControl Collector --------- Signed-off-by: Khushboo Rajput --- build.gradle | 115 ++++++---- licenses/byte-buddy-1.9.7.jar.sha1 | 1 + licenses/byte-buddy-LICENSE.txt | 176 +++++++++++++++ licenses/byte-buddy-NOTICE.txt | 13 ++ licenses/byte-buddy-agent-1.9.7.jar.sha1 | 1 + licenses/byte-buddy-agent-LICENSE.txt | 176 +++++++++++++++ licenses/byte-buddy-agent-NOTICE.txt | 13 ++ licenses/mockito-core-2.23.0.jar.sha1 | 1 + licenses/mockito-core-LICENSE.txt | 21 ++ licenses/mockito-core-NOTICE.txt | 0 licenses/objenesis-3.0.1.jar.sha1 | 1 + licenses/objenesis-LICENSE.txt | 202 ++++++++++++++++++ licenses/objenesis-NOTICE.txt | 1 + ...e-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 | 2 +- .../AdmissionControlMetricsCollector.java | 2 +- src/main/resources/plugin-security.policy | 2 +- 16 files changed, 686 insertions(+), 41 deletions(-) create mode 100644 licenses/byte-buddy-1.9.7.jar.sha1 create mode 100644 licenses/byte-buddy-LICENSE.txt create mode 100644 licenses/byte-buddy-NOTICE.txt create mode 100644 licenses/byte-buddy-agent-1.9.7.jar.sha1 create mode 100644 licenses/byte-buddy-agent-LICENSE.txt create mode 100644 licenses/byte-buddy-agent-NOTICE.txt create mode 100644 licenses/mockito-core-2.23.0.jar.sha1 create mode 100644 licenses/mockito-core-LICENSE.txt create mode 100644 licenses/mockito-core-NOTICE.txt create mode 100644 licenses/objenesis-3.0.1.jar.sha1 create mode 100644 licenses/objenesis-LICENSE.txt create mode 100644 licenses/objenesis-NOTICE.txt diff --git a/build.gradle b/build.gradle index 3a48b6db..8e2d09d4 100644 --- a/build.gradle +++ b/build.gradle @@ -312,48 +312,75 @@ dependencies { implementation "com.fasterxml.jackson.module:jackson-module-paranamer:${jacksonVersion}" implementation(group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}") implementation(group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}") - implementation(group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0') { - force = 'true' + implementation(group: 'com.google.errorprone', name: 'error_prone_annotations') { + version { + strictly "2.9.0" + } } - implementation("org.checkerframework:checker-qual:3.29.0") { - force = 'true' + implementation(group: 'com.google.protobuf', name:'protobuf-java') { + version { + strictly "${protobufVersion}" + } } - implementation(group: 'com.google.protobuf', name:'protobuf-java', version: "${protobufVersion}") { - force = 'true' + implementation("io.netty:netty-buffer") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-buffer:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-codec:") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-codec:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-codec-http") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-codec-http:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-common") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-common:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-handler") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-handler:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-resolver") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-resolver:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-transport") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-transport:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-codec-http2") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-codec-http2:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-codec-socks") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-codec-socks:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-handler-proxy") { + version { + strictly "${nettyVersion}" + } } - implementation("io.netty:netty-handler-proxy:${nettyVersion}") { - force = 'true' + implementation("io.netty:netty-transport-native-unix-common") { + version { + strictly "${nettyVersion}" + } } - - implementation("io.netty:netty-transport-native-unix-common:${nettyVersion}") { - force = 'true' + implementation("org.checkerframework:checker-qual") { + version { + strictly "3.29.0" + } } @@ -362,8 +389,10 @@ dependencies { testImplementation(group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.0') { exclude(group: 'org.hamcrest', module: 'hamcrest-core') } - testImplementation(group: 'org.mockito', name: 'mockito-core', version: '2.23.0') { - force = 'true' + implementation("org.mockito:mockito-core") { + version { + strictly "2.23.0" + } } // Dependency to mock final classes. testImplementation group: 'org.mockito', name: 'mockito-inline', version: '2.13.0' @@ -375,16 +404,26 @@ dependencies { testImplementation group: 'org.javassist', name: 'javassist', version: '3.24.0-GA' testImplementation group: 'org.powermock', name: 'powermock-reflect', version: '2.0.0' //minimum byte-buddy version to be compatible with mockito-core 2.23.0 is 1.9.7+. https://github.com/mockito/mockito/issues/1606 - testImplementation(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.9.7') { - force = 'true' + implementation("net.bytebuddy:byte-buddy") { + version { + strictly "1.9.7" + } } - testImplementation(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.9.7') { - force = 'true' + implementation("net.bytebuddy:byte-buddy-agent") { + version { + strictly "1.9.7" + } } - testImplementation(group: 'org.objenesis', name: 'objenesis', version: '3.0.1') { - force = 'true' + implementation("org.objenesis:objenesis") { + version { + strictly "3.0.1" + } + } + implementation("com.google.code.gson:gson") { + version { + strictly "2.9.0" + } } - testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' // Needed for BWC tests zipArchive group: 'org.opensearch.plugin', name:'performance-analyzer', version: "${pa_bwc_version}-SNAPSHOT" diff --git a/licenses/byte-buddy-1.9.7.jar.sha1 b/licenses/byte-buddy-1.9.7.jar.sha1 new file mode 100644 index 00000000..b1a1e42f --- /dev/null +++ b/licenses/byte-buddy-1.9.7.jar.sha1 @@ -0,0 +1 @@ +8fea78fea6449e1738b675cb155ce8422661e237 \ No newline at end of file diff --git a/licenses/byte-buddy-LICENSE.txt b/licenses/byte-buddy-LICENSE.txt new file mode 100644 index 00000000..d0381d6d --- /dev/null +++ b/licenses/byte-buddy-LICENSE.txt @@ -0,0 +1,176 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/licenses/byte-buddy-NOTICE.txt b/licenses/byte-buddy-NOTICE.txt new file mode 100644 index 00000000..a369e562 --- /dev/null +++ b/licenses/byte-buddy-NOTICE.txt @@ -0,0 +1,13 @@ +Copyright ${project.inceptionYear} - Present ${copyright.holder} + +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. diff --git a/licenses/byte-buddy-agent-1.9.7.jar.sha1 b/licenses/byte-buddy-agent-1.9.7.jar.sha1 new file mode 100644 index 00000000..9f0f6fe0 --- /dev/null +++ b/licenses/byte-buddy-agent-1.9.7.jar.sha1 @@ -0,0 +1 @@ +8e7d1b599f4943851ffea125fd9780e572727fc0 \ No newline at end of file diff --git a/licenses/byte-buddy-agent-LICENSE.txt b/licenses/byte-buddy-agent-LICENSE.txt new file mode 100644 index 00000000..d0381d6d --- /dev/null +++ b/licenses/byte-buddy-agent-LICENSE.txt @@ -0,0 +1,176 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/licenses/byte-buddy-agent-NOTICE.txt b/licenses/byte-buddy-agent-NOTICE.txt new file mode 100644 index 00000000..a369e562 --- /dev/null +++ b/licenses/byte-buddy-agent-NOTICE.txt @@ -0,0 +1,13 @@ +Copyright ${project.inceptionYear} - Present ${copyright.holder} + +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. diff --git a/licenses/mockito-core-2.23.0.jar.sha1 b/licenses/mockito-core-2.23.0.jar.sha1 new file mode 100644 index 00000000..fc62a3bd --- /dev/null +++ b/licenses/mockito-core-2.23.0.jar.sha1 @@ -0,0 +1 @@ +497ddb32fd5d01f9dbe99a2ec790aeb931dff1b1 \ No newline at end of file diff --git a/licenses/mockito-core-LICENSE.txt b/licenses/mockito-core-LICENSE.txt new file mode 100644 index 00000000..5a311f7c --- /dev/null +++ b/licenses/mockito-core-LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2007 Mockito contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/mockito-core-NOTICE.txt b/licenses/mockito-core-NOTICE.txt new file mode 100644 index 00000000..e69de29b diff --git a/licenses/objenesis-3.0.1.jar.sha1 b/licenses/objenesis-3.0.1.jar.sha1 new file mode 100644 index 00000000..b871abd3 --- /dev/null +++ b/licenses/objenesis-3.0.1.jar.sha1 @@ -0,0 +1 @@ +11cfac598df9dc48bb9ed9357ed04212694b7808 \ No newline at end of file diff --git a/licenses/objenesis-LICENSE.txt b/licenses/objenesis-LICENSE.txt new file mode 100644 index 00000000..d6456956 --- /dev/null +++ b/licenses/objenesis-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/licenses/objenesis-NOTICE.txt b/licenses/objenesis-NOTICE.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/licenses/objenesis-NOTICE.txt @@ -0,0 +1 @@ + diff --git a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 index da6b00b0..8a8d4c4f 100644 --- a/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 +++ b/licenses/performance-analyzer-commons-1.0.0-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -055767b20346a5db502354b93b199f4d8aad19d7 \ No newline at end of file +b3d405690aa95a02fbabe1fb2b83c0525041ee93 \ No newline at end of file diff --git a/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java b/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java index f6ccf3a5..eeb5503a 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java +++ b/src/main/java/org/opensearch/performanceanalyzer/collectors/AdmissionControlMetricsCollector.java @@ -180,7 +180,7 @@ private boolean canLoadAdmissionControllerClasses() { Class.forName(ADMISSION_CONTROLLER, false, admissionControlClassLoader); this.jettyAdmissionControllerServiceClass = Class.forName(ADMISSION_CONTROL_SERVICE, false, admissionControlClassLoader); - } catch (ClassNotFoundException e) { + } catch (Exception e) { LOG.debug("Failed to load AdmissionControllerService classes : {}", e::toString); StatsCollector.instance().logException(ADMISSION_CONTROL_COLLECTOR_ERROR); return false; diff --git a/src/main/resources/plugin-security.policy b/src/main/resources/plugin-security.policy index fe5af916..6aeec177 100644 --- a/src/main/resources/plugin-security.policy +++ b/src/main/resources/plugin-security.policy @@ -19,8 +19,8 @@ grant { permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc"; permission java.lang.RuntimePermission "accessClassInPackage.sun.tools.attach"; permission java.lang.RuntimePermission "createClassLoader"; + permission java.lang.RuntimePermission "getClassLoader"; permission java.lang.RuntimePermission "defineClass"; - };