Skip to content

Commit 97556dd

Browse files
Merge branch 'main' into http-methods-fix
2 parents b553b62 + de95c54 commit 97556dd

31 files changed

+1044
-44
lines changed

.cspell.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ words:
7777
- toolset
7878
- traceid
7979
- traceresponse
80+
- Triager
81+
- triagers
8082
- Untrace
8183
- vitess
8284
- webmocks

.github/component_owners.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Keep all in alphabetical order
2+
components:
3+
instrumentation/active_storage:
4+
- ymtdzzz
5+
instrumentation/aws_sdk:
6+
- jterapin
7+
- alextwoods
8+
- NathanielRN
9+
instrumentation/factory_bot:
10+
- americodls
11+
instrumentation/grape:
12+
- muripic
13+
instrumentation/graphql:
14+
- swalkinsha
15+
- rmoslogo
16+
instrumentation/grpc:
17+
- michal-kazmierczak
18+
instrumentation/httpx:
19+
- HoneyryderChuck
20+
instrumentation/mongo:
21+
- johnnyshields
22+
instrumentation/racecar:
23+
- chrisholmes
24+
instrumentation/rspec:
25+
- chrisholmes
26+
instrumentation/que:
27+
- indrekj
28+
processor/baggage:
29+
- robbkidd
30+
- mikegoldsmith
31+
resources/container:
32+
- scbjans
33+
sampler/xray:
34+
- jj22ee

.github/workflows/ci-instrumentation-full.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222
- 'instrumentation/delayed_job/**'
2323
- 'instrumentation/ethon/**'
2424
- 'instrumentation/excon/**'
25+
- 'instrumentation/factory_bot/**'
2526
- 'instrumentation/faraday/**'
2627
- 'instrumentation/grape/**'
2728
- 'instrumentation/graphql/**'
@@ -80,6 +81,7 @@ jobs:
8081
- delayed_job
8182
- ethon
8283
- excon
84+
- factory_bot
8385
- faraday
8486
- grape
8587
- graphql

.github/workflows/ci-markdown-checks.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- '**/*.md'
7+
- .github/workflows/ci-markdown-checks.yml
78

89
permissions:
910
contents: read
@@ -18,7 +19,7 @@ jobs:
1819

1920
# equivalent cli: markdownlint-cli2 "**/*.md" "#**/CHANGELOG.md" --config .markdownlint.json
2021
- name: "Markdown Lint Check"
21-
uses: DavidAnson/markdownlint-cli2-action@v20
22+
uses: DavidAnson/markdownlint-cli2-action@v21
2223
continue-on-error: true
2324
with:
2425
fix: false
@@ -45,7 +46,7 @@ jobs:
4546
runs-on: ubuntu-latest
4647
steps:
4748
- uses: actions/checkout@v5
48-
- uses: streetsidesoftware/cspell-action@v7
49+
- uses: streetsidesoftware/cspell-action@v8
4950
with:
5051
# Files should be consistent with check:spelling files
5152
files: |
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Component Owners'
2+
on:
3+
pull_request_target:
4+
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
run_self:
10+
permissions:
11+
pull-requests: write # required for assigning reviewers to PRs
12+
runs-on: ubuntu-latest
13+
name: Auto Assign Owners
14+
steps:
15+
- uses: dyladan/[email protected]
16+
with:
17+
config-file: .github/component_owners.yml
18+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
46+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
4747
with:
4848
sarif_file: results.sarif

.toys/.data/releases.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ commit_lint:
3030
# * changelog_path: Path to CHANGLEOG.md relative to the gem directory.
3131
# (Required only if it is not in the expected location.)
3232
gems:
33+
- name: opentelemetry-instrumentation-factory_bot
34+
directory: instrumentation/factory_bot
35+
version_constant: [OpenTelemetry, Instrumentation, FactoryBot, VERSION]
36+
3337
- name: opentelemetry-instrumentation-anthropic
3438
directory: instrumentation/anthropic
3539
version_constant: [OpenTelemetry, Instrumentation, Anthropic, VERSION]

CODEOWNERS

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1 @@
1-
#####################################################
2-
#
3-
# List of approvers for this repository
4-
#
5-
#####################################################
6-
#
7-
# Learn about membership in OpenTelemetry community:
8-
# https://github.com/open-telemetry/community/blob/master/community-membership.md
9-
#
10-
#
11-
# Learn about CODEOWNERS file format:
12-
# https://help.github.com/en/articles/about-code-owners
13-
#
14-
151
* @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
16-
17-
resources/container/ @scbjans @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
18-
19-
instrumentation/active_storage/ @ymtdzzz @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
20-
21-
instrumentation/aws_sdk/ @jterapin @alextwoods @NathanielRN @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
22-
23-
instrumentation/grape/ @muripic @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
24-
25-
instrumentation/graphql/ @swalkinshaw @rmoslogo @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
26-
27-
instrumentation/grpc/ @michal-kazmierczak @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
28-
29-
instrumentation/httpx/ @HoneyryderChuck @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
30-
31-
instrumentation/mongo/ @johnnyshields @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
32-
33-
instrumentation/racecar/ @chrisholmes @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
34-
35-
instrumentation/rspec/ @chrisholmes @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
36-
37-
instrumentation/que/ @indrekj @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
38-
39-
processor/baggage/ @robbkidd @mikegoldsmith @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi
40-
41-
sampler/xray/ @jj22ee @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @xuan-cao-swi

CONTRIBUTING.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,55 @@ In addition, when a change is complex or a reviewer is unfamiliar with the code,
231231
the reviewer may seek additional reviews from people more familiar with the
232232
change before merging a PR.
233233

234+
## Component Ownership
235+
236+
This repository contains many components which are maintained by more than the typical set of ruby-contrib maintainers and approvers.
237+
Each component in this repository SHOULD have a component owner who is responsible for maintaining it.
238+
The README.md for each component SHOULD contain its owner, but the source of truth for component ownership is in [.github/component_owners.yml](.github/component_owners.yml).
239+
240+
Component owners are generally given authority to make decisions relating to implementation and feature requests for their components,
241+
provided they follow the best practices set out by the maintainers and the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md)
242+
of the OpenTelemetry Project. To facilitate independent triage of issues pertaining to the owned component, component owners are assigned
243+
[the Triager role](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).
244+
245+
Component owners MUST do their best to maintain a high level of quality, security, performance, and specification compliance within their components.
246+
Maintainers may override the decisions of component owners, but should only do so when they feel one or more of these traits is compromised.
247+
248+
### Becoming a Component Owner
249+
250+
To become a component owner, contributors MUST be a [member](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#member) of the OpenTelemetry GitHub organization.
251+
To become a member, follow the steps in the [community guidelines for membership requirements](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#requirements).
252+
253+
To become a component owner, contributors SHOULD demonstrate prior knowledge of the instrumented package or the concepts therein.
254+
255+
Ways do to so may be by providing proof of:
256+
257+
- current or prior involvement with the community that develops the upstream package
258+
- **Example:** A person working on MongoDB requesting ownership over a MongoDB instrumentation
259+
- current or prior involvement with a community that develops systems with similar concepts
260+
- **Example:** A person previously working on MySQL requesting ownership of a instrumentation package that instruments another database client library instrumentation.
261+
- current or prior extensive use of the instrumented package in other project they are involved in
262+
- **Example:** A person working at a company that makes extensive use of the `koala` library requesting ownership of the `opentelemetry-instrumentation-koala` package.
263+
- a vested interest in the telemetry being emitted from that instrumentation
264+
- **Example:** A person employed at an observability vendor that relies on the continued maintenance of the instrumentation
265+
266+
**Examples of proof may include but are not limited to:**
267+
268+
- Links to issues/PRs they worked on
269+
- Links to blog posts authored by them on behalf of the organization developing that system
270+
- Membership in GitHub teams/organizations that are associated with the development of the upstream package
271+
272+
Aspiring Component Owners MUST agree to uphold the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md) of the OpenTelemetry project.
273+
Further, aspiring component owners are expected to have knowledge of the [OpenTelemetry Semantic Conventions](https://github.com/open-telemetry/semantic-conventions)
274+
and MUST agree to adhere to the rules set out therein.
275+
276+
If all these conditions are met, aspiring component owners are encouraged to self-nominate by opening an issue.
277+
@open-telemetry/ruby-contrib-maintainers will then engage on the issue, may ask questions, and will then - based on the
278+
information provided on the issue - either approve or deny the ownership request. If the ownership request has been
279+
approved, the new component owner opens a PR to add themselves to the list of owners ([.github/component_owners.yml](.github/component_owners.yml))
280+
for that package.
281+
@open-telemetry/ruby-contrib-maintainers will add the component owner to @open-telemetry/ruby-contrib-triagers.
282+
234283
## Releases
235284

236285
This repository includes a set of tools for releasing gems. Only maintainers

helpers/sql-processor/CHANGELOG.md

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

3+
### v0.3.1 / 2025-11-11
4+
5+
* DOCS: Update example to match new gem namespace (sql-processor)
6+
37
### v0.3.0 / 2025-11-04
48

59
* ADDED: Refactor SQL processor file structure for clarity

0 commit comments

Comments
 (0)