Skip to content

Commit caf1890

Browse files
jamesmoessisjamesmoessis
authored
Upgrades to collector v0.126.0. (#9)
Adds two tail sampling optimisations. Both related to easing pressure on the hot path goroutine to help response times. Essentially, moving things out of the bottlenecked path and into other goroutines wherever possible. This is possible in places which do not access state (caches) since they do not need to be synchronized.
1 parent 2e92f8d commit caf1890

8 files changed

Lines changed: 157 additions & 119 deletions

File tree

‎internal/ptraceutil/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/atlassian-labs/atlassian-sampling-processor/internal/ptraceuti
33
go 1.24.0
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
6+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.126.0
77
github.com/stretchr/testify v1.10.0
8-
go.opentelemetry.io/collector/pdata v1.31.0
8+
go.opentelemetry.io/collector/pdata v1.32.0
99
)
1010

1111
require (
@@ -15,7 +15,7 @@ require (
1515
github.com/json-iterator/go v1.1.12 // indirect
1616
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1717
github.com/modern-go/reflect2 v1.0.2 // indirect
18-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 // indirect
18+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.126.0 // indirect
1919
github.com/pmezard/go-difflib v1.0.0 // indirect
2020
go.uber.org/multierr v1.11.0 // indirect
2121
golang.org/x/net v0.39.0 // indirect

‎internal/ptraceutil/go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
2929
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
3030
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
3131
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
32-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0 h1:JwBeJ6Ll4mTsi+16YbJgjbAdNZaePFnGT3ainh0u/D4=
33-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0/go.mod h1:xxQBETnfDs2DRPVXgg8aeeVKPFzICjp3wce1858hJeo=
34-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0 h1:IzhLlqlwxWM0PcGeyq6ispujXRTyzeA37LNtcQHOvdg=
35-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0/go.mod h1:/WDZg8/Uk2niDeFWkijYvWkQ9gaRF0Vkj/RxGDRcMEY=
36-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 h1:ZzDmvZcWi59c4gZLlkV+NbzDseuFNPePhgZ8XoZqfAI=
37-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0/go.mod h1:Hulx7f7AcWKM7crzT0HKxubNqN4qMF8wGyrC3W0BIYc=
32+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.126.0 h1:AnOgi0AF5kALP4hEILsQEnRzT/yNXfua598210Dn9ko=
33+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.126.0/go.mod h1:jjyo4lLRH9WOUJ9djpEql6xqVAaReNDY7ciWRt23FZk=
34+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.126.0 h1:9RPktK9IsZaHN5aGV+bA7UbGtZCDGWvkSLcldAIPD98=
35+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.126.0/go.mod h1:ZgQQqwY9c/e3JleZPQ1xxm9ZbgEKpGVjBEP+D+fTM+s=
36+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.126.0 h1:FqfYYIBllbKMX2J64U37bVpICpo3+chXC3oC192fffM=
37+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.126.0/go.mod h1:j54xa94UWeLUNV1PXLm8QAlXCOqw6T8LOACb/qtZcug=
3838
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3939
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4040
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -47,10 +47,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
4747
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
4848
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
4949
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
50-
go.opentelemetry.io/collector/pdata v1.31.0 h1:P5WuLr1l2JcIvr6Dw2hl01ltp2ZafPnC4Isv+BLTBqU=
51-
go.opentelemetry.io/collector/pdata v1.31.0/go.mod h1:m41io9nWpy7aCm/uD1L9QcKiZwOP0ldj83JEA34dmlk=
52-
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 h1:Qqlx8w1HpiYZ9RQqjmMQIysI0cHNO1nh3E/fCTeFysA=
53-
go.opentelemetry.io/collector/pdata/pprofile v0.125.0/go.mod h1:p/yK023VxAp8hm27/1G5DPTcMIpnJy3cHGAFUQZGyaQ=
50+
go.opentelemetry.io/collector/pdata v1.32.0 h1:hBzlJV1rujr1UdD2CBy2gmaIKtC15ysg/z+x8F3McQA=
51+
go.opentelemetry.io/collector/pdata v1.32.0/go.mod h1:m41io9nWpy7aCm/uD1L9QcKiZwOP0ldj83JEA34dmlk=
52+
go.opentelemetry.io/collector/pdata/pprofile v0.126.0 h1:ArYQxg5KdTb98r1X6KSZY7W6/4DPv/q6z7jSbSZ1mBc=
53+
go.opentelemetry.io/collector/pdata/pprofile v0.126.0/go.mod h1:2fBTFDcXjVfseBQKnt/DTM0EYTmFoPKtRpjg8ql38Ek=
5454
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
5555
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
5656
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=

‎pkg/processor/atlassiansamplingprocessor/go.mod‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ require (
66
github.com/atlassian-labs/atlassian-sampling-processor/internal/ptraceutil v0.10.94
77
github.com/golang/snappy v0.0.4
88
github.com/hashicorp/golang-lru/v2 v2.0.7
9-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.125.0
10-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.126.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.126.0
1111
github.com/stretchr/testify v1.10.0
12-
go.opentelemetry.io/collector/component v1.31.0
13-
go.opentelemetry.io/collector/component/componenttest v0.125.0
14-
go.opentelemetry.io/collector/confmap v1.31.0
15-
go.opentelemetry.io/collector/consumer v1.31.0
16-
go.opentelemetry.io/collector/consumer/consumertest v0.125.0
17-
go.opentelemetry.io/collector/extension v1.31.0
18-
go.opentelemetry.io/collector/pdata v1.31.0
19-
go.opentelemetry.io/collector/processor v1.31.0
20-
go.opentelemetry.io/collector/processor/processortest v0.125.0
12+
go.opentelemetry.io/collector/component v1.32.0
13+
go.opentelemetry.io/collector/component/componenttest v0.126.0
14+
go.opentelemetry.io/collector/confmap v1.32.0
15+
go.opentelemetry.io/collector/consumer v1.32.0
16+
go.opentelemetry.io/collector/consumer/consumertest v0.126.0
17+
go.opentelemetry.io/collector/extension v1.32.0
18+
go.opentelemetry.io/collector/pdata v1.32.0
19+
go.opentelemetry.io/collector/processor v1.32.0
20+
go.opentelemetry.io/collector/processor/processortest v0.126.0
2121
go.opentelemetry.io/otel v1.35.0
2222
go.opentelemetry.io/otel/metric v1.35.0
2323
go.opentelemetry.io/otel/sdk/metric v1.35.0
2424
go.opentelemetry.io/otel/trace v1.35.0
2525
go.uber.org/goleak v1.3.0
2626
go.uber.org/multierr v1.11.0
2727
go.uber.org/zap v1.27.0
28-
golang.org/x/sync v0.13.0
28+
golang.org/x/sync v0.14.0
2929
)
3030

3131
require (
@@ -56,28 +56,27 @@ require (
5656
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5757
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5858
github.com/modern-go/reflect2 v1.0.2 // indirect
59-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.125.0 // indirect
60-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 // indirect
59+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.126.0 // indirect
60+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.126.0 // indirect
6161
github.com/pmezard/go-difflib v1.0.0 // indirect
6262
github.com/twmb/murmur3 v1.1.8 // indirect
6363
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
6464
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
65-
go.opentelemetry.io/collector/component/componentstatus v0.125.0 // indirect
66-
go.opentelemetry.io/collector/consumer/xconsumer v0.125.0 // indirect
67-
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
68-
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
69-
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
70-
go.opentelemetry.io/collector/pdata/testdata v0.125.0 // indirect
71-
go.opentelemetry.io/collector/pipeline v0.125.0 // indirect
72-
go.opentelemetry.io/collector/processor/xprocessor v0.125.0 // indirect
73-
go.opentelemetry.io/collector/semconv v0.125.0 // indirect
65+
go.opentelemetry.io/collector/component/componentstatus v0.126.0 // indirect
66+
go.opentelemetry.io/collector/consumer/xconsumer v0.126.0 // indirect
67+
go.opentelemetry.io/collector/featuregate v1.32.0 // indirect
68+
go.opentelemetry.io/collector/internal/telemetry v0.126.0 // indirect
69+
go.opentelemetry.io/collector/pdata/pprofile v0.126.0 // indirect
70+
go.opentelemetry.io/collector/pdata/testdata v0.126.0 // indirect
71+
go.opentelemetry.io/collector/pipeline v0.126.0 // indirect
72+
go.opentelemetry.io/collector/processor/xprocessor v0.126.0 // indirect
7473
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
7574
go.opentelemetry.io/otel/log v0.11.0 // indirect
7675
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
7776
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
78-
golang.org/x/net v0.39.0 // indirect
79-
golang.org/x/sys v0.32.0 // indirect
80-
golang.org/x/text v0.24.0 // indirect
77+
golang.org/x/net v0.40.0 // indirect
78+
golang.org/x/sys v0.33.0 // indirect
79+
golang.org/x/text v0.25.0 // indirect
8180
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
8281
google.golang.org/grpc v1.72.0 // indirect
8382
google.golang.org/protobuf v1.36.6 // indirect

0 commit comments

Comments
 (0)