Merge branch 'main' into otlp-stdout

open-telemetry · Nov 18, 2024 · 3ededae · 3ededae
2 parents 08a7149 + ca2a0d4
commit 3ededae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/oteps/README.md b/oteps/README.md
@@ -53,11 +53,12 @@ For example, an OTEP proposing configurable sampling *and* various samplers shou
 
 - First, [fork](https://help.github.com/en/articles/fork-a-repo) this repo.
 - Copy [`0000-template.md`](./0000-template.md) to `0000-my-OTEP.md`, where `my-OTEP` is a title relevant to your proposal, and `0000` is the OTEP ID.
+  Leave the number as is for now. Once a Pull Request is made, update this ID to match the PR ID.
 - Fill in the template. Put care into the details: It is important to present convincing motivation, demonstrate an understanding of the design's impact, and honestly assess the drawbacks and potential alternatives.
 
 ### Submitting the OTEP
 
-- An OTEP is `proposed` by posting it as a PR.
+- An OTEP is `proposed` by posting it as a PR. Once the PR is created, update the OTEP file name to use the PR ID as the OTEP ID.
 - An OTEP is `approved` when four reviewers github-approve the PR. The OTEP is then merged.
 - If an OTEP is `rejected` or `withdrawn`, the PR is closed. Note that these OTEPs submissions are still recorded, as GitHub retains both the discussion and the proposal, even if the branch is later deleted.
 - If an OTEP discussion becomes long, and the OTEP then goes through a major revision, the next version of the OTEP can be posted as a new PR, which references the old PR. The old PR is then closed. This makes OTEP review easier to follow and participate in.

diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md
@@ -68,7 +68,7 @@ formats is required. Implementing more than one format is optional.
 | Unicode support for keys and string values                                                       |          | +   | +    | +   | +      | +    | +      | +   | +    | +   | +    | +     |
 | [Span linking](specification/trace/api.md#specifying-links)                                      | Optional | Go  | Java | JS  | Python | Ruby | Erlang | PHP | Rust | C++ | .NET | Swift |
 | Links can be recorded on span creation                                                           |          | +   | +    |     | +      | +    | +      | +   | +    | +   | +    |       |
-| Links can be recorded after span creation                                                        |          | +   |      |     | +      |      |        |     |      | +   |      |       |
+| Links can be recorded after span creation                                                        |          | +   |      |     | +      |      |        |     |      | +   | +    |       |
 | Links order is preserved                                                                         |          | +   | +    |     | +      | +    | +      | +   | +    | +   | +    |       |
 | [Span events](specification/trace/api.md#add-events)                                             | Optional | Go  | Java | JS  | Python | Ruby | Erlang | PHP | Rust | C++ | .NET | Swift |
 | AddEvent                                                                                         |          | +   | +    | +   | +      | +    | +      | +   | +    | +   | +    | +     |

diff --git a/specification/metrics/sdk.md b/specification/metrics/sdk.md
@@ -1025,7 +1025,7 @@ api.context.with(api.trace.setSpan(api.context.active(), span), () => {
 Then an exemplar output in OTLP would consist of:
 
 - The `value` of 1.
-- The `time` when the `add` method was called
+- The `time` when the `add` method was called.
 - The `Attributes` of `{"Z": "z-value"}`, as these are not preserved in the
   resulting metric point.
 - The trace/span id for the `makeRequest` span.
@@ -1072,7 +1072,7 @@ An ExemplarFilter which makes all measurements eligible for being an Exemplar.
 #### AlwaysOff
 
 An ExemplarFilter which makes no measurements eligible for being an Exemplar.
-Using this ExemplarFilter is as good as disabling Exemplar feature.
+Using this ExemplarFilter is as good as disabling the Exemplar feature.
 
 #### TraceBased
 
@@ -1151,7 +1151,7 @@ exemplars.
 
 #### SimpleFixedSizeExemplarReservoir
 
-This reservoir MUST use an uniformly-weighted sampling algorithm based on the
+This reservoir MUST use a uniformly-weighted sampling algorithm based on the
 number of samples the reservoir has seen so far to determine if the offered
 measurements should be sampled. For example, the [simple reservoir sampling
 algorithm](https://en.wikipedia.org/wiki/Reservoir_sampling) can be used:
@@ -1173,7 +1173,7 @@ count is reset every time the reservoir is collected.
 
 This Exemplar reservoir MAY take a configuration parameter for the size of the
 reservoir. If no size configuration is provided, the default size MAY be
-the number of possible concurrent threads (e.g. numer of CPUs) to help reduce
+the number of possible concurrent threads (e.g., number of CPUs) to help reduce
 contention. Otherwise, a default size of `1` SHOULD be used.
 
 #### AlignedHistogramBucketExemplarReservoir