Skip to content

Commit 8842f86

Browse files
tbuchaillotTyk Bot
authored andcommitted
TT-10153 Fix OTel memory leak (#5587)
<!-- Provide a general summary of your changes in the Title above --> <!-- Describe your changes in detail --> This PR updates the opentelemetry lib to the latest version (v0.0.19) which includes TykTechnologies/opentelemetry#32 and TykTechnologies/opentelemetry#30 fixes. <!-- This project only accepts pull requests related to open issues. --> <!-- If suggesting a new feature or change, please discuss it in an issue first. --> <!-- If fixing a bug, there should be an issue describing it with steps to reproduce. --> <!-- OSS: Please link to the issue here. Tyk: please create/link the JIRA ticket. --> https://tyktech.atlassian.net/browse/TT-10153 <!-- Why is this change required? What problem does it solve? --> https://tyktech.atlassian.net/browse/TT-10153 <!-- Please describe in detail how you tested your changes --> <!-- Include details of your testing environment, and the tests --> <!-- you ran to see how your change affects other areas of the code, etc. --> <!-- This information is helpful for reviewers and QA. --> <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Refactoring or add test (improvements in base code or adds test coverage to functionality) <!-- Go over all the following points, and put an `x` in all the boxes that apply --> <!-- If there are no documentation updates required, mark the item as checked. --> <!-- Raise up any additional concerns not covered by the checklist. --> - [ ] I ensured that the documentation is up to date - [ ] I explained why this PR updates go.mod in detail with reasoning why it's required - [ ] I would like a code coverage CI quality gate exception and have explained why (cherry picked from commit f380a39)
1 parent ba1024b commit 8842f86

2 files changed

Lines changed: 52 additions & 177 deletions

File tree

go.mod

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,17 @@ require (
6767
github.com/valyala/fasthttp v1.43.0 // test
6868
github.com/vmihailenco/msgpack v4.0.4+incompatible
6969
github.com/xeipuuv/gojsonschema v1.2.0
70+
<<<<<<< HEAD
7071
golang.org/x/crypto v0.10.0
7172
golang.org/x/net v0.11.0
7273
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
7374
google.golang.org/grpc v1.56.0
75+
=======
76+
golang.org/x/crypto v0.13.0
77+
golang.org/x/net v0.15.0
78+
golang.org/x/sync v0.3.0
79+
google.golang.org/grpc v1.58.0
80+
>>>>>>> f380a393... TT-10153 Fix OTel memory leak (#5587)
7481
google.golang.org/grpc/examples v0.0.0-20220317213542-f95b001a48df // test
7582
google.golang.org/protobuf v1.31.0
7683
gopkg.in/alecthomas/kingpin.v2 v2.2.6
@@ -81,7 +88,11 @@ require (
8188

8289
require (
8390
github.com/TykTechnologies/kin-openapi v0.90.0
91+
<<<<<<< HEAD
8492
github.com/TykTechnologies/opentelemetry v0.0.17
93+
=======
94+
github.com/TykTechnologies/opentelemetry v0.0.19
95+
>>>>>>> f380a393... TT-10153 Fix OTel memory leak (#5587)
8596
)
8697

8798
require (
@@ -173,17 +184,16 @@ require (
173184
github.com/valyala/bytebufferpool v1.0.0 // indirect
174185
github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect
175186
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
176-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
187+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
177188
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
178-
go.opentelemetry.io/otel v1.16.0 // indirect
179-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
180-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
181-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
183-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
184-
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
185-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
186-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
189+
go.opentelemetry.io/otel v1.19.0 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
191+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
192+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect
193+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
194+
go.opentelemetry.io/otel/sdk v1.18.0 // indirect
195+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
196+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
187197
go.uber.org/atomic v1.9.0 // indirect
188198
go.uber.org/multierr v1.6.0 // indirect
189199
go.uber.org/zap v1.18.1 // indirect
@@ -192,8 +202,8 @@ require (
192202
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
193203
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
194204
google.golang.org/appengine v1.6.7 // indirect
195-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
196-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
205+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
206+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
197207
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
198208
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
199209
gopkg.in/sourcemap.v1 v1.0.5 // indirect

0 commit comments

Comments
 (0)