Skip to content

Commit 708e223

Browse files
Merge branch 'main' into mike/baggage-span-processor
2 parents 5b0397e + ca2615f commit 708e223

10 files changed

+10
-9
lines changed

.github/workflows/installation-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: ruby/setup-ruby@v1.174.0
26+
- uses: ruby/setup-ruby@v1.175.0
2727
with:
2828
ruby-version: ${{ matrix.ruby-version }}
2929
- name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Install Ruby ${{ env.ruby_version }}
15-
uses: ruby/setup-ruby@v1.174.0
15+
uses: ruby/setup-ruby@v1.175.0
1616
with:
1717
ruby-version: ${{ env.ruby_version }}
1818
- name: Checkout repo

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Install Ruby ${{ env.ruby_version }}
16-
uses: ruby/setup-ruby@v1.174.0
16+
uses: ruby/setup-ruby@v1.175.0
1717
with:
1818
ruby-version: ${{ env.ruby_version }}
1919
- name: Checkout repo

.github/workflows/release-perform.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Install Ruby ${{ env.ruby_version }}
25-
uses: ruby/setup-ruby@v1.174.0
25+
uses: ruby/setup-ruby@v1.175.0
2626
with:
2727
ruby-version: ${{ env.ruby_version }}
2828
- name: Checkout repo

.github/workflows/release-please.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
chmod 0600 $HOME/.gem/credentials
4949
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
5050
51-
- uses: ruby/setup-ruby@v1.174.0
51+
- uses: ruby/setup-ruby@v1.175.0
5252
with:
5353
ruby-version: "3.0"
5454
bundler: latest

.github/workflows/release-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Install Ruby ${{ env.ruby_version }}
19-
uses: ruby/setup-ruby@v1.174.0
19+
uses: ruby/setup-ruby@v1.175.0
2020
with:
2121
ruby-version: ${{ env.ruby_version }}
2222
- name: Checkout repo

.github/workflows/release-retry.yml

+1-1
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.174.0
22+
uses: ruby/setup-ruby@v1.175.0
2323
with:
2424
ruby-version: ${{ env.ruby_version }}
2525
- name: Checkout repo

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ARG PACKAGES="\
3333
libxml2-dev \
3434
libxslt-dev \
3535
mariadb-dev \
36+
sqlite-dev \
3637
openssl \
3738
postgresql-dev \
3839
tzdata \

instrumentation/active_record/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ group :test do
1212
gem 'byebug'
1313
gem 'opentelemetry-instrumentation-base', path: '../base'
1414
gem 'pry-byebug'
15-
gem 'sqlite3-ruby'
15+
gem 'sqlite3', '~> 1.4'
1616
end

resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
3434
spec.add_development_dependency 'rubocop', '~> 1.62'
3535
spec.add_development_dependency 'rubocop-performance', '~> 1.20'
3636
spec.add_development_dependency 'simplecov', '~> 0.17'
37-
spec.add_development_dependency 'webmock', '~> 3.20.0'
37+
spec.add_development_dependency 'webmock', '~> 3.23.0'
3838
spec.add_development_dependency 'yard', '~> 0.9'
3939

4040
if spec.respond_to?(:metadata)

0 commit comments

Comments
 (0)