Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log record processor with emit updates #9

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
514aa78
Remove codeql action (#1629)
plantfansam Apr 17, 2024
a446199
resolve code-scanning#2 (#1631)
plantfansam Apr 17, 2024
6bae4e1
feat: add stats for serialization time in otlp exporter (#1628)
plantfansam Apr 17, 2024
a1f1629
fix: Update `untraced` to suppress logging "Calling finish on an ende…
yoheyk Apr 23, 2024
7162e34
chore: bump ruby/setup-ruby from 1.165.1 to 1.176.0 (#1635)
robbkidd May 8, 2024
84d64ca
feat: add untraced ctx method (#1634)
robertlaurin May 8, 2024
5172e84
release: Release opentelemetry-common 0.21.0 (was 0.20.1) (#1637)
github-actions[bot] May 8, 2024
343104e
add ruby compatibility documentation (#1638)
dmathieu Jun 4, 2024
6fe397b
fix: revert modifications to Apache license (#1630)
svrnm Jun 4, 2024
50bffdb
release: Release opentelemetry-exporter-otlp 0.27.0 (was 0.26.3) (#1632)
github-actions[bot] Jun 4, 2024
5b2cc8f
chore: bump ruby/setup-ruby to 1.179.0 (#1643)
fbogsany Jun 4, 2024
289b4aa
feat: bump google_protobuf >=3.18, < 5.a (#1645)
colinbendell Jun 19, 2024
8a16f1f
release: Release opentelemetry-exporter-otlp 0.28.0 (was 0.27.0) (#1646)
github-actions[bot] Jun 20, 2024
406cabe
feat: Improve SSL error logging. (#1644)
megabus-tobin Jun 28, 2024
3f106c6
release: Release 4 gems (#1654)
github-actions[bot] Jul 24, 2024
309de20
feat: Update Logger#on_emit to create LogRecords (#1611)
kaylareopelle Jul 25, 2024
5c01a4c
Merge branch 'main' into log-record-processor-with-emit-updates
kaylareopelle Jul 26, 2024
98580c5
Update log_record_limits
kaylareopelle Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/actions/test_gem/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ runs:
# ...but not for appraisals, sadly.
- name: Install Ruby ${{ inputs.ruby }} with dependencies
if: "${{ steps.setup.outputs.appraisals == 'false' }}"
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: "${{ inputs.ruby }}"
working-directory: "${{ steps.setup.outputs.gem_dir }}"
bundler: "latest"
bundler: "2.5.10"
bundler-cache: true
cache-version: "v1-${{ steps.setup.outputs.cache_key }}"

# If we're using appraisals, do it all manually.
- name: Install Ruby ${{ inputs.ruby }} without dependencies
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: "${{ inputs.ruby }}"
bundler: "latest"
bundler: "2.5.10"
working-directory: "${{ steps.setup.outputs.gem_dir }}"
- name: Install dependencies and generate appraisals
if: "${{ steps.setup.outputs.appraisals == 'true' }}"
Expand Down
37 changes: 0 additions & 37 deletions .github/workflows/codeql.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release-hook-on-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: ${{ env.ruby_version }}
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-hook-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: ${{ env.ruby_version }}
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-perform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: ${{ env.ruby_version }}
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: ${{ env.ruby_version }}
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-retry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Ruby ${{ env.ruby_version }}
uses: ruby/setup-ruby@v1.165.1
uses: ruby/setup-ruby@v1.179.0
with:
ruby-version: ${{ env.ruby_version }}
- name: Checkout repo
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright The OpenTelemetry Authors
Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ The [opentelemetry-ruby-contrib repository][contrib-repo] contains instrumentati

OpenTelemetry Ruby follows the [versioning and stability document][otel-versioning] in the OpenTelemetry specification. Notably, we adhere to the outlined version numbering exception, which states that experimental signals may have a `0.x` version number.

## Compatibility

OpenTelemetry Ruby ensures compatibility with the current supported versions of
the [Ruby language](https://www.ruby-lang.org/en/downloads/branches/).

## Useful links

- For more information on OpenTelemetry, visit: <https://opentelemetry.io/>
Expand Down
4 changes: 4 additions & 0 deletions api/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release History: opentelemetry-api

### v1.3.0 / 2024-07-24

* ADDED: Add add_link to span api/sdk

### v1.2.5 / 2024-02-20

* FIXED: Replace Context stack on clear
Expand Down
2 changes: 1 addition & 1 deletion api/lib/opentelemetry/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

module OpenTelemetry
## Current OpenTelemetry version
VERSION = '1.2.5'
VERSION = '1.3.0'
end
2 changes: 2 additions & 0 deletions common/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Bundler/OrderedGems:
Style/FrozenStringLiteralComment:
Exclude:
- gemfiles/**/*
Style/ExplicitBlockArgument:
Enabled: false
Style/StringLiterals:
Exclude:
- gemfiles/**/*
Expand Down
4 changes: 4 additions & 0 deletions common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release History: opentelemetry-common

### v0.21.0 / 2024-05-08

* ADDED: Untraced method updated to support both block and non block structured calls

### v0.20.1 / 2024-02-06

* FIXED: Patch the issue for frozen string on ruby < 3.0 with string interpolation
Expand Down
17 changes: 13 additions & 4 deletions common/lib/opentelemetry/common/utilities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'uri'

module OpenTelemetry
module Common
# Utilities contains common helpers.
Expand Down Expand Up @@ -86,10 +88,17 @@ def truncate_attribute_value(value, limit)
end
end

# Disables tracing within the provided block.
def untraced
Context.with_value(UNTRACED_KEY, true) do |ctx, _|
yield ctx
# Disables tracing within the provided block
# If no block is provided instead returns an
# untraced ctx.
#
# @param [optional Context] context Accepts an explicit context, defaults to current
def untraced(context = Context.current)
context = context.set_value(UNTRACED_KEY, true)
if block_given?
Context.with_current(context) { |ctx| yield ctx }
else
context
end
end

Expand Down
2 changes: 1 addition & 1 deletion common/lib/opentelemetry/common/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

module OpenTelemetry
module Common
VERSION = '0.20.1'
VERSION = '0.21.0'
end
end
7 changes: 7 additions & 0 deletions common/test/opentelemetry/common/utilities_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ def shutdown(timeout: nil); end
common_utils.untraced {}
assert_equal(false, common_utils.untraced?)
end

it 'supports non block format' do
token = OpenTelemetry::Context.attach(common_utils.untraced)
assert_equal(true, common_utils.untraced?)
OpenTelemetry::Context.detach(token)
assert_equal(false, common_utils.untraced?)
end
end

describe '#utf8_encode' do
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading