Skip to content

Commit 1d7a3ce

Browse files
authored
Adress security issue for XRay UDP Exporter (#145)
1 parent 7eb8ae5 commit 1d7a3ce

File tree

32 files changed

+79
-78
lines changed

32 files changed

+79
-78
lines changed

sample-apps/integ-test-http-server/ruby-on-rails/Gemfile renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |_repo| "https://github.com/#{repo}.git" }
44
ruby '~> 3.2.0'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
7-
gem 'rails', '~> 7.0.4.2'
7+
gem 'rails', '~> 7.0.8.7'
88

99
# Use the Puma web server [https://github.com/puma/puma]
1010
gem 'puma', '~> 6.3'
@@ -30,6 +30,6 @@ gem 'opentelemetry-instrumentation-faraday'
3030
gem 'opentelemetry-instrumentation-rails'
3131

3232
# Test the current commit of `aws-distro-opentelemetry-exporter-xray-udp`
33-
gem 'aws-distro-opentelemetry-exporter-xray-udp', path: '../../../exporter/otlp-udp'
33+
gem 'aws-distro-opentelemetry-exporter-xray-udp', path: '../../../../exporter/xray-udp'
3434

3535
gem 'concurrent-ruby', '1.3.4'

sample-apps/integ-test-http-server/ruby-on-rails/Gemfile.lock renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/Gemfile.lock

Lines changed: 71 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,93 @@
11
PATH
2-
remote: ../../../exporter/otlp-udp
2+
remote: ../../../exporter/xray-udp
33
specs:
44
aws-distro-opentelemetry-exporter-xray-udp (0.0.1)
5-
base64
5+
base64 (~> 0.2.0)
66
opentelemetry-api (~> 1.1)
77
opentelemetry-exporter-otlp (~> 0.26.1)
88
opentelemetry-sdk (~> 1.2)
99

1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (7.0.4.3)
14-
actionpack (= 7.0.4.3)
15-
activesupport (= 7.0.4.3)
13+
actioncable (7.0.8.7)
14+
actionpack (= 7.0.8.7)
15+
activesupport (= 7.0.8.7)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailbox (7.0.4.3)
19-
actionpack (= 7.0.4.3)
20-
activejob (= 7.0.4.3)
21-
activerecord (= 7.0.4.3)
22-
activestorage (= 7.0.4.3)
23-
activesupport (= 7.0.4.3)
18+
actionmailbox (7.0.8.7)
19+
actionpack (= 7.0.8.7)
20+
activejob (= 7.0.8.7)
21+
activerecord (= 7.0.8.7)
22+
activestorage (= 7.0.8.7)
23+
activesupport (= 7.0.8.7)
2424
mail (>= 2.7.1)
2525
net-imap
2626
net-pop
2727
net-smtp
28-
actionmailer (7.0.4.3)
29-
actionpack (= 7.0.4.3)
30-
actionview (= 7.0.4.3)
31-
activejob (= 7.0.4.3)
32-
activesupport (= 7.0.4.3)
28+
actionmailer (7.0.8.7)
29+
actionpack (= 7.0.8.7)
30+
actionview (= 7.0.8.7)
31+
activejob (= 7.0.8.7)
32+
activesupport (= 7.0.8.7)
3333
mail (~> 2.5, >= 2.5.4)
3434
net-imap
3535
net-pop
3636
net-smtp
3737
rails-dom-testing (~> 2.0)
38-
actionpack (7.0.4.3)
39-
actionview (= 7.0.4.3)
40-
activesupport (= 7.0.4.3)
41-
rack (~> 2.0, >= 2.2.0)
38+
actionpack (7.0.8.7)
39+
actionview (= 7.0.8.7)
40+
activesupport (= 7.0.8.7)
41+
rack (~> 2.0, >= 2.2.4)
4242
rack-test (>= 0.6.3)
4343
rails-dom-testing (~> 2.0)
4444
rails-html-sanitizer (~> 1.0, >= 1.2.0)
45-
actiontext (7.0.4.3)
46-
actionpack (= 7.0.4.3)
47-
activerecord (= 7.0.4.3)
48-
activestorage (= 7.0.4.3)
49-
activesupport (= 7.0.4.3)
45+
actiontext (7.0.8.7)
46+
actionpack (= 7.0.8.7)
47+
activerecord (= 7.0.8.7)
48+
activestorage (= 7.0.8.7)
49+
activesupport (= 7.0.8.7)
5050
globalid (>= 0.6.0)
5151
nokogiri (>= 1.8.5)
52-
actionview (7.0.4.3)
53-
activesupport (= 7.0.4.3)
52+
actionview (7.0.8.7)
53+
activesupport (= 7.0.8.7)
5454
builder (~> 3.1)
5555
erubi (~> 1.4)
5656
rails-dom-testing (~> 2.0)
5757
rails-html-sanitizer (~> 1.1, >= 1.2.0)
58-
activejob (7.0.4.3)
59-
activesupport (= 7.0.4.3)
58+
activejob (7.0.8.7)
59+
activesupport (= 7.0.8.7)
6060
globalid (>= 0.3.6)
61-
activemodel (7.0.4.3)
62-
activesupport (= 7.0.4.3)
63-
activerecord (7.0.4.3)
64-
activemodel (= 7.0.4.3)
65-
activesupport (= 7.0.4.3)
66-
activestorage (7.0.4.3)
67-
actionpack (= 7.0.4.3)
68-
activejob (= 7.0.4.3)
69-
activerecord (= 7.0.4.3)
70-
activesupport (= 7.0.4.3)
61+
activemodel (7.0.8.7)
62+
activesupport (= 7.0.8.7)
63+
activerecord (7.0.8.7)
64+
activemodel (= 7.0.8.7)
65+
activesupport (= 7.0.8.7)
66+
activestorage (7.0.8.7)
67+
actionpack (= 7.0.8.7)
68+
activejob (= 7.0.8.7)
69+
activerecord (= 7.0.8.7)
70+
activesupport (= 7.0.8.7)
7171
marcel (~> 1.0)
7272
mini_mime (>= 1.1.0)
73-
activesupport (7.0.4.3)
73+
activesupport (7.0.8.7)
7474
concurrent-ruby (~> 1.0, >= 1.0.2)
7575
i18n (>= 1.6, < 2)
7676
minitest (>= 5.1)
7777
tzinfo (~> 2.0)
7878
aws-eventstream (1.3.2)
79-
aws-partitions (1.1064.0)
80-
aws-sdk-core (3.220.1)
79+
aws-partitions (1.1084.0)
80+
aws-sdk-core (3.222.1)
8181
aws-eventstream (~> 1, >= 1.3.0)
8282
aws-partitions (~> 1, >= 1.992.0)
8383
aws-sigv4 (~> 1.9)
8484
base64
8585
jmespath (~> 1, >= 1.6.1)
86+
logger
8687
aws-sdk-kms (1.99.0)
8788
aws-sdk-core (~> 3, >= 3.216.0)
8889
aws-sigv4 (~> 1.5)
89-
aws-sdk-s3 (1.182.0)
90+
aws-sdk-s3 (1.183.0)
9091
aws-sdk-core (~> 3, >= 3.216.0)
9192
aws-sdk-kms (~> 1)
9293
aws-sigv4 (~> 1.5)
@@ -101,7 +102,7 @@ GEM
101102
irb (~> 1.10)
102103
reline (>= 0.3.8)
103104
erubi (1.13.1)
104-
faraday (2.12.2)
105+
faraday (2.13.0)
105106
faraday-net_http (>= 2.0, < 3.5)
106107
json
107108
logger
@@ -110,18 +111,18 @@ GEM
110111
globalid (1.2.1)
111112
activesupport (>= 6.1)
112113
google-protobuf (3.25.6)
113-
googleapis-common-protos-types (1.18.0)
114+
googleapis-common-protos-types (1.19.0)
114115
google-protobuf (>= 3.18, < 5.a)
115116
i18n (1.14.7)
116117
concurrent-ruby (~> 1.0)
117118
io-console (0.8.0)
118-
irb (1.15.1)
119+
irb (1.15.2)
119120
pp (>= 0.6.0)
120121
rdoc (>= 4.0.0)
121122
reline (>= 0.4.2)
122123
jmespath (1.6.2)
123-
json (2.10.1)
124-
logger (1.6.6)
124+
json (2.10.2)
125+
logger (1.7.0)
125126
loofah (2.24.0)
126127
crass (~> 1.0.2)
127128
nokogiri (>= 1.12.0)
@@ -134,7 +135,7 @@ GEM
134135
method_source (1.1.0)
135136
mini_mime (1.1.5)
136137
mini_portile2 (2.8.8)
137-
minitest (5.25.4)
138+
minitest (5.25.5)
138139
net-http (0.6.0)
139140
uri
140141
net-imap (0.5.6)
@@ -147,7 +148,7 @@ GEM
147148
net-smtp (0.5.1)
148149
net-protocol
149150
nio4r (2.7.4)
150-
nokogiri (1.18.3)
151+
nokogiri (1.18.7)
151152
mini_portile2 (~> 2.8.2)
152153
racc (~> 1.4)
153154
opentelemetry-api (1.5.0)
@@ -235,40 +236,40 @@ GEM
235236
rack (2.2.13)
236237
rack-test (2.2.0)
237238
rack (>= 1.3)
238-
rails (7.0.4.3)
239-
actioncable (= 7.0.4.3)
240-
actionmailbox (= 7.0.4.3)
241-
actionmailer (= 7.0.4.3)
242-
actionpack (= 7.0.4.3)
243-
actiontext (= 7.0.4.3)
244-
actionview (= 7.0.4.3)
245-
activejob (= 7.0.4.3)
246-
activemodel (= 7.0.4.3)
247-
activerecord (= 7.0.4.3)
248-
activestorage (= 7.0.4.3)
249-
activesupport (= 7.0.4.3)
239+
rails (7.0.8.7)
240+
actioncable (= 7.0.8.7)
241+
actionmailbox (= 7.0.8.7)
242+
actionmailer (= 7.0.8.7)
243+
actionpack (= 7.0.8.7)
244+
actiontext (= 7.0.8.7)
245+
actionview (= 7.0.8.7)
246+
activejob (= 7.0.8.7)
247+
activemodel (= 7.0.8.7)
248+
activerecord (= 7.0.8.7)
249+
activestorage (= 7.0.8.7)
250+
activesupport (= 7.0.8.7)
250251
bundler (>= 1.15.0)
251-
railties (= 7.0.4.3)
252+
railties (= 7.0.8.7)
252253
rails-dom-testing (2.2.0)
253254
activesupport (>= 5.0.0)
254255
minitest
255256
nokogiri (>= 1.6)
256257
rails-html-sanitizer (1.6.2)
257258
loofah (~> 2.21)
258259
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
259-
railties (7.0.4.3)
260-
actionpack (= 7.0.4.3)
261-
activesupport (= 7.0.4.3)
260+
railties (7.0.8.7)
261+
actionpack (= 7.0.8.7)
262+
activesupport (= 7.0.8.7)
262263
method_source
263264
rake (>= 12.2)
264265
thor (~> 1.0)
265266
zeitwerk (~> 2.5)
266267
rake (13.2.1)
267-
rdoc (6.12.0)
268+
rdoc (6.13.1)
268269
psych (>= 4.0.0)
269-
reline (0.6.0)
270+
reline (0.6.1)
270271
io-console (~> 0.5)
271-
stringio (3.1.5)
272+
stringio (3.1.6)
272273
thor (1.3.2)
273274
timeout (0.4.3)
274275
tzinfo (2.0.6)
@@ -296,7 +297,7 @@ DEPENDENCIES
296297
opentelemetry-propagator-xray
297298
opentelemetry-sdk
298299
puma (~> 6.3)
299-
rails (~> 7.0.4.2)
300+
rails (~> 7.0.8.7)
300301
tzinfo-data
301302

302303
RUBY VERSION

sample-apps/integ-test-http-server/ruby-on-rails/Rakefile renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/Rakefile

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/app/controllers/application_controller.rb renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/app/controllers/application_controller.rb

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/app/views/application/root.html.erb renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/app/views/application/root.html.erb

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/bin/rails renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/bin/rails

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/config.ru renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/config.ru

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/config/application.rb renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/config/application.rb

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/config/boot.rb renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/config/boot.rb

File renamed without changes.

sample-apps/integ-test-http-server/ruby-on-rails/config/credentials.yml.enc renamed to .github/test-sample-apps/integ-test-http-server/ruby-on-rails/config/credentials.yml.enc

File renamed without changes.

0 commit comments

Comments
 (0)