Skip to content

Commit 5150701

Browse files
Merge branch 'main' into remove-simplecov-require
2 parents 6bcd2fe + dc076e7 commit 5150701

File tree

78 files changed

+234
-140
lines changed

Some content is hidden

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

78 files changed

+234
-140
lines changed

.cspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ words:
3838
- gemfile
3939
- Gitter
4040
- gruf
41+
- hibachrach
4142
- HTTPX
4243
- httpx
4344
- instrumenter

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

18-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
18+
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
1919
with:
2020
api-key: ${{secrets.FOSSA_API_KEY}}
2121
team: OpenTelemetry
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "18 23 * * 6" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
16+
runs-on: ubuntu-latest
17+
permissions:
18+
# Needed for Code scanning upload
19+
security-events: write
20+
# Needed for GitHub OIDC token if publish_results is true
21+
id-token: write
22+
steps:
23+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
with:
25+
persist-credentials: false
26+
27+
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
28+
with:
29+
results_file: results.sarif
30+
results_format: sarif
31+
publish_results: true
32+
33+
# Upload the results as artifacts (optional). Commenting out will disable
34+
# uploads of run results in SARIF format to the repository Actions tab.
35+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
36+
- name: "Upload artifact"
37+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
38+
with:
39+
name: SARIF file
40+
path: results.sarif
41+
retention-days: 5
42+
43+
# Upload the results to GitHub's code scanning dashboard (optional).
44+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
45+
- name: "Upload to code-scanning"
46+
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
47+
with:
48+
sarif_file: results.sarif

.github/workflows/release-please.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Process Release
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: googleapis/release-please-action@v4.1.4
20+
- uses: googleapis/release-please-action@v4.2.0
2121
id: prepare
2222
# with:
2323
# token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.instrumentation_generator/templates/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ group :test do
2020
gem 'opentelemetry-sdk', '~> 1.0'
2121
gem 'opentelemetry-test-helpers', '~> 0.3'
2222
gem 'rake', '~> 13.0'
23-
gem 'rubocop', '~> 1.72.0'
24-
gem 'rubocop-performance', '~> 1.19.1'
23+
gem 'rubocop', '~> 1.75.1'
24+
gem 'rubocop-performance', '~> 1.24.0'
2525
gem 'simplecov', '~> 0.17.1'
2626
gem 'webmock', '~> 3.24'
2727
gem 'yard', '~> 0.9'

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require: rubocop-performance
1+
plugins: rubocop-performance
22

33
AllCops:
44
TargetRubyVersion: '3.1'

.toys/.data/releases.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,7 @@ gems:
255255
directory: resources/google_cloud_platform
256256
version_rb_path: lib/opentelemetry/resource/detector/google_cloud_platform/version.rb
257257
version_constant: [OpenTelemetry, Resource, Detector, GoogleCloudPlatform, VERSION]
258+
259+
- name: opentelemetry-instrumentation-grpc
260+
directory: instrumentation/grpc
261+
version_constant: [OpenTelemetry, Instrumentation, Grpc, VERSION]

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
source 'https://rubygems.org'
88

99
gem 'rake', '~> 13.0'
10-
gem 'rubocop', '~> 1.72.0'
11-
gem 'rubocop-performance', '~> 1.23.0'
10+
gem 'rubocop', '~> 1.75.1'
11+
gem 'rubocop-performance', '~> 1.24.0'

helpers/mysql/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ group :test do
1313
gem 'minitest', '~> 5.0'
1414
gem 'opentelemetry-test-helpers', '~> 0.3'
1515
gem 'rake', '~> 13.0'
16-
gem 'rubocop', '~> 1.72.0'
17-
gem 'rubocop-performance', '~> 1.23.0'
16+
gem 'rubocop', '~> 1.75.1'
17+
gem 'rubocop-performance', '~> 1.24.0'
1818
gem 'simplecov', '~> 0.22.0'
1919
gem 'yard', '~> 0.9'
2020
gem 'yard-doctest', '~> 0.1.6'

helpers/sql-obfuscation/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ group :test do
1313
gem 'minitest', '~> 5.0'
1414
gem 'opentelemetry-test-helpers', '~> 0.3'
1515
gem 'rake', '~> 13.0'
16-
gem 'rubocop', '~> 1.72.0'
17-
gem 'rubocop-performance', '~> 1.23.0'
16+
gem 'rubocop', '~> 1.75.1'
17+
gem 'rubocop-performance', '~> 1.24.0'
1818
gem 'simplecov', '~> 0.22.0'
1919
gem 'yard', '~> 0.9'
2020
gem 'yard-doctest', '~> 0.1.6'

0 commit comments

Comments
 (0)