Skip to content

chore: merge upstream changes #7

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.

Sign up for GitHub

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

Merged
Hareramrai merged 29 commits into from
Nov 2, 2023
Merged

chore: merge upstream changes #7

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6d7af22
chore: use stable toys version
arielvalentin Sep 27, 2023
48baa03
chore: use stable version of toys release code
arielvalentin Sep 27, 2023
d89b68e
release: Release 2 gems (#675)
github-actions[bot] Sep 27, 2023
1e8fd4e
fix: Fix "uses cases" typo in `CONTRIBUTING.md` (#679)
sambostock Sep 30, 2023
d298d61
chore(deps-dev): update webmock requirement from ~> 3.18.1 to ~> 3.19…
dependabot[bot] Sep 30, 2023
d3690bc
chore(deps-dev): update webmock requirement from ~> 3.18.1 to ~> 3.19…
dependabot[bot] Sep 30, 2023
aaac9bb
fix: Remove dependence on activesupport (#687)
arielvalentin Oct 10, 2023
fc5a75f
fix!: Drop DelayedJob ActiveRecord in Tests (#685)
arielvalentin Oct 10, 2023
93dcf35
fix: Add Rails 7.1 compatability (#684)
arielvalentin Oct 11, 2023
20e1cd0
feat!: obfuscation for mysql2, dalli and postgresql as default option…
xuan-cao-swi Oct 12, 2023
dd90f32
ci: Update test reset code for GraphQL-Ruby 2.1.3 (#691)
rmosolgo Oct 13, 2023
0cc425b
fix: Omit `nil` `net.peer.name` attributes (#693)
yoheyk Oct 16, 2023
9f0521d
ci: upgrade to latest stable version of toys (#694)
arielvalentin Oct 16, 2023
db09e16
release: Release 12 gems (#695)
github-actions[bot] Oct 16, 2023
54ed527
chore: Update CODEOWNERS (#692)
arielvalentin Oct 17, 2023
27448c4
release: Release opentelemetry-instrumentation-all 0.51.0 (was 0.50.1…
github-actions[bot] Oct 17, 2023
6e7f8da
feat(trilogy): instrument connect and ping (#704)
casperisfine Oct 21, 2023
c5f5c58
fix: Remove dependency on ActiveSupport core extensions from Grape in…
Oct 23, 2023
06fba20
release: Release opentelemetry-instrumentation-trilogy 0.57.0 (was 0.…
github-actions[bot] Oct 27, 2023
c1f5e6a
chore(deps): update rubocop requirement from ~> 1.56.2 to ~> 1.57.1 (…
dependabot[bot] Oct 28, 2023
da70047
chore(deps-dev): update rubocop requirement from ~> 1.56.1 to ~> 1.57…
dependabot[bot] Oct 28, 2023
4513de9
chore(deps-dev): update rubocop requirement from ~> 1.56.1 to ~> 1.57…
dependabot[bot] Oct 28, 2023
84b5ea0
chore(deps-dev): update rubocop requirement from ~> 1.56.1 to ~> 1.57…
dependabot[bot] Oct 28, 2023
d1104a0
chore(deps-dev): update rubocop requirement from ~> 1.56.1 to ~> 1.57…
dependabot[bot] Oct 28, 2023
331d5d5
Remove opentelemetry-resource_detectors all-in-one gem (#659)
scbjans Oct 30, 2023
828e137
fix: remove call to ActiveSupport::Notifications.notifier#synchronize…
octokatherine Oct 31, 2023
485300a
chore: Fix linter issue
arielvalentin Oct 31, 2023
5858549
release: Release 2 gems (#710)
github-actions[bot] Oct 31, 2023
36c1f82
Merge remote-tracking branch 'origin/main' into main-aoeur
jdehaan Nov 2, 2023
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
Prev Previous commit
Next Next commit
chore(deps-dev): update webmock requirement from ~> 3.18.1 to ~> 3.19… 
….1 in /resources/google_cloud_platform (open-telemetry#652)
  • Loading branch information
@dependabot
dependabot[bot] authored Sep 30, 2023
commit d3690bc2f384001c23f8bb00cb4e9aec1ca7f328
2 changes: 1 addition & 1 deletion ...urces/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.55.1'
spec.add_development_dependency 'simplecov', '~> 0.17'
spec.add_development_dependency 'webmock', '~> 3.18.1'
spec.add_development_dependency 'webmock', '~> 3.19.1'
spec.add_development_dependency 'yard', '~> 0.9'

if spec.respond_to?(:metadata)
Expand Down