Skip to content

Commit 516c844

Browse files
authored
Merge branch 'main' into fix-dalli-gat
2 parents 8002aef + 8bf09af commit 516c844

File tree

50 files changed

+347
-337
lines changed

Some content is hidden

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

50 files changed

+347
-337
lines changed

.github/workflows/installation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
ruby-version:
18+
- 3.4
1819
- 3.3
1920
- 3.2
2021
- 3.1
21-
- 3.0
2222
name: ${{ matrix.ruby-version }}
2323
runs-on: ubuntu-latest
2424
steps:

instrumentation/active_model_serializers/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History: opentelemetry-instrumentation-active_model_serializers
22

3+
### v0.21.1 / 2025-01-07
4+
5+
* DOCS: Update action for link check and fix one broken link
6+
37
### v0.21.0 / 2024-12-19
48

59
* ADDED: Upgrade ActiveSupport Instrumentation 0.7.0

instrumentation/active_model_serializers/lib/opentelemetry/instrumentation/active_model_serializers/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
module OpenTelemetry
88
module Instrumentation
99
module ActiveModelSerializers
10-
VERSION = '0.21.0'
10+
VERSION = '0.21.1'
1111
end
1212
end
1313
end

instrumentation/all/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History: opentelemetry-instrumentation-all
22

3+
### v0.71.0 / 2025-01-07
4+
5+
* ADDED: Faraday Minimum v1.0
6+
37
### v0.70.0 / 2024-12-19
48

59
* ADDED: Upgrade ActiveSupport Instrumentation 0.7.0

instrumentation/all/Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ group :test do
1515
.sort
1616
.each { |dir| gem "opentelemetry-helpers-#{dir}", path: "../../helpers/#{dir}" }
1717

18+
excluded_instrumentations = %w[. .. all grpc]
1819
Dir.entries('../')
1920
.select { |entry| File.directory?(File.join('../', entry)) }
20-
.reject { |entry| %w[. .. all].include?(entry) } # rubocop:disable Performance/CollectionLiteralInLoop
21+
.reject { |entry| excluded_instrumentations.include?(entry) }
2122
.sort
2223
.each { |dir| gem "opentelemetry-instrumentation-#{dir}", path: "../#{dir}" }
2324
end

instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
module OpenTelemetry
88
module Instrumentation
99
module All
10-
VERSION = '0.70.0'
10+
VERSION = '0.71.0'
1111
end
1212
end
1313
end

instrumentation/all/opentelemetry-instrumentation-all.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
3535
spec.add_dependency 'opentelemetry-instrumentation-delayed_job', '~> 0.22.0'
3636
spec.add_dependency 'opentelemetry-instrumentation-ethon', '~> 0.21.1'
3737
spec.add_dependency 'opentelemetry-instrumentation-excon', '~> 0.22.0'
38-
spec.add_dependency 'opentelemetry-instrumentation-faraday', '~> 0.24.0'
38+
spec.add_dependency 'opentelemetry-instrumentation-faraday', '~> 0.25.0'
3939
spec.add_dependency 'opentelemetry-instrumentation-grape', '~> 0.2.0'
4040
spec.add_dependency 'opentelemetry-instrumentation-graphql', '~> 0.28.0'
4141
spec.add_dependency 'opentelemetry-instrumentation-gruf', '~> 0.2.0'

instrumentation/faraday/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History: opentelemetry-instrumentation-faraday
22

3+
### v0.25.0 / 2025-01-07
4+
5+
* ADDED: Faraday Minimum v1.0
6+
37
### v0.24.8 / 2024-12-17
48

59
* FIXED: Share Faraday Attrs with Adapter Spans

instrumentation/faraday/lib/opentelemetry/instrumentation/faraday/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
module OpenTelemetry
88
module Instrumentation
99
module Faraday
10-
VERSION = '0.24.8'
10+
VERSION = '0.25.0'
1111
end
1212
end
1313
end

instrumentation/grpc/.rspec

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

0 commit comments

Comments
 (0)