Skip to content

Commit 3f4fea2

Browse files
kaylareopellekaylareopelle
authored
Merge branch 'main' into update-instrumentation-generator-gemspec
2 parents 2920f3d + 5cf6114 commit 3f4fea2

File tree

198 files changed

+1583
-1190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+1583
-1190
lines changed

‎.github/actions/test_gem/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ runs:
8484
# ...but not for appraisals, sadly.
8585
- name: Install Ruby ${{ inputs.ruby }} with dependencies
8686
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
87-
uses: ruby/setup-ruby@v1.214.0
87+
uses: ruby/setup-ruby@v1.221.0
8888
with:
8989
ruby-version: "${{ inputs.ruby }}"
9090
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -95,7 +95,7 @@ runs:
9595
# If we're using appraisals, do it all manually.
9696
- name: Install Ruby ${{ inputs.ruby }} without dependencies
9797
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
98-
uses: ruby/setup-ruby@v1.214.0
98+
uses: ruby/setup-ruby@v1.221.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

‎.github/dependabot.yml‎

Lines changed: 12 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -1,203 +1,15 @@
11
---
22
version: 2
33
updates:
4-
- package-ecosystem: github-actions
5-
directory: "/"
6-
schedule:
7-
interval: daily
8-
- package-ecosystem: bundler
9-
directory: "/"
10-
schedule:
11-
interval: weekly
12-
- package-ecosystem: bundler
13-
directory: "/helpers/sql"
14-
schedule:
15-
interval: weekly
16-
- package-ecosystem: bundler
17-
directory: "/helpers/mysql"
18-
schedule:
19-
interval: weekly
20-
- package-ecosystem: bundler
21-
directory: "/helpers/sql-obfuscation"
22-
schedule:
23-
interval: weekly
24-
- package-ecosystem: bundler
25-
directory: "/propagator/ottrace"
26-
schedule:
27-
interval: weekly
28-
- package-ecosystem: bundler
29-
directory: "/propagator/xray"
30-
schedule:
31-
interval: weekly
32-
- package-ecosystem: bundler
33-
directory: "/instrumentation/que"
34-
schedule:
35-
interval: weekly
36-
- package-ecosystem: bundler
37-
directory: "/instrumentation/http_client"
38-
schedule:
39-
interval: weekly
40-
- package-ecosystem: bundler
41-
directory: "/instrumentation/mysql2"
42-
schedule:
43-
interval: weekly
44-
- package-ecosystem: bundler
45-
directory: "/instrumentation/sinatra"
46-
schedule:
47-
interval: weekly
48-
- package-ecosystem: bundler
49-
directory: "/instrumentation/sidekiq"
50-
schedule:
51-
interval: weekly
52-
- package-ecosystem: bundler
53-
directory: "/instrumentation/dalli"
54-
schedule:
55-
interval: weekly
56-
- package-ecosystem: bundler
57-
directory: "/instrumentation/racecar"
58-
schedule:
59-
interval: weekly
60-
- package-ecosystem: bundler
61-
directory: "/instrumentation/redis"
62-
schedule:
63-
interval: weekly
64-
- package-ecosystem: bundler
65-
directory: "/instrumentation/ruby_kafka"
66-
schedule:
67-
interval: weekly
68-
- package-ecosystem: bundler
69-
directory: "/instrumentation/concurrent_ruby"
70-
schedule:
71-
interval: weekly
72-
- package-ecosystem: bundler
73-
directory: "/instrumentation/active_model_serializers"
74-
schedule:
75-
interval: weekly
76-
- package-ecosystem: bundler
77-
directory: "/instrumentation/rake"
78-
schedule:
79-
interval: weekly
80-
- package-ecosystem: bundler
81-
directory: "/instrumentation/action_view"
82-
schedule:
83-
interval: weekly
84-
- package-ecosystem: bundler
85-
directory: "/instrumentation/bunny"
86-
schedule:
87-
interval: weekly
88-
- package-ecosystem: bundler
89-
directory: "/instrumentation/all"
90-
schedule:
91-
interval: weekly
92-
- package-ecosystem: bundler
93-
directory: "/instrumentation/aws_sdk"
94-
schedule:
95-
interval: weekly
96-
- package-ecosystem: bundler
97-
directory: "/instrumentation/aws_lambda"
98-
schedule:
99-
interval: weekly
100-
- package-ecosystem: bundler
101-
directory: "/instrumentation/active_record"
102-
schedule:
103-
interval: weekly
104-
- package-ecosystem: bundler
105-
directory: "/instrumentation/faraday"
106-
schedule:
107-
interval: weekly
108-
- package-ecosystem: bundler
109-
directory: "/instrumentation/resque"
110-
schedule:
111-
interval: weekly
112-
- package-ecosystem: bundler
113-
directory: "/instrumentation/rdkafka"
114-
schedule:
115-
interval: weekly
116-
- package-ecosystem: bundler
117-
directory: "/instrumentation/pg"
118-
schedule:
119-
interval: weekly
120-
- package-ecosystem: bundler
121-
directory: "/instrumentation/ethon"
122-
schedule:
123-
interval: weekly
124-
- package-ecosystem: bundler
125-
directory: "/instrumentation/lmdb"
126-
schedule:
127-
interval: weekly
128-
- package-ecosystem: bundler
129-
directory: "/instrumentation/active_support"
130-
schedule:
131-
interval: weekly
132-
- package-ecosystem: bundler
133-
directory: "/instrumentation/http"
134-
schedule:
135-
interval: weekly
136-
- package-ecosystem: bundler
137-
directory: "/instrumentation/graphql"
138-
schedule:
139-
interval: weekly
140-
- package-ecosystem: bundler
141-
directory: "/instrumentation/trilogy"
142-
schedule:
143-
interval: weekly
144-
- package-ecosystem: bundler
145-
directory: "/instrumentation/net_http"
146-
schedule:
147-
interval: weekly
148-
- package-ecosystem: bundler
149-
directory: "/instrumentation/rack"
150-
schedule:
151-
interval: weekly
152-
- package-ecosystem: bundler
153-
directory: "/instrumentation/action_pack"
154-
schedule:
155-
interval: weekly
156-
- package-ecosystem: bundler
157-
directory: "/instrumentation/mongo"
158-
schedule:
159-
interval: weekly
160-
- package-ecosystem: bundler
161-
directory: "/instrumentation/restclient"
162-
schedule:
163-
interval: weekly
164-
- package-ecosystem: bundler
165-
directory: "/instrumentation/koala"
166-
schedule:
167-
interval: weekly
168-
- package-ecosystem: bundler
169-
directory: "/instrumentation/active_job"
170-
schedule:
171-
interval: weekly
172-
- package-ecosystem: bundler
173-
directory: "/instrumentation/excon"
174-
schedule:
175-
interval: weekly
176-
- package-ecosystem: bundler
177-
directory: "/instrumentation/rspec"
178-
schedule:
179-
interval: weekly
180-
- package-ecosystem: bundler
181-
directory: "/instrumentation/base"
182-
schedule:
183-
interval: weekly
184-
- package-ecosystem: bundler
185-
directory: "/instrumentation/delayed_job"
186-
schedule:
187-
interval: weekly
188-
- package-ecosystem: bundler
189-
directory: "/instrumentation/rails"
190-
schedule:
191-
interval: weekly
192-
- package-ecosystem: bundler
193-
directory: "/resources/azure"
194-
schedule:
195-
interval: weekly
196-
- package-ecosystem: bundler
197-
directory: "/resources/container"
198-
schedule:
199-
interval: weekly
200-
- package-ecosystem: bundler
201-
directory: "/resources/google_cloud_platform"
202-
schedule:
203-
interval: weekly
4+
- package-ecosystem: github-actions
5+
directory: "/"
6+
schedule:
7+
interval: daily
8+
- package-ecosystem: bundler
9+
directory: "/"
10+
schedule:
11+
interval: weekly
12+
groups:
13+
all-gems:
14+
patterns:
15+
- "**/Gemfile"

‎.github/workflows/ci-contrib.yml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
steps:
3232
- uses: actions/checkout@v4
33+
- name: "Test Ruby 3.4"
34+
uses: ./.github/actions/test_gem
35+
with:
36+
gem: "opentelemetry-helpers-${{ matrix.gem }}"
37+
ruby: "3.4"
3338
- name: "Test Ruby 3.3"
3439
uses: ./.github/actions/test_gem
3540
with:
@@ -54,7 +59,7 @@ jobs:
5459
uses: ./.github/actions/test_gem
5560
with:
5661
gem: "opentelemetry-helpers-${{ matrix.gem }}"
57-
ruby: "jruby-9.4.10.0"
62+
ruby: "jruby-9.4.12.0"
5863

5964
propagators:
6065
strategy:
@@ -70,6 +75,11 @@ jobs:
7075
runs-on: ${{ matrix.os }}
7176
steps:
7277
- uses: actions/checkout@v4
78+
- name: "Test Ruby 3.4"
79+
uses: ./.github/actions/test_gem
80+
with:
81+
gem: "opentelemetry-propagator-${{ matrix.gem }}"
82+
ruby: "3.4"
7383
- name: "Test Ruby 3.3"
7484
uses: ./.github/actions/test_gem
7585
with:
@@ -93,7 +103,7 @@ jobs:
93103
uses: ./.github/actions/test_gem
94104
with:
95105
gem: "opentelemetry-propagator-${{ matrix.gem }}"
96-
ruby: "jruby-9.4.10.0"
106+
ruby: "jruby-9.4.12.0"
97107

98108
resource-detectors:
99109
strategy:
@@ -109,6 +119,11 @@ jobs:
109119
runs-on: ${{ matrix.os }}
110120
steps:
111121
- uses: actions/checkout@v4
122+
- name: "Test Ruby 3.4"
123+
uses: ./.github/actions/test_gem
124+
with:
125+
gem: "opentelemetry-${{ matrix.gem }}"
126+
ruby: "3.4"
112127
- name: "Test Ruby 3.3"
113128
uses: ./.github/actions/test_gem
114129
with:
@@ -133,7 +148,7 @@ jobs:
133148
uses: ./.github/actions/test_gem
134149
with:
135150
gem: "opentelemetry-${{ matrix.gem }}"
136-
ruby: "jruby-9.4.10.0"
151+
ruby: "jruby-9.4.12.0"
137152

138153
processors:
139154
strategy:
@@ -147,6 +162,11 @@ jobs:
147162
runs-on: ${{ matrix.os }}
148163
steps:
149164
- uses: actions/checkout@v4
165+
- name: "Test Ruby 3.4"
166+
uses: ./.github/actions/test_gem
167+
with:
168+
gem: "opentelemetry-processor-${{ matrix.gem }}"
169+
ruby: "3.4"
150170
- name: "Test Ruby 3.3"
151171
uses: ./.github/actions/test_gem
152172
with:
@@ -171,4 +191,4 @@ jobs:
171191
uses: ./.github/actions/test_gem
172192
with:
173193
gem: "opentelemetry-processor-${{ matrix.gem }}"
174-
ruby: "jruby-9.4.10.0"
194+
ruby: "jruby-9.4.12.0"

‎.github/workflows/ci-instrumentation-with-services.yml‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- uses: actions/checkout@v4
32+
- name: "Test Ruby 3.4"
33+
uses: ./.github/actions/test_gem
34+
with:
35+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
36+
ruby: "3.4"
3237
- name: "Test Ruby 3.3"
3338
uses: ./.github/actions/test_gem
3439
with:
@@ -52,7 +57,7 @@ jobs:
5257
uses: ./.github/actions/test_gem
5358
with:
5459
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
55-
ruby: "jruby-9.4.10.0"
60+
ruby: "jruby-9.4.12.0"
5661
services:
5762
memcached:
5863
image: memcached:alpine
@@ -76,6 +81,11 @@ jobs:
7681
runs-on: ${{ matrix.os }}
7782
steps:
7883
- uses: actions/checkout@v4
84+
- name: "Test Ruby 3.4"
85+
uses: ./.github/actions/test_gem
86+
with:
87+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
88+
ruby: "3.4"
7989
- name: "Test Ruby 3.3"
8090
uses: ./.github/actions/test_gem
8191
with:
@@ -114,6 +124,11 @@ jobs:
114124
runs-on: ${{ matrix.os }}
115125
steps:
116126
- uses: actions/checkout@v4
127+
- name: "Test Ruby 3.4"
128+
uses: ./.github/actions/test_gem
129+
with:
130+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
131+
ruby: "3.4"
117132
- name: "Test Ruby 3.3"
118133
uses: ./.github/actions/test_gem
119134
with:
@@ -168,6 +183,11 @@ jobs:
168183
runs-on: ${{ matrix.os }}
169184
steps:
170185
- uses: actions/checkout@v4
186+
- name: "Test Ruby 3.4"
187+
uses: ./.github/actions/test_gem
188+
with:
189+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
190+
ruby: "3.4"
171191
- name: "Test Ruby 3.3"
172192
uses: ./.github/actions/test_gem
173193
with:
@@ -213,6 +233,11 @@ jobs:
213233
runs-on: ${{ matrix.os }}
214234
steps:
215235
- uses: actions/checkout@v4
236+
- name: "Test Ruby 3.4"
237+
uses: ./.github/actions/test_gem
238+
with:
239+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
240+
ruby: "3.4"
216241
- name: "Test Ruby 3.3"
217242
uses: ./.github/actions/test_gem
218243
with:
@@ -255,6 +280,11 @@ jobs:
255280
runs-on: ${{ matrix.os }}
256281
steps:
257282
- uses: actions/checkout@v4
283+
- name: "Test Ruby 3.4"
284+
uses: ./.github/actions/test_gem
285+
with:
286+
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
287+
ruby: "3.4"
258288
- name: "Test Ruby 3.3"
259289
uses: ./.github/actions/test_gem
260290
with:

0 commit comments

Comments
 (0)