Skip to content

Commit 6530bc9

Browse files
authored
Merge branch 'main' into bump_zstd_version
Signed-off-by: mulugetam <[email protected]>
2 parents b71646f + f4b8393 commit 6530bc9

File tree

33 files changed

+688
-31
lines changed

33 files changed

+688
-31
lines changed

.github/workflows/benchmark-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
- name: Trigger jenkins workflow to run gradle check
168168
run: |
169169
cat $GITHUB_ENV
170-
bash opensearch-build/scripts/benchmark/benchmark-pull-request.sh ${{ secrets.JENKINS_PR_BENCHMARK_GENERIC_WEBHOOK_TOKEN }}
170+
bash opensearch-build/scripts/benchmark/benchmark-pull-request.sh -t ${{ secrets.JENKINS_PR_BENCHMARK_GENERIC_WEBHOOK_TOKEN }} -u ${{ secrets.JENKINS_GITHUB_USER}} -p ${{ secrets.JENKINS_GITHUB_USER_TOKEN}}
171171
- name: Update PR with Job Url
172172
uses: actions/github-script@v7
173173
with:

.github/workflows/gradle-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- name: Get changed files
2626
id: changed-files-specific
27-
uses: tj-actions/[email protected].1
27+
uses: tj-actions/[email protected].3
2828
with:
2929
files_ignore: |
3030
release-notes/*.md
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
set -e
105105
set -o pipefail
106-
bash opensearch-build/scripts/gradle/gradle-check.sh ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} | tee -a gradle-check.log
106+
bash opensearch-build/scripts/gradle/gradle-check.sh -t ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} -u ${{ secrets.JENKINS_GITHUB_USER}} -p ${{ secrets.JENKINS_GITHUB_USER_TOKEN}} | tee -a gradle-check.log
107107
108108
- name: Setup Result Status
109109
if: always()

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Introduce a new search node role to hold search only shards ([#17620](https://github.com/opensearch-project/OpenSearch/pull/17620))
1212
- Fix systemd integTest on deb regarding path ownership check ([#17641](https://github.com/opensearch-project/OpenSearch/pull/17641))
1313
- Add dfs transformation function in XContentMapValues ([#17612](https://github.com/opensearch-project/OpenSearch/pull/17612))
14-
- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615)
14+
- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615))
15+
- [Security Manager Replacement] Create initial Java Agent to intercept Socket::connect calls ([#17724](https://github.com/opensearch-project/OpenSearch/pull/17724))
1516

1617
### Changed
1718
- Migrate BC libs to their FIPS counterparts ([#14912](https://github.com/opensearch-project/OpenSearch/pull/14912))
@@ -24,6 +25,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2425
- Bump `dangoslen/dependabot-changelog-helper` from 3 to 4 ([#17498](https://github.com/opensearch-project/OpenSearch/pull/17498))
2526
- Bump `com.google.api:gax` from 2.35.0 to 2.63.1 ([#17465](https://github.com/opensearch-project/OpenSearch/pull/17465))
2627
- Bump `com.azure:azure-storage-blob` from 12.29.1 to 12.30.0 ([#17667](https://github.com/opensearch-project/OpenSearch/pull/17667))
28+
- Bump `tj-actions/changed-files` from 46.0.1 to 46.0.3 ([#17666](https://github.com/opensearch-project/OpenSearch/pull/17666))
29+
- Bump `com.google.code.gson:gson` from 2.11.0 to 2.12.1 ([#17668](https://github.com/opensearch-project/OpenSearch/pull/17668))
2730
- Bump `com.github.luben:zstd-jni` from 1.5.5-1 to 1.5.6-1 ([#17674](https://github.com/opensearch-project/OpenSearch/pull/17674))
2831

2932
### Changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grpc = "1.68.2"
3131
json_smart = "2.5.2"
3232

3333
# when updating the JNA version, also update the version in buildSrc/build.gradle
34-
jna = "5.13.0"
34+
jna = "5.16.0"
3535

3636
netty = "4.1.118.Final"
3737
joda = "2.12.7"
@@ -70,9 +70,9 @@ password4j = "1.8.2"
7070
randomizedrunner = "2.7.1"
7171
junit = "4.13.2"
7272
hamcrest = "2.1"
73-
mockito = "5.14.2"
73+
mockito = "5.16.1"
7474
objenesis = "3.3"
75-
bytebuddy = "1.15.10"
75+
bytebuddy = "1.17.4"
7676

7777
# benchmark dependencies
7878
jmh = "1.35"

libs/agent-sm/agent/build.gradle

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
apply plugin: 'opensearch.build'
2+
apply plugin: 'opensearch.publish'
3+
4+
base {
5+
archivesName = 'opensearch-agent'
6+
}
7+
8+
configurations {
9+
bootstrap.extendsFrom(implementation)
10+
}
11+
12+
dependencies {
13+
implementation project(":libs:agent-sm:bootstrap")
14+
implementation "net.bytebuddy:byte-buddy:${versions.bytebuddy}"
15+
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
16+
}
17+
18+
var bootClasspath = configurations.bootstrap.incoming.artifactView { }.files
19+
.getFiles()
20+
.collect { it.name }
21+
22+
jar {
23+
manifest {
24+
attributes(
25+
"Can-Redefine-Classes": "true",
26+
"Can-Retransform-Classes": "true",
27+
"Agent-Class": "org.opensearch.javaagent.Agent",
28+
"Premain-Class": "org.opensearch.javaagent.Agent",
29+
"Boot-Class-Path": bootClasspath.join(' ')
30+
)
31+
}
32+
}
33+
34+
compileJava {
35+
options.compilerArgs -= '-Werror'
36+
}
37+
38+
test.enabled = false
39+
testingConventions.enabled = false
40+
41+
tasks.named('forbiddenApisMain').configure {
42+
replaceSignatureFiles 'jdk-signatures'
43+
}
44+
45+
task prepareAgent(type: Copy) {
46+
from(configurations.runtimeClasspath)
47+
into "$buildDir/distributions"
48+
dependsOn jar
49+
}
50+
51+
thirdPartyAudit {
52+
ignoreMissingClasses(
53+
'com.sun.jna.FunctionMapper',
54+
'com.sun.jna.JNIEnv',
55+
'com.sun.jna.Library',
56+
'com.sun.jna.Native',
57+
'com.sun.jna.NativeLibrary',
58+
'com.sun.jna.Platform'
59+
)
60+
}
61+
62+
tasks.named('validateNebulaPom') {
63+
dependsOn prepareAgent
64+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ffb8488d93290eff074fb542a596e4c5a26d0315
Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
This product bundles ASM 9.7.1, which is available under a "3-clause BSD"
2+
license. For details, see licenses/ASM. For more information visit ${asm.url}.
3+
4+
Apache License
5+
Version 2.0, January 2004
6+
http://www.apache.org/licenses/
7+
8+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
9+
10+
1. Definitions.
11+
12+
"License" shall mean the terms and conditions for use, reproduction,
13+
and distribution as defined by Sections 1 through 9 of this document.
14+
15+
"Licensor" shall mean the copyright owner or entity authorized by
16+
the copyright owner that is granting the License.
17+
18+
"Legal Entity" shall mean the union of the acting entity and all
19+
other entities that control, are controlled by, or are under common
20+
control with that entity. For the purposes of this definition,
21+
"control" means (i) the power, direct or indirect, to cause the
22+
direction or management of such entity, whether by contract or
23+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
24+
outstanding shares, or (iii) beneficial ownership of such entity.
25+
26+
"You" (or "Your") shall mean an individual or Legal Entity
27+
exercising permissions granted by this License.
28+
29+
"Source" form shall mean the preferred form for making modifications,
30+
including but not limited to software source code, documentation
31+
source, and configuration files.
32+
33+
"Object" form shall mean any form resulting from mechanical
34+
transformation or translation of a Source form, including but
35+
not limited to compiled object code, generated documentation,
36+
and conversions to other media types.
37+
38+
"Work" shall mean the work of authorship, whether in Source or
39+
Object form, made available under the License, as indicated by a
40+
copyright notice that is included in or attached to the work
41+
(an example is provided in the Appendix below).
42+
43+
"Derivative Works" shall mean any work, whether in Source or Object
44+
form, that is based on (or derived from) the Work and for which the
45+
editorial revisions, annotations, elaborations, or other modifications
46+
represent, as a whole, an original work of authorship. For the purposes
47+
of this License, Derivative Works shall not include works that remain
48+
separable from, or merely link (or bind by name) to the interfaces of,
49+
the Work and Derivative Works thereof.
50+
51+
"Contribution" shall mean any work of authorship, including
52+
the original version of the Work and any modifications or additions
53+
to that Work or Derivative Works thereof, that is intentionally
54+
submitted to Licensor for inclusion in the Work by the copyright owner
55+
or by an individual or Legal Entity authorized to submit on behalf of
56+
the copyright owner. For the purposes of this definition, "submitted"
57+
means any form of electronic, verbal, or written communication sent
58+
to the Licensor or its representatives, including but not limited to
59+
communication on electronic mailing lists, source code control systems,
60+
and issue tracking systems that are managed by, or on behalf of, the
61+
Licensor for the purpose of discussing and improving the Work, but
62+
excluding communication that is conspicuously marked or otherwise
63+
designated in writing by the copyright owner as "Not a Contribution."
64+
65+
"Contributor" shall mean Licensor and any individual or Legal Entity
66+
on behalf of whom a Contribution has been received by Licensor and
67+
subsequently incorporated within the Work.
68+
69+
2. Grant of Copyright License. Subject to the terms and conditions of
70+
this License, each Contributor hereby grants to You a perpetual,
71+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
72+
copyright license to reproduce, prepare Derivative Works of,
73+
publicly display, publicly perform, sublicense, and distribute the
74+
Work and such Derivative Works in Source or Object form.
75+
76+
3. Grant of Patent License. Subject to the terms and conditions of
77+
this License, each Contributor hereby grants to You a perpetual,
78+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
79+
(except as stated in this section) patent license to make, have made,
80+
use, offer to sell, sell, import, and otherwise transfer the Work,
81+
where such license applies only to those patent claims licensable
82+
by such Contributor that are necessarily infringed by their
83+
Contribution(s) alone or by combination of their Contribution(s)
84+
with the Work to which such Contribution(s) was submitted. If You
85+
institute patent litigation against any entity (including a
86+
cross-claim or counterclaim in a lawsuit) alleging that the Work
87+
or a Contribution incorporated within the Work constitutes direct
88+
or contributory patent infringement, then any patent licenses
89+
granted to You under this License for that Work shall terminate
90+
as of the date such litigation is filed.
91+
92+
4. Redistribution. You may reproduce and distribute copies of the
93+
Work or Derivative Works thereof in any medium, with or without
94+
modifications, and in Source or Object form, provided that You
95+
meet the following conditions:
96+
97+
(a) You must give any other recipients of the Work or
98+
Derivative Works a copy of this License; and
99+
100+
(b) You must cause any modified files to carry prominent notices
101+
stating that You changed the files; and
102+
103+
(c) You must retain, in the Source form of any Derivative Works
104+
that You distribute, all copyright, patent, trademark, and
105+
attribution notices from the Source form of the Work,
106+
excluding those notices that do not pertain to any part of
107+
the Derivative Works; and
108+
109+
(d) If the Work includes a "NOTICE" text file as part of its
110+
distribution, then any Derivative Works that You distribute must
111+
include a readable copy of the attribution notices contained
112+
within such NOTICE file, excluding those notices that do not
113+
pertain to any part of the Derivative Works, in at least one
114+
of the following places: within a NOTICE text file distributed
115+
as part of the Derivative Works; within the Source form or
116+
documentation, if provided along with the Derivative Works; or,
117+
within a display generated by the Derivative Works, if and
118+
wherever such third-party notices normally appear. The contents
119+
of the NOTICE file are for informational purposes only and
120+
do not modify the License. You may add Your own attribution
121+
notices within Derivative Works that You distribute, alongside
122+
or as an addendum to the NOTICE text from the Work, provided
123+
that such additional attribution notices cannot be construed
124+
as modifying the License.
125+
126+
You may add Your own copyright statement to Your modifications and
127+
may provide additional or different license terms and conditions
128+
for use, reproduction, or distribution of Your modifications, or
129+
for any such Derivative Works as a whole, provided Your use,
130+
reproduction, and distribution of the Work otherwise complies with
131+
the conditions stated in this License.
132+
133+
5. Submission of Contributions. Unless You explicitly state otherwise,
134+
any Contribution intentionally submitted for inclusion in the Work
135+
by You to the Licensor shall be under the terms and conditions of
136+
this License, without any additional terms or conditions.
137+
Notwithstanding the above, nothing herein shall supersede or modify
138+
the terms of any separate license agreement you may have executed
139+
with Licensor regarding such Contributions.
140+
141+
6. Trademarks. This License does not grant permission to use the trade
142+
names, trademarks, service marks, or product names of the Licensor,
143+
except as required for reasonable and customary use in describing the
144+
origin of the Work and reproducing the content of the NOTICE file.
145+
146+
7. Disclaimer of Warranty. Unless required by applicable law or
147+
agreed to in writing, Licensor provides the Work (and each
148+
Contributor provides its Contributions) on an "AS IS" BASIS,
149+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
150+
implied, including, without limitation, any warranties or conditions
151+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
152+
PARTICULAR PURPOSE. You are solely responsible for determining the
153+
appropriateness of using or redistributing the Work and assume any
154+
risks associated with Your exercise of permissions under this License.
155+
156+
8. Limitation of Liability. In no event and under no legal theory,
157+
whether in tort (including negligence), contract, or otherwise,
158+
unless required by applicable law (such as deliberate and grossly
159+
negligent acts) or agreed to in writing, shall any Contributor be
160+
liable to You for damages, including any direct, indirect, special,
161+
incidental, or consequential damages of any character arising as a
162+
result of this License or out of the use or inability to use the
163+
Work (including but not limited to damages for loss of goodwill,
164+
work stoppage, computer failure or malfunction, or any and all
165+
other commercial damages or losses), even if such Contributor
166+
has been advised of the possibility of such damages.
167+
168+
9. Accepting Warranty or Additional Liability. While redistributing
169+
the Work or Derivative Works thereof, You may choose to offer,
170+
and charge a fee for, acceptance of support, warranty, indemnity,
171+
or other liability obligations and/or rights consistent with this
172+
License. However, in accepting such obligations, You may act only
173+
on Your own behalf and on Your sole responsibility, not on behalf
174+
of any other Contributor, and only if You agree to indemnify,
175+
defend, and hold each Contributor harmless for any liability
176+
incurred by, or claims asserted against, such Contributor by reason
177+
of your accepting any such warranty or additional liability.
178+
179+
END OF TERMS AND CONDITIONS
180+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2014 - Present Rafael Winterhalter
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

0 commit comments

Comments
 (0)