Skip to content

Commit

Permalink
Merge branch 'main' into relative-links
Browse files Browse the repository at this point in the history
  • Loading branch information
trask authored Jan 21, 2025
2 parents b6e704b + 980ac57 commit 19efed5
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
6 changes: 6 additions & 0 deletions community-members.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ Repo: [open-telemetry/opentelemetry-swift](https://github.com/open-telemetry/ope

The list of active members (both "approvers" and "maintainers") for the OpenTelemetry Swift API & SDK can be found in the [open-telemetry/opentelemetry-swift CONTRIBUTING file](https://github.com/open-telemetry/opentelemetry-swift/blob/main/CONTRIBUTING.md).

## Network collector

Repos: [open-telemetry/opentelemetry-network](https://github.com/open-telemetry/opentelemetry-network) and [open-telemetry/opentelemetry-network-build-tools](https://github.com/open-telemetry/opentelemetry-network-build-tools)

The list of active members (both "approvers" and "maintainers") for OpenTelemetry Network can be found in the [open-telemetry/opentelemetry-network README file](https://github.com/open-telemetry/opentelemetry-network/blob/main/README.md#contributing).

## Community Demo

Repo: [open-telemetry/opentelemetry-demo](https://github.com/open-telemetry/opentelemetry-demo)
Expand Down
5 changes: 3 additions & 2 deletions guides/contributor/processes.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,9 @@ you will need to [retain the original copyright notice](https://github.com/cncf/

Any contributed third-party code must originally be Apache 2.0-Licensed or must
carry a permissive software license that is compatible when combining with
Apache 2.0 License. At this moment, BSD and MIT are the only
[OSI-approved licenses](https://opensource.org/licenses/alphabetical) known to be compatible.
Apache 2.0 License. The [CNCF Allowlist License Policy](https://github.com/cncf/foundation/blob/main/allowed-third-party-license-policy.md#cncf-allowlist-license-policy)
describes the requirements for including third-party code in CNCF codebases,
along with a list of approved compatible licenses.

If you make substantial changes to the third-party code, _prepend_ the contributed
third party file with OpenTelemetry's copyright notice.
Expand Down
3 changes: 2 additions & 1 deletion projects/gen-ai.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generative AI Observability

>[!IMPORTANT] This project extends LLM Semantic Conventions project
> [!IMPORTANT]
> This project extends LLM Semantic Conventions project
## Description

Expand Down
7 changes: 5 additions & 2 deletions projects/go-compile-instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ We want to ensure:

By closely aligning with OpenTelemetry, the Go Compile Instrumentation SIG ensures that Go applications benefit from standardized, vendor-neutral, high-quality observability solutions that are both robust and easy to implement. Having one single, standard tool removes decision points from prospective developers, which makes the path to observability shorter & easier.

## Project Board
Project Board: https://github.com/orgs/open-telemetry/projects/130

## Deliverables

- A flexible and extensible instrumentation framework for Go at compile time
Expand All @@ -40,12 +43,12 @@ We also welcome everyone interested in this area to participate in the discussio

### Required staffing

- Project Lead: @ralf0131(Alibaba Cloud), @dineshg13(Datadog), @pdelewski(QuesmaOrg)
- Project Lead: @ralf0131(Alibaba), @dineshg13(Datadog), @pdelewski(QuesmaOrg)
- Sponsoring GC Members: @jpkrohling

Additionally, the following people will participate in the SIG and be added as approvers once they are OpenTelemetry Github org members:

- Future Approvers: @yiyang0(Alibaba Cloud), @123liuziming(Alibaba Cloud), @RomainMuller(Datadog)
- Future Approvers: @yiyang0(Alibaba), @123liuziming(Alibaba), @RomainMuller(Datadog)

## Meeting Times

Expand Down

0 comments on commit 19efed5

Please # to comment.