Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into project
Browse files Browse the repository at this point in the history
  • Loading branch information
tedsuo authored Aug 17, 2023
2 parents ed6d9b6 + dd5d347 commit 2f59f99
Show file tree
Hide file tree
Showing 18 changed files with 241 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ e.g. (at)example_user

- [ ] I have reviewed the community membership guidelines (https://github.com/open-telemetry/community/blob/main/community-membership.md)
- [ ] I have enabled 2FA on my GitHub account. See https://github.com/settings/security
- [ ] I have subscribed to the [Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q) (use http://slack.cncf.io/ to get an invite)
- [ ] I have subscribed to the [Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q) (use https://slack.cncf.io/ to get an invite)
- [ ] I am actively contributing to 1 or more OpenTelemetry subprojects
- [ ] I have two sponsors that meet the sponsor requirements listed in the community membership guidelines. Among other requirements, sponsors must be approvers or maintainers of at least one repository in the organization and not both affiliated with the same company
- [ ] I have spoken to my sponsors ahead of this application, and they have agreed to sponsor my application
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/repo-permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ e.g. https://github.com/open-telemetry/community

e.g. "Give 'Admin' permissions to `@username`" or "Enable branch protection rules for `release-*`"

<!-- Please review the repository configuration guideliens at
<!-- Please review the repository configuration guidelines at
https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md -->

### Purpose
Expand Down
6 changes: 6 additions & 0 deletions .github/scripts/markdown-link-check-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
},
{
"pattern" : "https://www.microsoft.com"
},
{
"pattern" : "https://calendar.google.com/calendar/ical/google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com/public/basic.ics"
},
{
"pattern" : "https://www.myget.org"
}
]
}
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).
## Code attribution

[License information](README.md#License) should be included in all source files where applicable.
Either full or short version of the header should be used as described at [apache.org](http://www.apache.org/foundation/license-faq.html#Apply-My-Software).
Either full or short version of the header should be used as described at [apache.org](https://www.apache.org/foundation/license-faq.html#Apply-My-Software).
It is OK to exclude the year from the copyright notice. For the details on how to apply the copyright,
see the next section.

Expand Down Expand Up @@ -65,7 +65,7 @@ write code to fix them, and get your work reviewed and merged.
Please be aware that, due to the number of issues our triage team deals with, we
cannot offer technical support in GitHub issues. If you have questions about the
development process, feel free to jump into our [Slack
Channel](https://cloud-native.slack.com/archives/CJFCJHG4Q) ([Get an invite to join CNCF](http://slack.cncf.io/)). You can also ask
Channel](https://cloud-native.slack.com/archives/CJFCJHG4Q) ([Get an invite to join CNCF](https://slack.cncf.io/)). You can also ask
questions on [Stack
Overflow](https://stackoverflow.com/questions/tagged/open-telemetry).

Expand Down Expand Up @@ -205,7 +205,7 @@ Conduct](https://github.com/open-telemetry/community/blob/master/code-of-conduct
and must go above and beyond to promote a collaborative, respectful community.

When reviewing PRs from others [The Gentle Art of Patch
Review](http://sage.thesharps.us/2014/09/01/the-gentle-art-of-patch-review/)
Review](https://sage.thesharps.us/2014/09/01/the-gentle-art-of-patch-review/)
suggests an iterative series of focuses which is designed to lead new
contributors to positive collaboration without inundating them initially with
nuances:
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ interested parties and form new special interest groups.

We use [GitHub discussions](https://github.com/open-telemetry/community/discussions) for most communications. Please join us there!

For those who are brand new to OpenTelemetry and want to chat or get redirected to the appropriate place for a specific question, feel free to join [the CNCF OpenTelemetry Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q). If you are new, you can create a CNCF Slack account [here](http://slack.cncf.io/).
For those who are brand new to OpenTelemetry and want to chat or get redirected to the appropriate place for a specific question, feel free to join [the CNCF OpenTelemetry Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q). If you are new, you can create a CNCF Slack account [here](https://slack.cncf.io/).

### Calendar

Expand Down Expand Up @@ -132,6 +132,7 @@ Specification: Configuration|Every other Monday at 8:00 PT|[Google Doc](https://
Instrumentation: General|Every Tuesday at 16:00 PT|[Google Doc](https://docs.google.com/document/d/1dWHhyXnfVife-cQ2DW5-d5Ldp1Lq8Rre2UsHpyo8cEE/)|[Slack](https://cloud-native.slack.com/archives/C01QZFGMLQ7)
Instrumentation: Messaging|Every Thursday at 8:00 PT|[Google Doc](https://docs.google.com/document/d/1dWHhyXnfVife-cQ2DW5-d5Ldp1Lq8Rre2UsHpyo8cEE/)|[Slack](https://cloud-native.slack.com/archives/C01QZFGMLQ7)
Semantic Conventions Working Group|Every Monday at 08:00 PT|[Google Doc](https://docs.google.com/document/d/10xG7DNKWRhxNmFGt3yYd3980a9uwS8lMl2LvQL3VNK8)|[Slack](https://cloud-native.slack.com/archives/C041APFBYQP)|[Armin Ruech](https://github.com/arminru)<br/>[Josh Suereth](https://github.com/jsuereth)<br/>[Reiley Yang](https://github.com/reyang)|
System Semantic Conventions stability WG|Every Wednesday at 08:30 PT<br/>Between 19.07.2023 - 30.08.2023|[Google Doc](https://docs.google.com/document/d/1p5TH57t43XpxA48onLzX4PIr3g6ydYKCtR_AUlsCnQk)|[Slack](https://cloud-native.slack.com/archives/C05CTFE9U4A)|[Josh Suereth](https://github.com/jsuereth)|

### Implementation SIGs

Expand Down Expand Up @@ -159,8 +160,8 @@ Agent Management WG|Every other week on Tuesday at 11:00 PT|[Google Doc](https:/
Prometheus Interoperability WG|Every other week on Wednesday at 08:00 PT|[Google Doc](https://docs.google.com/document/d/19bnXziPn2MZ9wO6684UoI4D-LCjGL5bTJkGhux29bx8/edit#)|[Slack](https://cloud-native.slack.com/archives/C01LSCJBXDZ)|
Client Instrumentation|Every Tuesday at 9:00 AM PT (primary) and every Monday at 12:30 PM PT (half hour)|[Google Doc](https://docs.google.com/document/d/16Vsdh-DM72AfMg_FIt9yT9ExEWF4A_vRbQ3jRNBe09w/edit)|[Slack](https://cloud-native.slack.com/archives/C0239SYARD2)|
Kubernetes Operator|Every other week on Thursday at 09:00 PT|[Google Doc](https://docs.google.com/document/d/1Unbs2qp_j5kp8FfL_lRH-ld7i5EOQpsq0I4djkOOSL4)|[Slack](https://cloud-native.slack.com/archives/C033BJ8BASU)|
Community Demo Application|Every Monday at 8:15 PT|[Google Doc](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98/edit)|[Slack](https://cloud-native.slack.com/archives/C03B4CWV4DA)|
Functions as a Service (FAAS) |Every Tuesday at 12:00 PM PT |[Google Doc](https://docs.google.com/document/d/187XYoQcXQ9JxS_5v2wvZ0NEysaJ02xoOYNXj08pT0zc/edit#)|[Slack](https://cloud-native.slack.com/archives/C04HVBETC9Z)|
Community Demo Application|Every Monday at 8:30 PT|[Google Doc](https://docs.google.com/document/d/16f-JOjKzLgWxULRxY8TmpM_FjlI1sthvKurnqFz9x98/edit)|[Slack](https://cloud-native.slack.com/archives/C03B4CWV4DA)|
Functions as a Service (FAAS) |Every other Tuesday at 12:00 PM PT |[Google Doc](https://docs.google.com/document/d/187XYoQcXQ9JxS_5v2wvZ0NEysaJ02xoOYNXj08pT0zc/edit#)|[Slack](https://cloud-native.slack.com/archives/C04HVBETC9Z)|
OpenTelemetry Profiling WG | Every other week on Thursday at 08:00 AM PT |[Google Doc](https://docs.google.com/document/d/19UqPPPlGE83N37MhS93uRlxsP1_wGxQ33Qv6CDHaEp0/edit?usp=sharing)|[Slack](https://cloud-native.slack.com/archives/C03J794L0BV)|
Security | Weekly on Wednesday at 08:30 AM PT |[Google Doc](https://docs.google.com/document/d/1P2xejC7lEkOV_Z-8E0oZPXLK5HOnUPNuRqKP0ZQ5fpg/edit?usp=sharing)|[Slack](https://cloud-native.slack.com/archives/C05A85QC281)|

Expand Down
2 changes: 1 addition & 1 deletion areas-of-interest.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ contact.
- OpenTelemetry C++
- OpenTelemetry Protocol

<!-- ### [_Your name here_](http://github.com/your_name), Your Company -->
<!-- ### [_Your name here_](https://github.com/your_name), Your Company -->
19 changes: 14 additions & 5 deletions assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ but these individual OpenTelemetry members have been given rights to publish und
* [@jack-berg](https://github.com/jack-berg)
* [@trask](https://github.com/trask)

### PyPI

Link: https://pypi.org/user/opentelemetry/

- Owner: [@codeboten](https://github.com/codeboten)

## Communication channels

### opentelemetry-calendar-contributors Google Group
Expand All @@ -58,7 +64,7 @@ Link: https://groups.google.com/g/opentelemetry-calendar-contributors
- Owners: [@open-telemetry/governance-committee](https://github.com/orgs/open-telemetry/teams/governance-committee)
- Members: SIG maintainers and individuals appointed by maintainers

### OpenTelemetry Calendar Invites Google Group](https://groups.google.com/g/opentelemetry-calendar)
### OpenTelemetry Calendar Invites Google Group

Used to automatically invite members to all OpenTelemetry calendar events, so that time is blocked on their calendars.

Expand Down Expand Up @@ -107,12 +113,14 @@ Link: https://www.youtube.com/channel/UCHZDBZTIfdy94xMjMKz-_MA/videos
To join https://lists.cncf.io/g/cncf-otel-zoomadmins and get admin rights, open a
[CNCF ServiceDesk](https://cncfservicedesk.atlassian.net/).

### Splain account
### Zapier account

Link: https://splain.io/
Link: https://zapier.com

- Used to upload Zoom meeting recordings to Youtube
- Owned by: Amye Scavarda Perrin (CNCF rep)
- Used to automatically add links to Zoom meeting recordings to a
[publicly viewable Google spreadsheet](https://docs.google.com/spreadsheets/d/1SYKfjYhZdm2Wh2Cl6KVQalKg_m4NhTPZqq-8SzEVO6s)
- Admins: [@open-telemetry/governance-committee](https://github.com/orgs/open-telemetry/teams/governance-committee)
(GitHub password is available in the OpenTelemetry Governance 1Password)

### Project Google account: [email protected]

Expand All @@ -126,6 +134,7 @@ Link: https://splain.io/
This is not really an OpenTelemetry asset as we do not have any credentials or admin access for it.

For support:
* Check the [EasyCLA status page](https://status.linuxfoundation.org/)
* Open an [OpenTelemetry community issue](https://github.com/open-telemetry/community/issues/new/choose)
* Ask in the [`#easycla`](https://cloud-native.slack.com/archives/CK8QVEXQB) Slack channel
* Open an [EasyCLA Jira ticket](https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/create/143)
Expand Down
12 changes: 4 additions & 8 deletions community-members.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,11 @@ Logs Approvers:
- [Daniel Jaglowski](https://github.com/djaglowski), observIQ
- [David Poncelow](https://github.com/zenmoto), Splunk

Semantic Convention Approvers:
## Semantic Conventions

- [Christian Neumüller](https://github.com/Oberon00), Dynatrace
- [James Moessis](https://github.com/jamesmoessis), Atlassian
- [Joao Grassi](https://github.com/joaopgrassi), Dynatrace
- [Johannes Tax](https://github.com/pyohannes), Microsoft
- [Liudmila Molkova](https://github.com/lmolkova), Microsoft
- [Sean Marcinak](https://github.com/MovieStoreGuy), Atlassian
- [Ted Young](https://github.com/tedsuo), Lightstep
Repo: [open-telemetry/semantic-conventions](https://github.com/open-telemetry/semantic-conventions)

The list of active members (both "approvers" and "maintainers") for the OpenTelemetry Semantic Conventions can be found in the [open-telemetry/semantic-convention README file](https://github.com/open-telemetry/semantic-conventions/blob/main/README.md).

## Java

Expand Down
2 changes: 1 addition & 1 deletion community-membership.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Defined by: Member of the OpenTelemetry GitHub organization
- Contributing to SIGs, subprojects, or community discussions (e.g. meetings,
chat, email, and discussion forums)
- [Joined the Slack channel](https://cloud-native.slack.com/archives/CJFCJHG4Q)
- [Get an invite to join CNCF](http://slack.cncf.io/)
- [Get an invite to join CNCF](https://slack.cncf.io/)
- Have read the [contributor
guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
- Actively contributing to 1 or more subprojects.
Expand Down
4 changes: 2 additions & 2 deletions docs/how-to-handle-public-calendar.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ meetings can join the group.
To create or edit a meeting, you need to have access to the Public OpenTelemetry calendar (a shared Google calendar) and you must add a Zoom meeting link.

### Gaining Calendar Permissions
All SIG maintainers have permission to edit the Public OpenTelemetry calendar.
To get access to the calendar, please join the Google Group opentelemetry-calendar-contributors@googlegroups.com by submitting a request [here](https://groups.google.com/g/opentelemetry-calendar-contributors).
All SIG maintainers can get access to edit the public OpenTelemetry calendar
by submitting a request to join the [opentelemetry-calendar-contributors Google Group](https://groups.google.com/g/opentelemetry-calendar-contributors).
If your identity is not recognizable from the e-mail you are using to request joining the group, please
request to be added to this Google Group by creating an issue in this repository.

Expand Down
3 changes: 2 additions & 1 deletion docs/using-github-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ Extensions, apps, or bots that can **arbitrarily modify code are NOT allowed**.
- The default answer for installing third party tools in the org is "NO". Justification needs to be provided and supported by multiple org members.
- Open an issue at https://github.com/open-telemetry/community/issues
- Include reasoning and SIG(s) requesting this
- Requests from maintainers typically carry higher weight; please make sure to discuss in the SIG you participate.
- List permissions required by this extension, app, or bot.
- If possible: point to other uses of this extensions in OSS.
- Requests from maintainers typically carry higher weight; please make sure to discuss in the SIG you participate.
- If a third-party tool is requested for a specific repository, it is recommended to tag that repository's maintainers and ask them to +1 the request, such that there is a consensus among the majority of maintainers on adding the tool.
- GC member needs to approve with no other GC members raising concerns. It is recommended to discuss each extension, app, or bot that is about to be installed at GC meeting for awareness.
- Once GC approval received, TC member will install the extension.

Expand Down
16 changes: 16 additions & 0 deletions elections/2023/governance-committee-candidates.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 2023 OpenTelemetry Governance Committee Candidates

## List of candidates

In alphabetical order:

- [Candidate Name](#candidate-name)

<!--
### Candidate 1
![Candidate Name](static/candidate-picture.png)
- Company: Company Name
- GitHub: [username](https://github.com/username)
Description of candidate
---
-->
Loading

0 comments on commit 2f59f99

Please sign in to comment.