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

add version 9 to avoid the check with version 8 #3544

Closed
wants to merge 2 commits into from
Closed

add version 9 to avoid the check with version 8 #3544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d9b42a
add version 9 to avoid the check with version 8
Feb 14, 2023
d29d352
Merge branch 'openzipkin:master' into feature/es
michael-wirth Jun 9, 2023
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
1 change: 1 addition & 0 deletions zipkin-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/ElasticsearchVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public final class ElasticsearchVersion implements Comparable<ElasticsearchVersi
public static final ElasticsearchVersion V7_0 = new ElasticsearchVersion(7, 0);
public static final ElasticsearchVersion V7_8 = new ElasticsearchVersion(7, 8);
public static final ElasticsearchVersion V8_0 = new ElasticsearchVersion(8, 0);
public static final ElasticsearchVersion V9_0 = new ElasticsearchVersion(9, 0);

static ElasticsearchVersion get(HttpCall.Factory http) throws IOException {
return Parser.INSTANCE.get(http);
Expand Down
4 changes: 3 additions & 1 deletion ...n-storage/elasticsearch/src/main/java/zipkin2/elasticsearch/VersionSpecificTemplates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import static zipkin2.elasticsearch.ElasticsearchVersion.V7_0;
import static zipkin2.elasticsearch.ElasticsearchVersion.V7_8;
import static zipkin2.elasticsearch.ElasticsearchVersion.V8_0;
import static zipkin2.elasticsearch.ElasticsearchVersion.V9_0;


/** Returns version-specific index templates */
// TODO: make a main class that spits out the index template using ENV variables for the server,
Expand Down Expand Up @@ -223,7 +225,7 @@ String autocompleteTemplate(ElasticsearchVersion version) {
}

IndexTemplates get(ElasticsearchVersion version) {
if (version.compareTo(V5_0) < 0 || version.compareTo(V8_0) >= 0) {
if (version.compareTo(V5_0) < 0 || version.compareTo(V9_0) >= 0) {
throw new IllegalArgumentException(
"Elasticsearch versions 5-7.x are supported, was: " + version);
}
Expand Down