Skip to content

Commit 33c54d3

Browse files
Merge branch 'main' into protect_from_forgery
2 parents 2a5e648 + 5b68a5b commit 33c54d3

File tree

315 files changed

+3769
-1549
lines changed

Some content is hidden

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

315 files changed

+3769
-1549
lines changed

.cspell.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# cSpell:ignore textlintrc
2+
# For settings, see
3+
# https://www.streetsidesoftware.com/vscode-spell-checker/docs/configuration/
4+
version: '0.2'
5+
caseSensitive: false
6+
patterns:
7+
- name: CodeBlock
8+
pattern: |
9+
/
10+
^(\s*[~`]{3,}) # code-block start
11+
.* # all languages and options, e.g. shell {hl_lines=[12]}
12+
[\s\S]*? # content
13+
\1 # code-block end
14+
/igmx
15+
languageSettings:
16+
- languageId: markdown
17+
ignoreRegExpList:
18+
- CodeBlock
19+
words:
20+
- AWSX
21+
- Azuma
22+
- backports
23+
- behaviour
24+
- Bogsanyi
25+
- callables
26+
- circleci
27+
- Clientcontext
28+
- codeowners
29+
- dalli
30+
- datadog
31+
- enqueuers
32+
- ethon
33+
- excon
34+
- faas
35+
- fanout
36+
- faraday
37+
- gettime
38+
- gemfile
39+
- Gitter
40+
- gruf
41+
- HTTPX
42+
- httpx
43+
- instrumenter
44+
- Laurin
45+
- Lightstep
46+
- linux
47+
- lmdb
48+
- microbenchmarks
49+
- Mustin
50+
- myapp
51+
- namespacing
52+
- opentelemetry
53+
- otelcol
54+
- ottrace
55+
- postgres
56+
- postgresql
57+
- racecar
58+
- rabbitmq
59+
- Railtie
60+
- Rakefile
61+
- Reopelle
62+
- rdkafka
63+
- resque
64+
- restclient
65+
- Robb
66+
- rubocop
67+
- rubydocs
68+
- ruboproof
69+
- rubygems
70+
- Šimánek
71+
- semconv
72+
- sidekiq
73+
- sinatra
74+
- Solarwinds
75+
- spanid
76+
- toolset
77+
- traceid
78+
- traceresponse
79+
- Untrace
80+
- vitess
81+
- webmocks
82+
- Xuan
83+
- yardoc

.github/actions/test_gem/action.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ runs:
6666
# ...but not for appraisals, sadly.
6767
- name: Install Ruby ${{ inputs.ruby }} with dependencies
6868
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
69-
uses: ruby/setup-ruby@v1.176.0
69+
uses: ruby/setup-ruby@v1.196.0
7070
with:
7171
ruby-version: "${{ inputs.ruby }}"
7272
working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,11 +77,18 @@ runs:
7777
# If we're using appraisals, do it all manually.
7878
- name: Install Ruby ${{ inputs.ruby }} without dependencies
7979
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
80-
uses: ruby/setup-ruby@v1.176.0
80+
uses: ruby/setup-ruby@v1.196.0
8181
with:
8282
ruby-version: "${{ inputs.ruby }}"
8383
bundler: "latest"
8484
working-directory: "${{ steps.setup.outputs.gem_dir }}"
85+
# Perms workaround. See https://github.com/actions/runner-images/issues/10215
86+
- name: Fix GEM_HOME permissions on GitHub Actions Runner
87+
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
88+
shell: bash
89+
run: |
90+
# 🛠️😭 Fix GEM_HOME permissions 😭🛠️
91+
chmod -R o-w $(gem env home)
8592
- name: Install dependencies and generate appraisals
8693
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
8794
shell: bash
@@ -100,7 +107,7 @@ runs:
100107
echo "::group::🔎 Appraising ${i}"
101108
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle install --quiet --jobs=3 --retry=4 && \
102109
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle show && \
103-
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test
110+
BUNDLE_GEMFILE=gemfiles/${i}.gemfile bundle exec rake test || exit
104111
echo "::endgroup::"
105112
done
106113
else
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Spelling
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
spelling-check:
8+
name: SPELLING check
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: streetsidesoftware/cspell-action@v6
13+
with:
14+
# Files should be consistent with check:spelling files
15+
files: |
16+
**/*.md
17+
config: .cspell.yml

.github/workflows/ci-contrib.yml

Lines changed: 10 additions & 4 deletions
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.3"
33+
uses: ./.github/actions/test_gem
34+
with:
35+
gem: "opentelemetry-helpers-${{ matrix.gem }}"
36+
ruby: "3.3"
3237
- name: "Test Ruby 3.2"
3338
uses: ./.github/actions/test_gem
3439
with:
@@ -53,14 +58,15 @@ jobs:
5358
uses: ./.github/actions/test_gem
5459
with:
5560
gem: "opentelemetry-helpers-${{ matrix.gem }}"
56-
ruby: "jruby-9.4.6.0"
61+
ruby: "jruby-9.4.8.0"
5762

5863
propagators:
5964
strategy:
6065
fail-fast: false
6166
matrix:
6267
gem:
6368
- ottrace
69+
- vitess
6470
- xray
6571
os:
6672
- ubuntu-latest
@@ -97,7 +103,7 @@ jobs:
97103
uses: ./.github/actions/test_gem
98104
with:
99105
gem: "opentelemetry-propagator-${{ matrix.gem }}"
100-
ruby: "jruby-9.4.6.0"
106+
ruby: "jruby-9.4.8.0"
101107

102108
resource-detectors:
103109
strategy:
@@ -142,7 +148,7 @@ jobs:
142148
uses: ./.github/actions/test_gem
143149
with:
144150
gem: "opentelemetry-${{ matrix.gem }}"
145-
ruby: "jruby-9.4.6.0"
151+
ruby: "jruby-9.4.8.0"
146152

147153
processors:
148154
strategy:
@@ -185,4 +191,4 @@ jobs:
185191
uses: ./.github/actions/test_gem
186192
with:
187193
gem: "opentelemetry-processor-${{ matrix.gem }}"
188-
ruby: "jruby-9.4.6.0"
194+
ruby: "jruby-9.4.8.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: ./.github/actions/test_gem
5757
with:
5858
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
59-
ruby: "jruby-9.4.6.0"
59+
ruby: "jruby-9.4.8.0"
6060
services:
6161
memcached:
6262
image: memcached:alpine

.github/workflows/ci-instrumentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ jobs:
110110
uses: ./.github/actions/test_gem
111111
with:
112112
gem: "opentelemetry-instrumentation-${{ matrix.gem }}"
113-
ruby: "jruby-9.4.6.0"
113+
ruby: "jruby-9.4.8.0"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Markdown Link Check
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
markdown-link-check:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
- name: "Markdown Link Check"
13+
uses: gaurav-nelson/github-action-markdown-link-check@v1
14+
with:
15+
config-file: '.markdown-link-check.json'
16+
use-quiet-mode: 'yes'
17+
use-verbose-mode: 'yes'
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Markdown Lint Check
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
markdownlint-check:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
12+
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
13+
- name: "Markdown Lint Check"
14+
uses: DavidAnson/markdownlint-cli2-action@v17
15+
with:
16+
fix: false
17+
globs: |
18+
**/*.md
19+
!**/CHANGELOG.md
20+
continue-on-error: true

.github/workflows/conventional-commits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Conventional Commits Validation
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: dev-build-deploy/commit-me@v1.4.1
25+
- uses: dev-build-deploy/commit-me@v1.5.0
2626
env:
2727
FORCE_COLOR: 3
2828
with:

.github/workflows/installation-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: ruby/[email protected]
26+
# ATTENTION: Dependabot does not know how to update shared actions file.
27+
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
28+
- uses: ruby/[email protected]
2729
with:
2830
ruby-version: ${{ matrix.ruby-version }}
2931
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

0 commit comments

Comments
 (0)