Skip to content

Commit 3798d46

Browse files
Merge branch 'main' into dependabot/github_actions/actions/create-github-app-token-2.1.4
2 parents b074c27 + 77d462a commit 3798d46

File tree

8 files changed

+33
-4
lines changed

8 files changed

+33
-4
lines changed

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/stale@v9
20+
- uses: actions/stale@v10
2121
name: Clean up stale issues and PRs
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}

instrumentation/all/CHANGELOG.md

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

3+
### v0.81.0 / 2025-09-16
4+
5+
* ADDED: Anthropic initial instrumentation
6+
* ADDED: Add Net::HTTP `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable [#1572](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1572)
7+
38
### v0.80.0 / 2025-08-19
49

510
ADDED: Add `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable compatibility for Rack. This includes an integration with Action Pack (Rails) and Sinatra instrumentation libraries. [#1594](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1594)

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.80.0'
10+
VERSION = '0.81.0'
1111
end
1212
end
1313
end

instrumentation/all/opentelemetry-instrumentation-all.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
2727
spec.required_ruby_version = ">= #{File.read(File.expand_path('../../gemspecs/RUBY_REQUIREMENT', __dir__))}"
2828

2929
spec.add_dependency 'opentelemetry-instrumentation-active_model_serializers', '~> 0.22.0'
30+
spec.add_dependency 'opentelemetry-instrumentation-anthropic', '~> 0.1.0'
3031
spec.add_dependency 'opentelemetry-instrumentation-aws_lambda', '~> 0.3.0'
3132
spec.add_dependency 'opentelemetry-instrumentation-aws_sdk', '~> 0.8.0'
3233
spec.add_dependency 'opentelemetry-instrumentation-bunny', '~> 0.22.0'

instrumentation/aws_lambda/lib/opentelemetry/instrumentation/aws_lambda/wrap.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def wrap_lambda(event:, context:, handler:, flush_timeout: DEFAULT_FLUSH_TIMEOUT
4343
begin
4444
response = yield
4545

46-
unless span.attributes.key?(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE)
46+
if span.recording? && !span.attributes.key?(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE)
4747
status_code = response['statusCode'] || response[:statusCode] if response.is_a?(Hash)
4848
span.set_attribute(OpenTelemetry::SemanticConventions::Trace::HTTP_STATUS_CODE, status_code) if status_code
4949
end

instrumentation/aws_lambda/test/opentelemetry/instrumentation_test.rb

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,25 @@
215215
end
216216
end
217217
end
218+
219+
describe 'no raise error when the span is not recording' do
220+
it 'no raise error' do
221+
otel_wrapper = OpenTelemetry::Instrumentation::AwsLambda::Handler.new
222+
tracer = OpenTelemetry.tracer_provider.tracer
223+
224+
OpenTelemetry::Trace.stub(:with_span, lambda { |_span, &block|
225+
block.call(OpenTelemetry::Trace::Span::INVALID, OpenTelemetry::Context.current)
226+
}) do
227+
tracer.stub(:in_span, lambda { |_name, **_kwargs, &block|
228+
block.call(OpenTelemetry::Trace::Span::INVALID, OpenTelemetry::Context.current)
229+
}) do
230+
otel_wrapper.stub(:call_original_handler, {}) do
231+
assert otel_wrapper.call_wrapped(event: sqs_record, context: context)
232+
end
233+
end
234+
end
235+
end
236+
end
218237
end
219238

220239
describe 'validate_if_span_is_registered' do

instrumentation/rack/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-rack
22

3+
### v0.27.1 / 2025-09-16
4+
5+
* DOCS: Typo in Rack::Instrumentation usage example of middleware_args
6+
37
### v0.27.0 / 2025-08-19
48

59
* ADDED: Add `OTEL_SEMCONV_STABILITY_OPT_IN` environment variable compatibility [#1594](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1594)

instrumentation/rack/lib/opentelemetry/instrumentation/rack/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 Rack
10-
VERSION = '0.27.0'
10+
VERSION = '0.27.1'
1111
end
1212
end
1313
end

0 commit comments

Comments
 (0)