Skip to content

Commit efcd8bd

Browse files
authored
[1.17] cherrypick fix(ollama): bump contrib version for ollama tool call fix (#9345)
* fix: address conflict with release branch on cherry pick Signed-off-by: Samantha Coyle <sam@diagrid.io> * fix: pin testify to prevent unit test failures Signed-off-by: Samantha Coyle <sam@diagrid.io> --------- Signed-off-by: Samantha Coyle <sam@diagrid.io>
1 parent 1251b4c commit efcd8bd

8 files changed

Lines changed: 164 additions & 168 deletions

File tree

go.mod

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/cenkalti/backoff/v4 v4.3.0
1414
github.com/cloudevents/sdk-go/v2 v2.15.2
1515
github.com/coreos/go-oidc/v3 v3.14.1
16-
github.com/dapr/components-contrib v1.16.2-0.20260121142358-4d749a667028
16+
github.com/dapr/components-contrib v1.16.2-0.20260122185903-e25a3f9f55b2
1717
github.com/dapr/durabletask-go v0.10.2-0.20260119163530-cade81f308db
1818
github.com/dapr/kit v0.16.2-0.20251124175541-3ac186dff64d
1919
github.com/diagridio/go-etcd-cron v0.10.1-0.20260105221246-ee8c118dd834
@@ -50,28 +50,28 @@ require (
5050
github.com/spf13/cast v1.8.0
5151
github.com/spf13/pflag v1.0.6
5252
github.com/spiffe/go-spiffe/v2 v2.5.0
53-
github.com/stretchr/testify v1.10.0
53+
github.com/stretchr/testify v1.11.1
5454
github.com/tmc/langchaingo v0.1.15-0.20251029190607-e35755df7084
5555
go.etcd.io/etcd/api/v3 v3.5.21
5656
go.etcd.io/etcd/client/pkg/v3 v3.5.21
5757
go.etcd.io/etcd/client/v3 v3.5.21
5858
go.etcd.io/etcd/server/v3 v3.5.21
5959
go.mongodb.org/mongo-driver v1.14.0
6060
go.opencensus.io v0.24.0
61-
go.opentelemetry.io/otel v1.36.0
61+
go.opentelemetry.io/otel v1.39.0
6262
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
6363
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
6464
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0
6565
go.opentelemetry.io/otel/exporters/zipkin v1.34.0
66-
go.opentelemetry.io/otel/sdk v1.36.0
67-
go.opentelemetry.io/otel/trace v1.36.0
66+
go.opentelemetry.io/otel/sdk v1.39.0
67+
go.opentelemetry.io/otel/trace v1.39.0
6868
go.opentelemetry.io/proto/otlp v1.6.0
6969
go.uber.org/automaxprocs v1.6.0
7070
go.uber.org/ratelimit v0.3.0
71-
golang.org/x/crypto v0.45.0
72-
golang.org/x/net v0.47.0
71+
golang.org/x/crypto v0.47.0
72+
golang.org/x/net v0.48.0
7373
golang.org/x/oauth2 v0.30.0
74-
golang.org/x/sync v0.18.0
74+
golang.org/x/sync v0.19.0
7575
gonum.org/v1/plot v0.16.0
7676
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9
7777
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822
@@ -327,7 +327,7 @@ require (
327327
github.com/josharian/intern v1.0.0 // indirect
328328
github.com/json-iterator/go v1.1.12 // indirect
329329
github.com/k0kubun/pp v3.0.1+incompatible // indirect
330-
github.com/klauspost/compress v1.18.0 // indirect
330+
github.com/klauspost/compress v1.18.3 // indirect
331331
github.com/knadh/koanf v1.4.1 // indirect
332332
github.com/kr/fs v0.1.0 // indirect
333333
github.com/kubemq-io/kubemq-go v1.7.9 // indirect
@@ -342,7 +342,7 @@ require (
342342
github.com/lestrrat-go/option v1.0.1 // indirect
343343
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
344344
github.com/linkedin/goavro/v2 v2.14.1 // indirect
345-
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
345+
github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
346346
github.com/machinebox/graphql v0.2.2 // indirect
347347
github.com/magiconair/properties v1.8.10 // indirect
348348
github.com/mailru/easyjson v0.7.7 // indirect
@@ -403,7 +403,7 @@ require (
403403
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
404404
github.com/shoenig/go-m1cpu v0.1.6 // indirect
405405
github.com/sijms/go-ora/v2 v2.8.22 // indirect
406-
github.com/sirupsen/logrus v1.9.3 // indirect
406+
github.com/sirupsen/logrus v1.9.4 // indirect
407407
github.com/soheilhy/cmux v0.1.5 // indirect
408408
github.com/sourcegraph/conc v0.3.0 // indirect
409409
github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -421,8 +421,8 @@ require (
421421
github.com/tidwall/pretty v1.2.1 // indirect
422422
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde // indirect
423423
github.com/tjfoc/gmsm v1.3.2 // indirect
424-
github.com/tklauser/go-sysconf v0.3.15 // indirect
425-
github.com/tklauser/numcpus v0.10.0 // indirect
424+
github.com/tklauser/go-sysconf v0.3.16 // indirect
425+
github.com/tklauser/numcpus v0.11.0 // indirect
426426
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
427427
github.com/valyala/bytebufferpool v1.0.0 // indirect
428428
github.com/valyala/fasthttp v1.53.0 // indirect
@@ -444,24 +444,24 @@ require (
444444
go.etcd.io/etcd/client/v2 v2.305.21 // indirect
445445
go.etcd.io/etcd/pkg/v3 v3.5.21 // indirect
446446
go.etcd.io/etcd/raft/v3 v3.5.21 // indirect
447-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
447+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
448448
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
449449
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
450-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
451-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
452-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
450+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
451+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
452+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
453453
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
454454
go.uber.org/atomic v1.11.0 // indirect
455455
go.uber.org/multierr v1.11.0 // indirect
456456
go.uber.org/zap v1.27.0 // indirect
457457
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
458458
golang.org/x/image v0.25.0 // indirect
459-
golang.org/x/mod v0.29.0 // indirect
460-
golang.org/x/sys v0.38.0 // indirect
461-
golang.org/x/term v0.37.0 // indirect
462-
golang.org/x/text v0.31.0 // indirect
459+
golang.org/x/mod v0.31.0 // indirect
460+
golang.org/x/sys v0.40.0 // indirect
461+
golang.org/x/term v0.39.0 // indirect
462+
golang.org/x/text v0.33.0 // indirect
463463
golang.org/x/time v0.11.0 // indirect
464-
golang.org/x/tools v0.38.0 // indirect
464+
golang.org/x/tools v0.40.0 // indirect
465465
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
466466
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
467467
google.golang.org/api v0.231.0 // indirect
@@ -510,6 +510,9 @@ replace (
510510
github.com/toolkits/concurrent => github.com/niean/gotools v0.0.0-20151221085310-ff3f51fc5c60
511511
)
512512

513+
// this fixes a testify regression causing unit test failures
514+
replace github.com/stretchr/testify => github.com/stretchr/testify v1.10.0
515+
513516
// update retracted indirect dependencies if necessary
514517
// check for retracted versions: go list -mod=mod -f '{{if .Retracted}}{{.}}{{end}}' -u -m all
515518

0 commit comments

Comments
 (0)