Skip to content

Commit c189cc9

Browse files
EmyrkEmyrk
authored
chore: bump gopkg.in/DataDog/dd-trace-go.v1 from 1.57.0 to 1.61.0 (#12610)
* chore: bump gopkg.in/DataDog/dd-trace-go.v1 from 1.57.0 to 1.61.0 * Fix tracer implementation * Use alias vs 2 structs
1 parent b4c0fa8 commit c189cc9

File tree

3 files changed

+37
-7
lines changed

3 files changed

+37
-7
lines changed

‎coderd/tracing/httpmw_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"testing"
1010

1111
"go.opentelemetry.io/otel/trace"
12+
"go.opentelemetry.io/otel/trace/noop"
1213

1314
"github.com/go-chi/chi/v5"
1415
"github.com/stretchr/testify/require"
@@ -17,7 +18,13 @@ import (
1718
"github.com/coder/coder/v2/testutil"
1819
)
1920

21+
// noopTracer is just an alias because the fakeTracer implements a method
22+
// with the same name 'Tracer'. Kinda dumb, but this is a workaround.
23+
type noopTracer = noop.Tracer
24+
2025
type fakeTracer struct {
26+
noop.TracerProvider
27+
noopTracer
2128
startCalled int64
2229
}
2330

‎go.mod

+8-7
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ require (
172172
github.com/wagslane/go-password-validator v0.3.0
173173
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
174174
go.nhat.io/otelsql v0.12.0
175-
go.opentelemetry.io/otel v1.19.0
175+
go.opentelemetry.io/otel v1.24.0
176176
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
177177
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
178-
go.opentelemetry.io/otel/sdk v1.19.0
179-
go.opentelemetry.io/otel/trace v1.19.0
178+
go.opentelemetry.io/otel/sdk v1.24.0
179+
go.opentelemetry.io/otel/trace v1.24.0
180180
go.uber.org/atomic v1.11.0
181181
go.uber.org/goleak v1.2.1
182182
go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516
@@ -195,7 +195,7 @@ require (
195195
google.golang.org/api v0.152.0
196196
google.golang.org/grpc v1.62.0
197197
google.golang.org/protobuf v1.33.0
198-
gopkg.in/DataDog/dd-trace-go.v1 v1.57.0
198+
gopkg.in/DataDog/dd-trace-go.v1 v1.61.0
199199
gopkg.in/natefinch/lumberjack.v2 v2.2.1
200200
gopkg.in/yaml.v3 v3.0.1
201201
gvisor.dev/gvisor v0.0.0-20230504175454-7b0a1988a28f
@@ -213,6 +213,7 @@ require (
213213
)
214214

215215
require (
216+
github.com/DataDog/go-libddwaf/v2 v2.3.1 // indirect
216217
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
217218
github.com/mitchellh/hashstructure v1.1.0 // indirect
218219
github.com/pion/transport/v2 v2.0.0 // indirect
@@ -225,7 +226,7 @@ require (
225226
cloud.google.com/go/longrunning v0.5.4 // indirect
226227
filippo.io/edwards25519 v1.0.0 // indirect
227228
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
228-
github.com/DataDog/appsec-internal-go v1.0.0 // indirect
229+
github.com/DataDog/appsec-internal-go v1.4.1 // indirect
229230
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
230231
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
231232
github.com/DataDog/datadog-go/v5 v5.3.0 // indirect
@@ -279,7 +280,7 @@ require (
279280
github.com/docker/go-connections v0.4.0 // indirect
280281
github.com/docker/go-units v0.5.0 // indirect
281282
github.com/dustin/go-humanize v1.0.1 // indirect
282-
github.com/ebitengine/purego v0.5.0-alpha.1 // indirect
283+
github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
283284
github.com/elastic/go-windows v1.0.0 // indirect
284285
github.com/felixge/httpsnoop v1.0.3 // indirect
285286
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
@@ -412,7 +413,7 @@ require (
412413
github.com/zeebo/errs v1.3.0 // indirect
413414
go.opencensus.io v0.24.0 // indirect
414415
go.opentelemetry.io/contrib v1.19.0 // indirect
415-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
416+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
416417
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
417418
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
418419
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect

‎go.sum

+22
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O
2424
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
2525
github.com/DataDog/appsec-internal-go v1.0.0 h1:2u5IkF4DBj3KVeQn5Vg2vjPUtt513zxEYglcqnd500U=
2626
github.com/DataDog/appsec-internal-go v1.0.0/go.mod h1:+Y+4klVWKPOnZx6XESG7QHydOaUGEXyH2j/vSg9JiNM=
27+
github.com/DataDog/appsec-internal-go v1.4.1 h1:xpAS/hBo429pVh7rngquAK2DezUaJjfsX7Wd8cw0aIk=
28+
github.com/DataDog/appsec-internal-go v1.4.1/go.mod h1:rmZ+tpq5ZPKmeOUMYjWFg+q1mRd13mxZwSLBG+xa1ik=
2729
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 h1:bUMSNsw1iofWiju9yc1f+kBd33E3hMJtq9GuU602Iy8=
2830
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo=
2931
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c=
@@ -32,6 +34,8 @@ github.com/DataDog/datadog-go/v5 v5.3.0 h1:2q2qjFOb3RwAZNU+ez27ZVDwErJv5/VpbBPpr
3234
github.com/DataDog/datadog-go/v5 v5.3.0/go.mod h1:XRDJk1pTc00gm+ZDiBKsjh7oOOtJfYfglVCmFb8C2+Q=
3335
github.com/DataDog/go-libddwaf v1.5.0 h1:lrHP3VrEriy1M5uQuaOcKphf5GU40mBhihMAp6Ik55c=
3436
github.com/DataDog/go-libddwaf v1.5.0/go.mod h1:Fpnmoc2k53h6desQrH1P0/gR52CUzkLNFugE5zWwUBQ=
37+
github.com/DataDog/go-libddwaf/v2 v2.3.1 h1:bujaT5+KnLDFQqVA5ilvVvW+evUSHow9FrTHRgUwN4A=
38+
github.com/DataDog/go-libddwaf/v2 v2.3.1/go.mod h1:gsCdoijYQfj8ce/T2bEDNPZFIYnmHluAgVDpuQOWMZE=
3539
github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I=
3640
github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0=
3741
github.com/DataDog/gostackparse v0.7.0 h1:i7dLkXHvYzHV308hnkvVGDL3BR4FWl7IsXNPz/IGQh4=
@@ -281,6 +285,8 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
281285
github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw=
282286
github.com/ebitengine/purego v0.5.0-alpha.1 h1:0gVgWGb8GjKYs7cufvfNSleJAD00m2xWC26FMwOjNrw=
283287
github.com/ebitengine/purego v0.5.0-alpha.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
288+
github.com/ebitengine/purego v0.6.0-alpha.5 h1:EYID3JOAdmQ4SNZYJHu9V6IqOeRQDBYxqKAg9PyoHFY=
289+
github.com/ebitengine/purego v0.6.0-alpha.5/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
284290
github.com/elastic/go-sysinfo v1.13.1 h1:U5Jlx6c/rLkR72O8wXXXo1abnGlWGJU/wbzNJ2AfQa4=
285291
github.com/elastic/go-sysinfo v1.13.1/go.mod h1:GKqR8bbMK/1ITnez9NIsIfXQr25aLhRJa7AfT8HpBFQ=
286292
github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY=
@@ -979,6 +985,10 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:
979985
go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
980986
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
981987
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
988+
go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc=
989+
go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs=
990+
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
991+
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
982992
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
983993
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
984994
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
@@ -989,14 +999,24 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 h1:Ut6hgtYcASHwCzR
989999
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0/go.mod h1:TYeE+8d5CjrgBa0ZuRaDeMpIC1xZ7atg4g+nInjuSjc=
9901000
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
9911001
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
1002+
go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA=
1003+
go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM=
1004+
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
1005+
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
9921006
go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
9931007
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
9941008
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
1009+
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
1010+
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
9951011
go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU=
9961012
go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs=
9971013
go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
9981014
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
9991015
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
1016+
go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ=
1017+
go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU=
1018+
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
1019+
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
10001020
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
10011021
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
10021022
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -1218,6 +1238,8 @@ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGm
12181238
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
12191239
gopkg.in/DataDog/dd-trace-go.v1 v1.57.0 h1:fhF8rUmpJhXT6wQVKcfm0Wc4VfBwthgLabjQOJR2HV0=
12201240
gopkg.in/DataDog/dd-trace-go.v1 v1.57.0/go.mod h1:ANES99E9pKUJ22wHBQkMsrt776+lz7V1nwAanwibU7U=
1241+
gopkg.in/DataDog/dd-trace-go.v1 v1.61.0 h1:XKO91GwTjpIRhd56Xif/BZ2YgHkQufVTOvtkbRYSPi8=
1242+
gopkg.in/DataDog/dd-trace-go.v1 v1.61.0/go.mod h1:NHKX1t9eKmajySb6H+zLdgZizCFzbt5iKvrTyxEyy8w=
12211243
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
12221244
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
12231245
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)