Merge branch 'main' into add-top-level-api-docs

open-telemetry · Sep 16, 2024 · 0f36514 · 0f36514
2 parents 8f2ec10 + df604b8
commit 0f36514
Show file tree

Hide file tree

Showing 15 changed files with 5,170 additions and 7 deletions.
diff --git a/.cspell.yml b/.cspell.yml
@@ -9,6 +9,7 @@ import:
 caseSensitive: true
 ignorePaths:
   - '*.svg'
+  - data/community/members.yaml
   - vendors.yaml
   - content/ja
   - content/zh

diff --git a/content/en/community/end-user/_index.md b/content/en/community/end-user/_index.md
@@ -2,6 +2,7 @@
 title: End-user resources
 linkTitle: End user
 description: Vendor-agnostic resources for OpenTelemetry users
+weight: 40
 ---
 
 Looking to connect with other OpenTelemetry end users in a vendor-agnostic

diff --git a/content/en/community/marketing-guidelines.md b/content/en/community/marketing-guidelines.md
@@ -2,6 +2,7 @@
 title: OpenTelemetry Marketing Guidelines for Contributing Organizations
 linkTitle: Marketing Guidelines
 cSpell:ignore: devstats
+weight: 999
 ---
 
 OpenTelemetry (aka OTel) is a collaboration among end-users, adjacent OSS

diff --git a/content/en/community/members.md b/content/en/community/members.md
@@ -0,0 +1,75 @@
+---
+title: Members of the OpenTelemetry Project
+linkTitle: Members
+weight: 30
+cSpell:ignore: subproject triagers
+---
+
+The OpenTelemetry community consists of many individuals from different
+backgrounds, who help to accomplish the
+[vision and mission](/community/mission/) of the project.
+
+Below you find all the established community members in their different roles
+for the project.
+
+If you are a contributor to the OpenTelemetry project already, and not listed
+here, you either have not
+[set your membership to public](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership),
+or you need to take a look in our
+[contributor guidelines](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md)
+on how you can start your contributor as a member, and move up the ladder, all
+the way to maintainer!
+
+## Governance Committee
+
+The Governance Committee (GC) is the governing body of the OpenTelemetry
+project. Members of the GC are
+[elected by the Members Of Standing in the OpenTelemetry community](https://github.com/open-telemetry/community/blob/main/governance-charter.md#elections)
+
+{{% community/members-list "governance-committee" %}}
+
+## Technical Committee
+
+The Technical Committee (TC) is responsible for all technical development within
+the OpenTelemetry project.
+
+{{% community/members-list "technical-committee" %}}
+
+## Specification Sponsors
+
+Specification sponsors are trusted collaborators of the technical committee, and
+work to review, approve, and sponsor
+[OpenTelemetry specification](/docs/specs/otel/) issues and PRs.
+
+{{% community/members-list "spec-sponsors" %}}
+
+## Maintainers
+
+Maintainers are the technical authority for a subproject in the OpenTelemetry
+project. Maintainers set technical direction and make or approve design
+decisions for their subproject.
+
+{{% community/members-list "maintainers" %}}
+
+## Approvers
+
+Code approvers are able to both review and approve code contributions, as well
+as help maintainers triage issues and do project management.
+
+{{% community/members-list "approvers" %}}
+
+## Triagers
+
+Triagers assist the maintainers and approvers with project management and
+backlog organization. The specific workflows and triage requirements depend on
+the project, and are set by the project maintainers.
+
+{{% community/members-list "triagers" %}}
+
+## Members
+
+Members are continuously active contributors in the community. They can have
+issues and PRs assigned to them. Members are expected to participate in SIG(s)
+and remain active contributors to the community.
+
+{{% community/members-list "members" %}}
diff --git a/content/en/docs/languages/java/_index.md b/content/en/docs/languages/java/_index.md
@@ -6,7 +6,7 @@ description: >-
 aliases: [/java, /java/metrics, /java/tracing]
 cascade:
   vers:
-    instrumentation: 2.7.0
+    instrumentation: 2.8.0
     otel: 1.42.1
     semconv: 1.27.0
 weight: 18

diff --git a/content/en/docs/languages/java/configuration.md b/content/en/docs/languages/java/configuration.md
@@ -200,7 +200,9 @@ exporters.
 | `otel.exporter.otlp.metrics.default.histogram.aggregation` | The preferred default histogram aggregation. Options include `BASE2_EXPONENTIAL_BUCKET_HISTOGRAM` and `EXPLICIT_BUCKET_HISTOGRAM`.                                                                                                                                                                                                                                                                                                   | `EXPLICIT_BUCKET_HISTOGRAM`                                                                                                |
 | `otel.experimental.exporter.otlp.retry.enabled`            | If `true`, enable [experimental retry support](#otlp-exporter-retry).                                                                                                                                                                                                                                                                                                                                                                | `false`                                                                                                                    |
 
-[^2]: OpenTelemetry Java agent 2.x uses `http/protobuf` by default.
+[^2]:
+    The OpenTelemetry Java agent 2.x and the OpenTelemetry Spring Boot starter
+    use `http/protobuf` by default.
 
 ##### OTLP exporter retry