Skip to content

Commit 3c7caad

Browse files
Merge branch 'main' into instrument-pg-connect
2 parents ef9bf74 + e58ec51 commit 3c7caad

File tree

623 files changed

+22988
-2914
lines changed

Some content is hidden

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

623 files changed

+22988
-2914
lines changed

.cspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ words:
8282
- webmocks
8383
- Xuan
8484
- yardoc
85+
- traceparent

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ what happened and what you expected with a link to the relevant portion of the s
2626

2727
Operating system details: Linux, Ubuntu 20.04 LTS
2828
RUBY_ENGINE: "ruby"
29-
RUBY_VERSION: "3.1.1"
30-
RUBY_DESCRIPTION: "ruby 3.1.1p18 (2022-02-18 revision 53f5fc4236) [arm64-darwin21]"
29+
RUBY_VERSION: "3.4"
30+
RUBY_DESCRIPTION: "ruby 3.4.1 (2024-12-25 revision 48d4efcb85) arm64-darwin21]"
3131

3232
**Share a simplified reproduction if possible**
3333

@@ -75,3 +75,5 @@ end
7575

7676
OpenTelemetry.tracer_provider.shutdown
7777
```
78+
79+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [in our end user docs](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.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.229.0
87+
uses: ruby/setup-ruby@v1.258.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.229.0
98+
uses: ruby/setup-ruby@v1.258.0
9999
with:
100100
ruby-version: "${{ inputs.ruby }}"
101101
bundler: "latest"

.github/dependabot.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,25 @@ updates:
55
directory: "/"
66
schedule:
77
interval: daily
8+
# Update all dependencies - processes from root to handle path dependencies correctly
89
- package-ecosystem: bundler
910
directory: "/"
1011
schedule:
1112
interval: weekly
13+
ignore:
14+
# Ignore internal instrumentation interdependencies managed via local paths in Gemfiles
15+
- dependency-name: "opentelemetry-instrumentation-*"
16+
- dependency-name: "opentelemetry-helpers-*"
17+
- dependency-name: "opentelemetry-processor-*"
18+
- dependency-name: "opentelemetry-propagator-*"
19+
- dependency-name: "opentelemetry-sampler-*"
20+
- dependency-name: "opentelemetry-resource-detector-*"
1221
groups:
13-
all-gems:
22+
production-dependencies:
23+
dependency-type: "production"
1424
patterns:
15-
- "**/Gemfile"
25+
- "*"
26+
development-dependencies:
27+
dependency-type: "development"
28+
patterns:
29+
- "*"

.github/workflows/check-spelling.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/ci-contrib.yml

Lines changed: 64 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,28 @@ on:
55
push:
66
branches:
77
- main
8+
paths: &path_filters
9+
- 'helpers/**'
10+
- 'propagator/**'
11+
- 'resources/**'
12+
- 'processor/**'
13+
- 'sampler/**'
14+
- '.github/workflows/ci-contrib.yml'
15+
- '.github/actions/**'
16+
- 'Gemfile'
17+
- 'Rakefile'
18+
- '.rubocop.yml'
19+
- 'gemspecs/**'
820
pull_request:
921
branches:
1022
- main
23+
paths: *path_filters
1124
schedule:
1225
- cron: "0 0 * * *"
1326

27+
permissions:
28+
contents: read
29+
1430
concurrency:
1531
group: ${{ github.workflow }}-${{ github.event.pull_request.number }} # Ensure that only one instance of this workflow is running per Pull Request
1632
cancel-in-progress: true # Cancel any previous runs of this workflow
@@ -24,12 +40,13 @@ jobs:
2440
- sql
2541
- mysql
2642
- sql-obfuscation
43+
- sql-processor
2744
os:
2845
- ubuntu-latest
2946
name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"
3047
runs-on: ${{ matrix.os }}
3148
steps:
32-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
3350
- name: "Test Ruby 3.4"
3451
uses: ./.github/actions/test_gem
3552
with:
@@ -45,11 +62,6 @@ jobs:
4562
with:
4663
gem: "opentelemetry-helpers-${{ matrix.gem }}"
4764
ruby: "3.2"
48-
- name: "Test Ruby 3.1"
49-
uses: ./.github/actions/test_gem
50-
with:
51-
gem: "opentelemetry-helpers-${{ matrix.gem }}"
52-
ruby: "3.1"
5365
yard: true
5466
rubocop: true
5567
coverage: true
@@ -59,7 +71,7 @@ jobs:
5971
uses: ./.github/actions/test_gem
6072
with:
6173
gem: "opentelemetry-helpers-${{ matrix.gem }}"
62-
ruby: "jruby-9.4.12.0"
74+
ruby: "jruby-10.0.2.0"
6375

6476
propagators:
6577
strategy:
@@ -69,12 +81,13 @@ jobs:
6981
- ottrace
7082
- vitess
7183
- xray
84+
- google_cloud_trace_context
7285
os:
7386
- ubuntu-latest
7487
name: "propagator-${{ matrix.gem }} / ${{ matrix.os }}"
7588
runs-on: ${{ matrix.os }}
7689
steps:
77-
- uses: actions/checkout@v4
90+
- uses: actions/checkout@v5
7891
- name: "Test Ruby 3.4"
7992
uses: ./.github/actions/test_gem
8093
with:
@@ -90,11 +103,6 @@ jobs:
90103
with:
91104
gem: "opentelemetry-propagator-${{ matrix.gem }}"
92105
ruby: "3.2"
93-
- name: "Test Ruby 3.1"
94-
uses: ./.github/actions/test_gem
95-
with:
96-
gem: "opentelemetry-propagator-${{ matrix.gem }}"
97-
ruby: "3.1"
98106
yard: true
99107
rubocop: true
100108
build: true
@@ -103,7 +111,7 @@ jobs:
103111
uses: ./.github/actions/test_gem
104112
with:
105113
gem: "opentelemetry-propagator-${{ matrix.gem }}"
106-
ruby: "jruby-9.4.12.0"
114+
ruby: "jruby-10.0.2.0"
107115

108116
resource-detectors:
109117
strategy:
@@ -119,7 +127,7 @@ jobs:
119127
name: "opentelemetry-${{ matrix.gem }} / ${{ matrix.os }}"
120128
runs-on: ${{ matrix.os }}
121129
steps:
122-
- uses: actions/checkout@v4
130+
- uses: actions/checkout@v5
123131
- name: "Test Ruby 3.4"
124132
uses: ./.github/actions/test_gem
125133
with:
@@ -135,11 +143,6 @@ jobs:
135143
with:
136144
gem: "opentelemetry-${{ matrix.gem }}"
137145
ruby: "3.2"
138-
- name: "Test Ruby 3.1"
139-
uses: ./.github/actions/test_gem
140-
with:
141-
gem: "opentelemetry-${{ matrix.gem }}"
142-
ruby: "3.1"
143146
yard: true
144147
rubocop: true
145148
coverage: true
@@ -149,7 +152,7 @@ jobs:
149152
uses: ./.github/actions/test_gem
150153
with:
151154
gem: "opentelemetry-${{ matrix.gem }}"
152-
ruby: "jruby-9.4.12.0"
155+
ruby: "jruby-10.0.2.0"
153156

154157
processors:
155158
strategy:
@@ -162,7 +165,7 @@ jobs:
162165
name: "processors-${{ matrix.gem }} / ${{ matrix.os }}"
163166
runs-on: ${{ matrix.os }}
164167
steps:
165-
- uses: actions/checkout@v4
168+
- uses: actions/checkout@v5
166169
- name: "Test Ruby 3.4"
167170
uses: ./.github/actions/test_gem
168171
with:
@@ -178,11 +181,6 @@ jobs:
178181
with:
179182
gem: "opentelemetry-processor-${{ matrix.gem }}"
180183
ruby: "3.2"
181-
- name: "Test Ruby 3.1"
182-
uses: ./.github/actions/test_gem
183-
with:
184-
gem: "opentelemetry-processor-${{ matrix.gem }}"
185-
ruby: "3.1"
186184
yard: true
187185
rubocop: true
188186
coverage: true
@@ -192,4 +190,42 @@ jobs:
192190
uses: ./.github/actions/test_gem
193191
with:
194192
gem: "opentelemetry-processor-${{ matrix.gem }}"
195-
ruby: "jruby-9.4.12.0"
193+
ruby: "jruby-10.0.2.0"
194+
195+
samplers:
196+
strategy:
197+
fail-fast: false
198+
matrix:
199+
gem:
200+
- xray
201+
os:
202+
- ubuntu-latest
203+
name: "samplers-${{ matrix.gem }} / ${{ matrix.os }}"
204+
runs-on: ${{ matrix.os }}
205+
steps:
206+
- uses: actions/checkout@v5
207+
- name: "Test Ruby 3.4"
208+
uses: ./.github/actions/test_gem
209+
with:
210+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
211+
ruby: "3.4"
212+
- name: "Test Ruby 3.3"
213+
uses: ./.github/actions/test_gem
214+
with:
215+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
216+
ruby: "3.3"
217+
- name: "Test Ruby 3.2"
218+
uses: ./.github/actions/test_gem
219+
with:
220+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
221+
ruby: "3.2"
222+
yard: true
223+
rubocop: true
224+
coverage: true
225+
build: true
226+
- name: "Test JRuby"
227+
if: "${{ matrix.os == 'ubuntu-latest' }}"
228+
uses: ./.github/actions/test_gem
229+
with:
230+
gem: "opentelemetry-sampler-${{ matrix.gem }}"
231+
ruby: "jruby-10.0.2.0"

0 commit comments

Comments
 (0)