Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add search API tracker ([#18601](https://github.com/opensearch-project/OpenSearch/pull/18601))
- Support dynamic consumer configuration update in pull-based ingestion ([#19963](https://github.com/opensearch-project/OpenSearch/pull/19963))
- Cache the `StoredFieldsReader` for scroll query optimization ([#20112](https://github.com/opensearch-project/OpenSearch/pull/20112))
- Support pull-based ingestion message mappers and raw payload support ([#19765](https://github.com/opensearch-project/OpenSearch/pull/19765)]
- Support for HTTP/3 (server side) ([#20017](https://github.com/opensearch-project/OpenSearch/pull/20017))

### Changed
- Combining filter rewrite and skip list to optimize sub aggregation([#19573](https://github.com/opensearch-project/OpenSearch/pull/19573))
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ netty-codec-dns = { group = "io.netty", name = "netty-codec-dns", version.ref =
netty-codec-http = { group = "io.netty", name = "netty-codec-http", version.ref = "netty" }
netty-codec-http2 = { group = "io.netty", name = "netty-codec-http2", version.ref = "netty" }
netty-codec-http3 = { group = "io.netty", name = "netty-codec-http3", version.ref = "netty" }
netty-codec-native-quic = { group = "io.netty", name = "netty-codec-native-quic", version.ref = "netty" }
netty-codec-classes-quic = { group = "io.netty", name = "netty-codec-classes-quic", version.ref = "netty" }
netty-common = { group = "io.netty", name = "netty-common", version.ref = "netty" }
netty-handler = { group = "io.netty", name = "netty-handler", version.ref = "netty" }
netty-resolver-dns = { group = "io.netty", name = "netty-resolver-dns", version.ref = "netty" }
Expand Down
15 changes: 14 additions & 1 deletion modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,25 @@ dependencies {
api "io.netty:netty-codec:${versions.netty}"
api "io.netty:netty-codec-http:${versions.netty}"
api "io.netty:netty-codec-http2:${versions.netty}"
api "io.netty:netty-codec-http3:${versions.netty}"
api "io.netty:netty-codec-classes-quic:${versions.netty}"
api "io.netty:netty-codec-native-quic:${versions.netty}"
api "io.netty:netty-common:${versions.netty}"
api "io.netty:netty-handler:${versions.netty}"
api "io.netty:netty-resolver:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-transport-native-unix-common:${versions.netty}"

testFipsRuntimeOnly "org.bouncycastle:bc-fips:${versions.bouncycastle_jce}"
testFipsRuntimeOnly "org.bouncycastle:bctls-fips:${versions.bouncycastle_tls}"
testFipsRuntimeOnly "org.bouncycastle:bcutil-fips:${versions.bouncycastle_util}"

// Bundle all supported OSes and Archs
runtimeOnly "io.netty:netty-codec-native-quic:${versions.netty}:linux-x86_64"
runtimeOnly "io.netty:netty-codec-native-quic:${versions.netty}:linux-aarch_64"
runtimeOnly "io.netty:netty-codec-native-quic:${versions.netty}:osx-x86_64"
runtimeOnly "io.netty:netty-codec-native-quic:${versions.netty}:osx-aarch_64"
runtimeOnly "io.netty:netty-codec-native-quic:${versions.netty}:windows-x86_64"
}

restResources {
Expand Down Expand Up @@ -205,7 +216,9 @@ thirdPartyAudit {

'io.netty.pkitesting.CertificateBuilder',
'io.netty.pkitesting.CertificateBuilder$Algorithm',
'io.netty.pkitesting.X509Bundle'
'io.netty.pkitesting.X509Bundle',

'io.netty.channel.epoll.SegmentedDatagramPacket'
)

ignoreViolations(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
98e80e8a575aa5cacd0db278a91fc4b34e4721fe
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c9b6155713d6017a21e71dea3e041c4143facf5c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7ecd8d1de6b3eb7eeb3dcdb1034780826e141f1c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6a3e4398852f926c4b22f381d89dae2388446ae8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c30d746bd588c07bac4ac04abde576c05a3c0a28
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3679a6cc103292931098b1dc835ffb831e27368
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c4f177d2a99668c209acc31b8b85df58e9166218
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6a7141d5fab45c8d2f6c646965f2dd53a43b41e
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ public HttpVersion protocolVersion() {
return HttpRequest.HttpVersion.HTTP_1_1;
} else if (request.protocolVersion().equals("HTTP/2.0")) {
return HttpRequest.HttpVersion.HTTP_2_0;
} else if (request.protocolVersion().equals("HTTP/3.0")) {
return HttpRequest.HttpVersion.HTTP_3_0;
} else {
throw new IllegalArgumentException("Unexpected http protocol version: " + request.protocolVersion());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
package org.opensearch.http.netty4;

import org.opensearch.ExceptionsHelper;
import org.opensearch.http.AbstractHttpServerTransport;
import org.opensearch.http.HttpPipelinedRequest;

import io.netty.channel.ChannelHandler;
Expand All @@ -42,9 +43,9 @@
@ChannelHandler.Sharable
class Netty4HttpRequestHandler extends SimpleChannelInboundHandler<HttpPipelinedRequest> {

private final Netty4HttpServerTransport serverTransport;
private final AbstractHttpServerTransport serverTransport;

Netty4HttpRequestHandler(Netty4HttpServerTransport serverTransport) {
Netty4HttpRequestHandler(AbstractHttpServerTransport serverTransport) {
this.serverTransport = serverTransport;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public class Netty4HttpServerTransport extends AbstractHttpServerTransport {

/**
* Creates new HTTP transport implementations based on Netty 4
* @param settings seetings
* @param settings settings
* @param networkService network service
* @param bigArrays big array allocator
* @param threadPool thread pool instance
Expand Down
Loading
Loading