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

Supports OpenSearch V2 through ES_* environment variables #229

Merged
merged 5 commits into from
May 25, 2024
Merged

Supports OpenSearch V2 through ES_* environment variables #229

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3523e3
Add Zipkin Dependencies support of OpenSearch storage
reta May 11, 2024
cb0954f
Implement Elasticsearch / OpenSearch storage auto detection to pick t…
reta May 15, 2024
9960350
Address code review comments: add ZipkinElasticsearchStorageTest
reta May 16, 2024
edee766
Address code review comments
reta May 17, 2024
a9bbc75
Address code review comments
reta May 18, 2024
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
6 changes: 1 addition & 5 deletions opensearch/src/test/java/zipkin2/storage/elasticsearch/OpensearchContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ class OpensearchContainer extends GenericContainer<OpensearchContainer> {
ElasticsearchStorage.Builder newStorageBuilder() {

WebClientBuilder builder = WebClient.builder("http://" + hostPort())
// Elasticsearch 7 never returns a response when receiving an HTTP/2 preface instead of the
// more valid behavior of returning a bad request response, so we can't use the preface.
//
// TODO: find or raise a bug with Elastic
.factory(ClientFactory.builder().useHttp2Preface(false).build());
.factory(ClientFactory.builder().build());
codefromthecrypt marked this conversation as resolved.
Show resolved Hide resolved
builder.decorator((delegate, ctx, req) -> {
final HttpResponse response = delegate.execute(ctx, req);
return HttpResponse.of(response.aggregate().thenApply(r -> {
Expand Down
Loading