Skip to content

Commit fea76bd

Browse files
committed
Merge remote-tracking branch 'upstream/8.19' into fix-grok-test
* upstream/8.19: (62 commits) Use consistent terminology for transport version resources/references (elastic#132882) (elastic#132898) Move inner records out of TransportVersionUtils (elastic#132872) (elastic#132886) Forward port release notes for v8.18.5 (elastic#132758) Add more transport version files validation (elastic#132373) (elastic#132777) Forward port release notes for v8.17.10 (elastic#132760) Refactor TransportVersion loading to support external consumers (elastic#132694) (elastic#132862) manual backporting| (elastic#132783) 9.1 docs backports for 8.19 features (elastic#132605) Migrate x-pack-deprecation REST tests (elastic#131444) (elastic#132802) Update 8.19.1.asciidoc (elastic#132755) Update wolfi (versioned) (elastic#132752) Update 8.19.0.asciidoc (elastic#132754) Prune changelogs after 8.19.2 release Bump versions after 8.19.2 release Finalize release notes for v8.19.2 Bump versions after 8.17.10 release Prune changelogs after 8.18.5 release Bump versions after 8.18.5 release Add release notes for v8.19.2 release (elastic#132696) [ML] Improve EIS auth call logs and fix revocation bug (elastic#132546) (elastic#132690) ...
2 parents 91afb79 + 3c5698b commit fea76bd

File tree

244 files changed

+4849
-1230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+4849
-1230
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v8.19.1$" : "main",
6+
"^v8.19.3$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["7.17.30", "8.17.9", "8.18.5", "8.19.1"]
68+
BWC_VERSION: ["7.17.30", "8.17.11", "8.18.6", "8.19.3"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-fwc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["8.19.0"]
13+
FWC_VERSION: ["8.19.0", "8.19.1", "8.19.2"]
1414
env:
1515
FWC_VERSION: $FWC_VERSION

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,8 @@ steps:
593593
env:
594594
BWC_VERSION: 8.16.6
595595

596-
- label: "{{matrix.image}} / 8.17.9 / packaging-tests-upgrade"
597-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.9
596+
- label: "{{matrix.image}} / 8.17.11 / packaging-tests-upgrade"
597+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.11
598598
timeout_in_minutes: 300
599599
matrix:
600600
setup:
@@ -607,10 +607,10 @@ steps:
607607
machineType: custom-16-32768
608608
buildDirectory: /dev/shm/bk
609609
env:
610-
BWC_VERSION: 8.17.9
610+
BWC_VERSION: 8.17.11
611611

612-
- label: "{{matrix.image}} / 8.18.5 / packaging-tests-upgrade"
613-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.5
612+
- label: "{{matrix.image}} / 8.18.6 / packaging-tests-upgrade"
613+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.6
614614
timeout_in_minutes: 300
615615
matrix:
616616
setup:
@@ -623,10 +623,10 @@ steps:
623623
machineType: custom-16-32768
624624
buildDirectory: /dev/shm/bk
625625
env:
626-
BWC_VERSION: 8.18.5
626+
BWC_VERSION: 8.18.6
627627

628-
- label: "{{matrix.image}} / 8.19.1 / packaging-tests-upgrade"
629-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.1
628+
- label: "{{matrix.image}} / 8.19.3 / packaging-tests-upgrade"
629+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.3
630630
timeout_in_minutes: 300
631631
matrix:
632632
setup:
@@ -639,7 +639,7 @@ steps:
639639
machineType: custom-16-32768
640640
buildDirectory: /dev/shm/bk
641641
env:
642-
BWC_VERSION: 8.19.1
642+
BWC_VERSION: 8.19.3
643643

644644
- group: packaging-tests-windows
645645
steps:

.buildkite/pipelines/periodic.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ steps:
230230
image: family/elasticsearch-ubuntu-2404
231231
machineType: n2-standard-8
232232
buildDirectory: /dev/shm/bk
233-
if: build.branch == "main" || build.branch == "8.19" || build.branch == "7.17"
233+
if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
234234
- label: check-branch-consistency
235235
command: .ci/scripts/run-gradle.sh branchConsistency
236236
timeout_in_minutes: 15

.buildkite/pipelines/periodic.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,8 @@ steps:
667667
- signal_reason: agent_stop
668668
limit: 3
669669

670-
- label: 8.17.9 / bwc
671-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.9#bwcTest
670+
- label: 8.17.11 / bwc
671+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.11#bwcTest
672672
timeout_in_minutes: 300
673673
agents:
674674
provider: gcp
@@ -677,7 +677,7 @@ steps:
677677
buildDirectory: /dev/shm/bk
678678
preemptible: true
679679
env:
680-
BWC_VERSION: 8.17.9
680+
BWC_VERSION: 8.17.11
681681
retry:
682682
automatic:
683683
- exit_status: "-1"
@@ -686,8 +686,8 @@ steps:
686686
- signal_reason: agent_stop
687687
limit: 3
688688

689-
- label: 8.18.5 / bwc
690-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.5#bwcTest
689+
- label: 8.18.6 / bwc
690+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.6#bwcTest
691691
timeout_in_minutes: 300
692692
agents:
693693
provider: gcp
@@ -696,7 +696,7 @@ steps:
696696
buildDirectory: /dev/shm/bk
697697
preemptible: true
698698
env:
699-
BWC_VERSION: 8.18.5
699+
BWC_VERSION: 8.18.6
700700
retry:
701701
automatic:
702702
- exit_status: "-1"
@@ -705,8 +705,8 @@ steps:
705705
- signal_reason: agent_stop
706706
limit: 3
707707

708-
- label: 8.19.1 / bwc
709-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.1#bwcTest
708+
- label: 8.19.3 / bwc
709+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.3#bwcTest
710710
timeout_in_minutes: 300
711711
agents:
712712
provider: gcp
@@ -715,7 +715,7 @@ steps:
715715
buildDirectory: /dev/shm/bk
716716
preemptible: true
717717
env:
718-
BWC_VERSION: 8.19.1
718+
BWC_VERSION: 8.19.3
719719
retry:
720720
automatic:
721721
- exit_status: "-1"
@@ -791,7 +791,7 @@ steps:
791791
setup:
792792
ES_RUNTIME_JAVA:
793793
- openjdk17
794-
BWC_VERSION: ["7.17.30", "8.17.9", "8.18.5", "8.19.1"]
794+
BWC_VERSION: ["7.17.30", "8.17.11", "8.18.6", "8.19.3"]
795795
agents:
796796
provider: gcp
797797
image: family/elasticsearch-ubuntu-2404
@@ -840,7 +840,7 @@ steps:
840840
- openjdk21
841841
- openjdk22
842842
- openjdk23
843-
BWC_VERSION: ["7.17.30", "8.17.9", "8.18.5", "8.19.1"]
843+
BWC_VERSION: ["7.17.30", "8.17.11", "8.18.6", "8.19.3"]
844844
agents:
845845
provider: gcp
846846
image: family/elasticsearch-ubuntu-2404
@@ -953,7 +953,7 @@ steps:
953953
image: family/elasticsearch-ubuntu-2404
954954
machineType: n2-standard-8
955955
buildDirectory: /dev/shm/bk
956-
if: build.branch == "main" || build.branch == "8.19" || build.branch == "7.17"
956+
if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
957957
- label: check-branch-consistency
958958
command: .ci/scripts/run-gradle.sh branchConsistency
959959
timeout_in_minutes: 15

.ci/bwcVersions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ BWC_VERSION:
3434
- "8.14.3"
3535
- "8.15.5"
3636
- "8.16.6"
37-
- "8.17.9"
38-
- "8.18.5"
39-
- "8.19.1"
37+
- "8.17.11"
38+
- "8.18.6"
39+
- "8.19.3"

.ci/snapshotBwcVersions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
22
- "7.17.30"
3-
- "8.17.9"
4-
- "8.18.5"
5-
- "8.19.1"
3+
- "8.17.11"
4+
- "8.18.6"
5+
- "8.19.3"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,4 @@ testfixtures_shared/
6969
# Generated
7070
checkstyle_ide.xml
7171
x-pack/plugin/esql/src/main/generated-src/generated/
72+
server/src/main/resources/transport/defined/manifest.txt
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.benchmark.xcontent;
11+
12+
import org.elasticsearch.common.bytes.BytesReference;
13+
import org.elasticsearch.common.io.Streams;
14+
import org.elasticsearch.xcontent.XContentParser;
15+
import org.elasticsearch.xcontent.XContentParserConfiguration;
16+
import org.elasticsearch.xcontent.XContentType;
17+
import org.openjdk.jmh.annotations.Benchmark;
18+
import org.openjdk.jmh.annotations.BenchmarkMode;
19+
import org.openjdk.jmh.annotations.Fork;
20+
import org.openjdk.jmh.annotations.Level;
21+
import org.openjdk.jmh.annotations.Measurement;
22+
import org.openjdk.jmh.annotations.Mode;
23+
import org.openjdk.jmh.annotations.OutputTimeUnit;
24+
import org.openjdk.jmh.annotations.Scope;
25+
import org.openjdk.jmh.annotations.Setup;
26+
import org.openjdk.jmh.annotations.State;
27+
import org.openjdk.jmh.annotations.Warmup;
28+
import org.openjdk.jmh.infra.Blackhole;
29+
30+
import java.io.IOException;
31+
import java.util.Arrays;
32+
import java.util.Collections;
33+
import java.util.List;
34+
import java.util.Map;
35+
import java.util.Random;
36+
import java.util.concurrent.TimeUnit;
37+
import java.util.stream.Collectors;
38+
39+
@Fork(1)
40+
@Warmup(iterations = 5)
41+
@Measurement(iterations = 10)
42+
@BenchmarkMode(Mode.AverageTime)
43+
@OutputTimeUnit(TimeUnit.NANOSECONDS)
44+
@State(Scope.Thread)
45+
public class JsonParserBenchmark {
46+
private Map<String, BytesReference> sourceBytes;
47+
private BytesReference source;
48+
private Random random;
49+
private List<String> sourcesRandomized;
50+
51+
final String[] sources = new String[] { "monitor_cluster_stats.json", "monitor_index_stats.json", "monitor_node_stats.json" };
52+
53+
@Setup(Level.Iteration)
54+
public void randomizeSource() {
55+
sourcesRandomized = Arrays.asList(sources);
56+
Collections.shuffle(sourcesRandomized, random);
57+
}
58+
59+
@Setup(Level.Trial)
60+
public void setup() throws IOException {
61+
random = new Random();
62+
sourceBytes = Arrays.stream(sources).collect(Collectors.toMap(s -> s, s -> {
63+
try {
64+
return readSource(s);
65+
} catch (IOException e) {
66+
throw new RuntimeException(e);
67+
}
68+
}));
69+
}
70+
71+
@Benchmark
72+
public void parseJson(Blackhole bh) throws IOException {
73+
sourcesRandomized.forEach(source -> {
74+
try {
75+
final XContentParser parser = XContentType.JSON.xContent()
76+
.createParser(XContentParserConfiguration.EMPTY, sourceBytes.get(source).streamInput());
77+
bh.consume(parser.mapOrdered());
78+
} catch (IOException e) {
79+
throw new RuntimeException(e);
80+
}
81+
});
82+
}
83+
84+
private BytesReference readSource(String fileName) throws IOException {
85+
return Streams.readFully(JsonParserBenchmark.class.getResourceAsStream(fileName));
86+
}
87+
}

0 commit comments

Comments
 (0)