Skip to content

Commit ffc6dcf

Browse files
MattDevyMattDevy
committed
feat: add Close method to BaseClient (#1056)
(cherry picked from commit 9d9d191)
1 parent 1a0831d commit ffc6dcf

Some content is hidden

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

63 files changed

+1013
-151
lines changed

‎.doc/typedapi/esql.asciidoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import (
7777
"context"
7878
"fmt"
7979
"log"
80+
"time"
8081
8182
"github.com/elastic/go-elasticsearch/v8"
8283
"github.com/elastic/go-elasticsearch/v8/typedapi/esql/query"
@@ -94,6 +95,13 @@ func main() {
9495
if err != nil {
9596
log.Fatal(err)
9697
}
98+
defer func() {
99+
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
100+
defer cancel()
101+
if err := client.Close(ctx); err != nil {
102+
log.Fatal(err)
103+
}
104+
} ()
97105
98106
queryAuthor := `from library
99107
| where author == "Isaac Asimov"

‎Makefile‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,7 @@ test-examples: ## Execute the _examples
127127
false; \
128128
); \
129129
done; \
130-
);\
131-
# \
132-
# for f in _examples/*/; do \
133-
# printf "\033[2m────────────────────────────────────────────────────────────────────────────────\033[0m\n"; \
134-
# printf "\033[1m$$f\033[0m\n"; \
135-
# printf "\033[2m────────────────────────────────────────────────────────────────────────────────\033[0m\n"; \
136-
# (cd $$f && make test && true) || \
137-
# ( \
138-
# printf "\033[31m────────────────────────────────────────────────────────────────────────────────\033[0m\n"; \
139-
# printf "\033[31;1m⨯ ERROR\033[0m\n"; \
140-
# false; \
141-
# ); \
142-
# done; \
130+
); \
143131
printf "\033[32m────────────────────────────────────────────────────────────────────────────────\033[0m\n"; \
144132
\
145133
printf "\033[32;1mSUCCESS\033[0m\n"; \

‎_benchmarks/benchmarks/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.24.1
77
replace github.com/elastic/go-elasticsearch/v8 => ../../
88

99
require (
10-
github.com/elastic/elastic-transport-go/v8 v8.7.0
10+
github.com/elastic/elastic-transport-go/v8 v8.8.0
1111
github.com/elastic/go-elasticsearch/v8 v8.0.0-20200408073057-6f36a473b19f
1212
github.com/fatih/color v1.7.0
1313
github.com/montanaflynn/stats v0.6.3

‎_examples/bulk/benchmarks/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ replace github.com/elastic/go-elasticsearch/v8 => ../../..
99
require (
1010
github.com/dustin/go-humanize v1.0.0
1111
github.com/elastic/go-elasticsearch/v8 v8.0.0-20210817150010-57d659deaca7
12-
github.com/elastic/go-elasticsearch/v9 v9.0.0-20250416133943-b5adae5afb7e
13-
github.com/mailru/easyjson v0.7.1
1412
github.com/montanaflynn/stats v0.6.3
1513
)
1614

1715
require (
18-
github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
16+
github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect
1917
github.com/go-logr/logr v1.4.2 // indirect
2018
github.com/go-logr/stdr v1.2.2 // indirect
2119
go.opentelemetry.io/auto/sdk v1.1.0 // indirect

‎_examples/bulk/benchmarks/go.sum‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
44
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
5-
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
6-
github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
7-
github.com/elastic/go-elasticsearch/v9 v9.0.0-20250416133943-b5adae5afb7e h1:03JFpKZ9QocRhW3CdOJxxQBAZJxlXQEXVf7Fo4mcQPE=
8-
github.com/elastic/go-elasticsearch/v9 v9.0.0-20250416133943-b5adae5afb7e/go.mod h1:2PB5YQPpY5tWbF65MRqzEXA31PZOdXCkloQSOZtU14I=
5+
github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
6+
github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
97
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
108
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
119
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1210
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
1311
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
1412
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1513
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
16-
github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
17-
github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
1814
github.com/montanaflynn/stats v0.6.3 h1:F8446DrvIF5V5smZfZ8K9nrmmix0AFgevPdLruGOmzk=
1915
github.com/montanaflynn/stats v0.6.3/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
2016
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

‎_examples/bulk/default.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ package main
3333

3434
import (
3535
"bytes"
36+
"context"
3637
"encoding/json"
3738
"flag"
3839
"fmt"
@@ -125,6 +126,13 @@ func main() {
125126
if err != nil {
126127
log.Fatalf("Error creating the client: %s", err)
127128
}
129+
defer func() {
130+
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
131+
defer cancel()
132+
if err := es.Close(ctx); err != nil {
133+
log.Fatalf("Error closing the client: %s", err)
134+
}
135+
}()
128136

129137
// Generate the articles collection
130138
//

‎_examples/bulk/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
)
1414

1515
require (
16-
github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
16+
github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect
1717
github.com/go-logr/logr v1.4.2 // indirect
1818
github.com/go-logr/stdr v1.2.2 // indirect
1919
go.opentelemetry.io/otel v1.28.0 // indirect

‎_examples/bulk/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
66
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
7-
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
8-
github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
7+
github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
8+
github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
99
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
1010
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
1111
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

‎_examples/bulk/kafka/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414

1515
require (
1616
github.com/armon/go-radix v1.0.0 // indirect
17-
github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
17+
github.com/elastic/elastic-transport-go/v8 v8.8.0 // indirect
1818
github.com/elastic/go-licenser v0.3.1 // indirect
1919
github.com/elastic/go-sysinfo v1.1.1 // indirect
2020
github.com/elastic/go-windows v1.0.0 // indirect

‎_examples/bulk/kafka/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
77
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
8-
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
9-
github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
8+
github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
9+
github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
1010
github.com/elastic/go-licenser v0.3.1 h1:RmRukU/JUmts+rpexAw0Fvt2ly7VVu6mw8z4HrEzObU=
1111
github.com/elastic/go-licenser v0.3.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ=
1212
github.com/elastic/go-sysinfo v1.1.1 h1:ZVlaLDyhVkDfjwPGU55CQRCRolNpc7P0BbyhhQZQmMI=

0 commit comments

Comments
 (0)