Skip to content

Commit 4bdffd7

Browse files
renovate-botamol-verma-allen
authored andcommitted
Update module github.com/elastic/go-elasticsearch/v8 to v9 (jaegertracing#7041)
This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/elastic/go-elasticsearch/v8](https://redirect.github.com/elastic/go-elasticsearch) | `v8.17.1` -> `v9.0.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v9.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v9.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.1/v9.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2felastic%2fgo-elasticsearch%2fv8/v8.17.1/v9.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>elastic/go-elasticsearch (github.com/elastic/go-elasticsearch/v8)</summary> ### [`v9.0.0`](https://redirect.github.com/elastic/go-elasticsearch/releases/tag/v9.0.0): 9.0.0 [Compare Source](https://redirect.github.com/elastic/go-elasticsearch/compare/v8.18.0...v9.0.0) - The client now requires **Go 1.23** or later. #### New - This release introduces an optional package for the `TypedAPI` named `esdsl`.\ It provides a domain-specific language (DSL) for building Elasticsearch queries in Go.\ The DSL is designed to simplify query construction, making it easier to build complex queries without writing raw JSON. ```go // create index { // delete index if exists if existsRes, err := es.Indices.Exists("test").IsSuccess(context.Background()); err != nil { log.Println(err) return } else if existsRes { if ok, _ := es.Indices.Delete("test").IsSuccess(context.Background()); !ok { log.Fatalf("Error deleting index: %v\n", err) } log.Println("Index deleted:", "test") } else { log.Println("Index does not exist:", "test") } mappings := esdsl.NewTypeMapping(). AddProperty("name", esdsl.NewTextProperty()). AddProperty("age", esdsl.NewIntegerNumberProperty()) createRes, err := es.Indices.Create("test").Mappings(mappings).Do(context.Background()) if err != nil { log.Println(err) return } log.Printf("Index created: %#v\n", createRes) } // index document { documents := []Document{ {"Alice", 30}, {"Bob", 25}, {"Charlie", 35}, } bulk := es.Bulk().Index("test") for _, document := range documents { err := bulk.IndexOp(types.IndexOperation{}, document) if err != nil { log.Println("Error indexing document:", err) } } bulkRes, err := bulk.Refresh(refresh.Waitfor).Do(context.Background()) if err != nil { log.Println(err) return } if bulkRes.Errors { log.Println("Some documents failed to index") for _, item := range bulkRes.Items { for operationType, responseItem := range item { if responseItem.Error != nil { log.Println("Operation:", operationType) log.Println("Response:", responseItem) } } } } indexedDocs := 0 for _, item := range bulkRes.Items { for _, responseItem := range item { if responseItem.Error == nil { indexedDocs++ } } } log.Println("Documents indexed:", indexedDocs) } // calculate median age { searchRes, err := es.Search(). Index("test"). Size(0). AddAggregation("median_age", esdsl.NewPercentilesAggregation().Field("age").Percents(50)). Do(context.Background()) if err != nil { log.Println(err) return } if agg, ok := searchRes.Aggregations["median_age"].(*types.TDigestPercentilesAggregate); ok { if val, ok := agg.Values.(map[string]interface{})["50.0"]; ok { log.Println("Median age:", val) } } } // search documents { matchRes, err := es.Search(). Index("test"). Query(esdsl.NewBoolQuery(). Must(esdsl.NewMatchQuery("name", "Alice")). Filter(esdsl.NewNumberRangeQuery("age").Gte(20).Lte(40))). Sort(esdsl.NewSortOptions().AddSortOption("age", esdsl.NewFieldSort(sortorder.Asc))). Size(10). Do(context.Background()) if err != nil { log.Println(err) return } if matchRes.Hits.Total.Value > 0 { for _, hit := range matchRes.Hits.Hits { doc := Document{} err := json.Unmarshal(hit.Source_, &doc) if err != nil { log.Println("Error unmarshalling document:", err) continue } log.Printf("Document ID: %s, Name: %s, Age: %d\n", *hit.Id_, doc.Name, doc.Age) } } else { log.Println("No documents found") } } ``` ### API - Updated APIs to 9.0.0 ### Typed API - Update APIs to 9.0.0 ([52c473e](https://redirect.github.com/elastic/elasticsearch-specification/tree/52c473efb1fb5320a5bac12572d0b285882862fb)) ### [`v8.18.0`](https://redirect.github.com/elastic/go-elasticsearch/releases/tag/v8.18.0): 8.18.0 [Compare Source](https://redirect.github.com/elastic/go-elasticsearch/compare/v8.17.1...v8.18.0) - Update `elastictransport` to `8.7.0`. - Thanks to [@&#8203;zaneli](https://redirect.github.com/zaneli), the `TypedClient` can now be used in the `BulkIndexer`. ### New - This release adds a `BaseClient` constructor with no attached APIs, allowing it to be used purely as a transport layer instead of a full-featured API client. ```go baseClient, err := elasticsearch.NewBaseClient(elasticsearch.Config{ Addresses: []string{ "http://localhost:9200", }, }) if err != nil { log.Println(err) return } res, err := esapi.InfoRequest{ Pretty: false, Human: false, ErrorTrace: false, FilterPath: nil, Header: nil, Instrument: baseClient.InstrumentationEnabled(), }.Do(context.Background(), baseClient) if err != nil { log.Println(err) return } defer res.Body.Close() if res.IsError() { log.Println("Error response:", res) return } var infoMap map[string]interface{} if err := json.NewDecoder(res.Body).Decode(&infoMap); err != nil { log.Println("Error parsing response:", err) return } log.Printf("Elasticsearch version esapi: %s\n", infoMap["version"].(map[string]interface{})["number"]) typedRes, err := info.New(baseClient).Do(context.Background()) if err != nil { log.Println(err) return } log.Printf("Elasticsearch version typedapi: %s\n", typedRes.Version.Int) ``` ### API - Updated APIs to 8.18.0 ### Typed API - Update APIs to 8.18.0 ([f6a370d](https://redirect.github.com/elastic/elasticsearch-specification/tree/f6a370d0fba975752c644fc730f7c45610e28f36)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/jaegertracing/jaeger). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yNDguNCIsInVwZGF0ZWRJblZlciI6IjM5LjI0OC40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJjaGFuZ2Vsb2c6ZGVwZW5kZW5jaWVzIl19--> Signed-off-by: Mend Renovate <[email protected]>
1 parent fe2dcdc commit 4bdffd7

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/bsm/sarama-cluster v2.1.13+incompatible
1313
github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b
1414
github.com/dgraph-io/badger/v4 v4.7.0
15-
github.com/elastic/go-elasticsearch/v8 v8.17.1
15+
github.com/elastic/go-elasticsearch/v9 v9.0.0
1616
github.com/fsnotify/fsnotify v1.9.0
1717
github.com/go-logr/zapr v1.3.0
1818
github.com/gocql/gocql v1.7.0
@@ -144,7 +144,7 @@ require (
144144
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
145145
github.com/eapache/queue v1.1.0 // indirect
146146
github.com/ebitengine/purego v0.8.2 // indirect
147-
github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect
147+
github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect
148148
github.com/elastic/go-grok v0.3.1 // indirect
149149
github.com/elastic/lunes v0.1.0 // indirect
150150
github.com/expr-lang/expr v1.17.2 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z
144144
github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
145145
github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
146146
github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
147-
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
148-
github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
149-
github.com/elastic/go-elasticsearch/v8 v8.17.1 h1:bOXChDoCMB4TIwwGqKd031U8OXssmWLT3UrAr9EGs3Q=
150-
github.com/elastic/go-elasticsearch/v8 v8.17.1/go.mod h1:MVJCtL+gJJ7x5jFeUmA20O7rvipX8GcQmo5iBcmaJn4=
147+
github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE=
148+
github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
149+
github.com/elastic/go-elasticsearch/v9 v9.0.0 h1:krpgPeJ2lC8apkaw6B58gKDYJq5eUhP8AMwpPt01Q/U=
150+
github.com/elastic/go-elasticsearch/v9 v9.0.0/go.mod h1:2PB5YQPpY5tWbF65MRqzEXA31PZOdXCkloQSOZtU14I=
151151
github.com/elastic/go-grok v0.3.1 h1:WEhUxe2KrwycMnlvMimJXvzRa7DoByJB4PVUIE1ZD/U=
152152
github.com/elastic/go-grok v0.3.1/go.mod h1:n38ls8ZgOboZRgKcjMY8eFeZFMmcL9n2lP0iHhIDk64=
153153
github.com/elastic/lunes v0.1.0 h1:amRtLPjwkWtzDF/RKzcEPMvSsSseLDLW+bnhfNSLRe4=

internal/storage/elasticsearch/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"time"
2020

2121
"github.com/asaskevich/govalidator"
22-
esV8 "github.com/elastic/go-elasticsearch/v8"
22+
esV8 "github.com/elastic/go-elasticsearch/v9"
2323
"github.com/olivere/elastic"
2424
"go.opentelemetry.io/collector/config/configtls"
2525
"go.uber.org/zap"

internal/storage/elasticsearch/wrapper/wrapper.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"net/http"
1111
"strings"
1212

13-
esV8 "github.com/elastic/go-elasticsearch/v8"
14-
esV8api "github.com/elastic/go-elasticsearch/v8/esapi"
13+
esV8 "github.com/elastic/go-elasticsearch/v9"
14+
esV8api "github.com/elastic/go-elasticsearch/v9/esapi"
1515
"github.com/olivere/elastic"
1616

1717
es "github.com/jaegertracing/jaeger/internal/storage/elasticsearch"

internal/storage/integration/elasticsearch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"testing"
1515
"time"
1616

17-
elasticsearch8 "github.com/elastic/go-elasticsearch/v8"
17+
elasticsearch8 "github.com/elastic/go-elasticsearch/v9"
1818
"github.com/olivere/elastic"
1919
"github.com/stretchr/testify/assert"
2020
"github.com/stretchr/testify/require"

internal/storage/integration/es_index_cleaner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14-
elasticsearch8 "github.com/elastic/go-elasticsearch/v8"
14+
elasticsearch8 "github.com/elastic/go-elasticsearch/v9"
1515
"github.com/olivere/elastic"
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"

0 commit comments

Comments
 (0)