Skip to content

Commit 9e45a84

Browse files
Merge branch 'main' into 669-add-net_ldap-instrumentation
2 parents f39b2de + 3ecb387 commit 9e45a84

File tree

172 files changed

+2752
-292
lines changed

Some content is hidden

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

172 files changed

+2752
-292
lines changed

.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/ci-contrib.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
- sql
2828
- mysql
2929
- sql-obfuscation
30+
- sql-processor
3031
os:
3132
- ubuntu-latest
3233
name: "helpers-${{ matrix.gem }} / ${{ matrix.os }}"

.github/workflows/ci-instrumentation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
- httpx
5151
- koala
5252
- lmdb
53+
- logger
5354
- net_http
5455
- net_ldap
5556
- rack

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
1717

1818
- name: Install Ruby 3.4
19-
uses: ruby/setup-ruby@v1.263.0
19+
uses: ruby/setup-ruby@v1.265.0
2020
with:
2121
ruby-version: 3.4
2222
- name: Generate Gemfile.lock

.github/workflows/installation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v5
2929
# ATTENTION: Dependabot does not know how to update shared actions file.
3030
# If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
31-
- uses: ruby/setup-ruby@v1.263.0
31+
- uses: ruby/setup-ruby@v1.265.0
3232
with:
3333
ruby-version: ${{ matrix.ruby-version }}
3434
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
46+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4747
with:
4848
sarif_file: results.sarif

.github/workflows/release-hook-on-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Install Ruby ${{ env.ruby_version }}
21-
uses: ruby/setup-ruby@v1.263.0
21+
uses: ruby/setup-ruby@v1.265.0
2222
with:
2323
ruby-version: ${{ env.ruby_version }}
2424
- name: Checkout repo

.github/workflows/release-hook-on-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Install Ruby ${{ env.ruby_version }}
22-
uses: ruby/setup-ruby@v1.263.0
22+
uses: ruby/setup-ruby@v1.265.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

.github/workflows/release-perform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Install Ruby ${{ env.ruby_version }}
31-
uses: ruby/setup-ruby@v1.263.0
31+
uses: ruby/setup-ruby@v1.265.0
3232
with:
3333
ruby-version: ${{ env.ruby_version }}
3434
- name: Checkout repo

.github/workflows/release-please.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
chmod 0600 $HOME/.gem/credentials
5858
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
5959
60-
- uses: ruby/setup-ruby@v1.263.0
60+
- uses: ruby/setup-ruby@v1.265.0
6161
with:
6262
ruby-version: "3.1"
6363
bundler: latest

0 commit comments

Comments
 (0)