From f042f31f8e5c6d3d0cfd0cb6920072791716ae24 Mon Sep 17 00:00:00 2001 From: StarpTech Date: Thu, 27 Feb 2025 20:21:47 +0100 Subject: [PATCH 1/6] fix(subscription): dont send on blocked channel --- router/go.mod | 2 +- router/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/router/go.mod b/router/go.mod index 7656a1a15f..b9ce2dfa09 100644 --- a/router/go.mod +++ b/router/go.mod @@ -31,7 +31,7 @@ require ( github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/twmb/franz-go v1.16.1 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be // Do not upgrade, it renames attributes we rely on go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/contrib/propagators/b3 v1.23.0 diff --git a/router/go.sum b/router/go.sum index d163db4337..c1bfdf3465 100644 --- a/router/go.sum +++ b/router/go.sum @@ -279,8 +279,8 @@ github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0 github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTBjW+SZK4mhxTTBVpxcqeBgWF1Rfmltbfk= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 h1:whZcpumOJNwJg71M56VGZ/Ex4TnYeGjmzhWa6+1X+uI= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= From 12a6b3920454a6ecd93a67d5e980803526629c75 Mon Sep 17 00:00:00 2001 From: StarpTech Date: Thu, 27 Feb 2025 21:00:07 +0100 Subject: [PATCH 2/6] fix(subscription): update mod files --- demo/go.mod | 2 +- demo/go.sum | 4 ++-- router-tests/go.mod | 2 +- router-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/go.mod b/demo/go.mod index 2d8683562d..bd05584bfb 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -13,7 +13,7 @@ require ( github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 diff --git a/demo/go.sum b/demo/go.sum index fd2360aac6..2be7b3af32 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -361,8 +361,8 @@ github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 h1:+kwYDe github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:fegv/vONTxD6SRweTJyQSBALVvyst1zI6DOhPj1vJsQ= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 h1:xWDcFs4dCLKgu6ZxW8ADeywL5B8vSLLdZEM8htitzDY= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:M9w5UOrQkB86E4ZYoLFhvl+04U83B4zm5r2TFtobHxc= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 h1:whZcpumOJNwJg71M56VGZ/Ex4TnYeGjmzhWa6+1X+uI= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/router-tests/go.mod b/router-tests/go.mod index 1b923900c7..9d515245b3 100644 --- a/router-tests/go.mod +++ b/router-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/twmb/franz-go/pkg/kadm v1.11.0 github.com/wundergraph/cosmo/demo v0.0.0-20250224092053-6698518f4e25 github.com/wundergraph/cosmo/router v0.0.0-20250224092053-6698518f4e25 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 diff --git a/router-tests/go.sum b/router-tests/go.sum index cbb2b43159..03a4ef5903 100644 --- a/router-tests/go.sum +++ b/router-tests/go.sum @@ -335,8 +335,8 @@ github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTB github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301 h1:EzfKHQoTjFDDcgaECCCR2aTePqMu9QBmPbyhqIYOhV0= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301/go.mod h1:wxI0Nak5dI5RvJuzGyiEK4nZj0O9X+Aw6U0tC1wPKq0= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160 h1:whZcpumOJNwJg71M56VGZ/Ex4TnYeGjmzhWa6+1X+uI= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= From 3e083e3b384581bca48010525eda64cde82ff5ac Mon Sep 17 00:00:00 2001 From: StarpTech Date: Fri, 28 Feb 2025 01:07:19 +0100 Subject: [PATCH 3/6] chore: update engine --- demo/go.mod | 2 +- demo/go.sum | 4 ++-- router-tests/go.mod | 2 +- router-tests/go.sum | 4 ++-- router/go.mod | 2 +- router/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/demo/go.mod b/demo/go.mod index bd05584bfb..c04f830cee 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -13,7 +13,7 @@ require ( github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 diff --git a/demo/go.sum b/demo/go.sum index 2be7b3af32..c28d907ca9 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -361,8 +361,8 @@ github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 h1:+kwYDe github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:fegv/vONTxD6SRweTJyQSBALVvyst1zI6DOhPj1vJsQ= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 h1:xWDcFs4dCLKgu6ZxW8ADeywL5B8vSLLdZEM8htitzDY= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:M9w5UOrQkB86E4ZYoLFhvl+04U83B4zm5r2TFtobHxc= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/router-tests/go.mod b/router-tests/go.mod index 9d515245b3..6a11eae8a8 100644 --- a/router-tests/go.mod +++ b/router-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/twmb/franz-go/pkg/kadm v1.11.0 github.com/wundergraph/cosmo/demo v0.0.0-20250224092053-6698518f4e25 github.com/wundergraph/cosmo/router v0.0.0-20250224092053-6698518f4e25 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 diff --git a/router-tests/go.sum b/router-tests/go.sum index 03a4ef5903..d12bc857c8 100644 --- a/router-tests/go.sum +++ b/router-tests/go.sum @@ -335,8 +335,8 @@ github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTB github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301 h1:EzfKHQoTjFDDcgaECCCR2aTePqMu9QBmPbyhqIYOhV0= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301/go.mod h1:wxI0Nak5dI5RvJuzGyiEK4nZj0O9X+Aw6U0tC1wPKq0= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/router/go.mod b/router/go.mod index b9ce2dfa09..6b330c43b0 100644 --- a/router/go.mod +++ b/router/go.mod @@ -31,7 +31,7 @@ require ( github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/twmb/franz-go v1.16.1 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 // Do not upgrade, it renames attributes we rely on go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/contrib/propagators/b3 v1.23.0 diff --git a/router/go.sum b/router/go.sum index c1bfdf3465..7a75e3de98 100644 --- a/router/go.sum +++ b/router/go.sum @@ -279,8 +279,8 @@ github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0 github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTBjW+SZK4mhxTTBVpxcqeBgWF1Rfmltbfk= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be h1:B31tsr0Ql7P8M29141mAVE2CDc+fqJ/85qKTkOOmaBE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250227191720-d0506c2894be/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= From ecf9c92b1e716540c06248996e451c18d8465cce Mon Sep 17 00:00:00 2001 From: StarpTech Date: Mon, 3 Mar 2025 16:04:22 +0100 Subject: [PATCH 4/6] chore: bump engine --- demo/go.mod | 2 +- demo/go.sum | 2 ++ router-tests/go.mod | 2 +- router-tests/go.sum | 4 ++-- router/go.mod | 2 +- router/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/demo/go.mod b/demo/go.mod index c04f830cee..50a9f5f3bf 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -11,7 +11,7 @@ require ( github.com/rs/cors v1.11.0 github.com/vektah/gqlparser/v2 v2.5.21 github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d - github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 + github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2 github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 diff --git a/demo/go.sum b/demo/go.sum index c28d907ca9..410137e2c8 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -359,6 +359,8 @@ github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d h github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d/go.mod h1:9I3gPMAlAY+m1/cFL20iN7XHTyuZd3VT5ijccdU/FsI= github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 h1:+kwYDe0/Tm10VTTAgGFXoeVHCnQVwPuKsHijtZKMD4Q= github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:fegv/vONTxD6SRweTJyQSBALVvyst1zI6DOhPj1vJsQ= +github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2 h1:sXeY8P6XkUUGhGqfJqrtscalUxXrkxJBPHcg9tF0Zf4= +github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2/go.mod h1:0DH3I7iEmMetqiBiyt4vSrGcLoJ6dudxYtvcWy6ylkQ= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 h1:xWDcFs4dCLKgu6ZxW8ADeywL5B8vSLLdZEM8htitzDY= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:M9w5UOrQkB86E4ZYoLFhvl+04U83B4zm5r2TFtobHxc= github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= diff --git a/router-tests/go.mod b/router-tests/go.mod index 6a11eae8a8..d32c8244f2 100644 --- a/router-tests/go.mod +++ b/router-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/twmb/franz-go/pkg/kadm v1.11.0 github.com/wundergraph/cosmo/demo v0.0.0-20250224092053-6698518f4e25 github.com/wundergraph/cosmo/router v0.0.0-20250224092053-6698518f4e25 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 diff --git a/router-tests/go.sum b/router-tests/go.sum index d12bc857c8..56cce32d7e 100644 --- a/router-tests/go.sum +++ b/router-tests/go.sum @@ -335,8 +335,8 @@ github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTB github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301 h1:EzfKHQoTjFDDcgaECCCR2aTePqMu9QBmPbyhqIYOhV0= github.com/wundergraph/consul/sdk v0.0.0-20250204115147-ed842a8fd301/go.mod h1:wxI0Nak5dI5RvJuzGyiEK4nZj0O9X+Aw6U0tC1wPKq0= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 h1:LdQ+xdZcz0kdu9t5arXlHKaSYXESfDKc3xUYjNwY0LU= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/router/go.mod b/router/go.mod index 6b330c43b0..521a17010e 100644 --- a/router/go.mod +++ b/router/go.mod @@ -31,7 +31,7 @@ require ( github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/twmb/franz-go v1.16.1 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 // Do not upgrade, it renames attributes we rely on go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/contrib/propagators/b3 v1.23.0 diff --git a/router/go.sum b/router/go.sum index 7a75e3de98..c0aeae25fc 100644 --- a/router/go.sum +++ b/router/go.sum @@ -279,8 +279,8 @@ github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0 github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTBjW+SZK4mhxTTBVpxcqeBgWF1Rfmltbfk= github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 h1:LdQ+xdZcz0kdu9t5arXlHKaSYXESfDKc3xUYjNwY0LU= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= From 485852290fb2052de61b58eba6a7724e8ca90f12 Mon Sep 17 00:00:00 2001 From: StarpTech Date: Mon, 3 Mar 2025 16:07:30 +0100 Subject: [PATCH 5/6] chore: mod tidy --- router-tests/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router-tests/go.mod b/router-tests/go.mod index d32c8244f2..fdf00f23b1 100644 --- a/router-tests/go.mod +++ b/router-tests/go.mod @@ -24,7 +24,7 @@ require ( github.com/twmb/franz-go v1.16.1 github.com/twmb/franz-go/pkg/kadm v1.11.0 github.com/wundergraph/cosmo/demo v0.0.0-20250224092053-6698518f4e25 - github.com/wundergraph/cosmo/router v0.0.0-20250224092053-6698518f4e25 + github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2 github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 From 0cbfc1bbbf201a4a6478e24cc940b7efb160cfde Mon Sep 17 00:00:00 2001 From: StarpTech Date: Mon, 3 Mar 2025 17:28:50 +0100 Subject: [PATCH 6/6] chore: mod tidy --- demo/go.mod | 2 +- demo/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/demo/go.mod b/demo/go.mod index 50a9f5f3bf..358bc066d4 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -13,7 +13,7 @@ require ( github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2 github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 - github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 + github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 go.opentelemetry.io/otel v1.28.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 diff --git a/demo/go.sum b/demo/go.sum index 410137e2c8..a63e3a5bf6 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -357,14 +357,12 @@ github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083 h1:8/D7f8gKxTB github.com/wundergraph/astjson v0.0.0-20250106123708-be463c97e083/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE= github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d h1:NEUrhuqOaTO1dpW8pz2tu6dKbQAqFvgiF/m4NXdzZm0= github.com/wundergraph/cosmo/composition-go v0.0.0-20240124120900-5effe48a4a1d/go.mod h1:9I3gPMAlAY+m1/cFL20iN7XHTyuZd3VT5ijccdU/FsI= -github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7 h1:+kwYDe0/Tm10VTTAgGFXoeVHCnQVwPuKsHijtZKMD4Q= -github.com/wundergraph/cosmo/router v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:fegv/vONTxD6SRweTJyQSBALVvyst1zI6DOhPj1vJsQ= github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2 h1:sXeY8P6XkUUGhGqfJqrtscalUxXrkxJBPHcg9tF0Zf4= github.com/wundergraph/cosmo/router v0.0.0-20250303135245-598fe84fddc2/go.mod h1:0DH3I7iEmMetqiBiyt4vSrGcLoJ6dudxYtvcWy6ylkQ= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7 h1:xWDcFs4dCLKgu6ZxW8ADeywL5B8vSLLdZEM8htitzDY= github.com/wundergraph/cosmo/router-tests v0.0.0-20250218093943-e5b2167f65c7/go.mod h1:M9w5UOrQkB86E4ZYoLFhvl+04U83B4zm5r2TFtobHxc= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950 h1:KdE9j3EnqdpmbgSRtj78v6P5NBhhigWBfZalcdoEWSs= -github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.160.0.20250228000229-7827b3b0c950/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162 h1:LdQ+xdZcz0kdu9t5arXlHKaSYXESfDKc3xUYjNwY0LU= +github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.162/go.mod h1:B7eV0Qh8Lop9QzIOQcsvKp3S0ejfC6mgyWoJnI917yQ= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=