Skip to content

Commit

Permalink
Merge branch 'main' into event-sdk-todos
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkuba authored May 17, 2024
2 parents 667158b + f85fe4d commit f38fbab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion spec-compliance-matrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ formats is required. Implementing more than one format is optional.
| `AsynchronousCounter` instrument is supported. | | + | + | + | + | | + | + | + | + | + | |
| `Histogram` instrument is supported. | | + | + | + | + | | + | + | + | + | + | |
| `AsynchronousGauge` instrument is supported. | | + | + | + | + | | + | + | + | + | + | |
| `Gauge` instrument is supported. | | - | - | - | - | | - | - | - | - | - | |
| `Gauge` instrument is supported. | | - | - | - | - | | - | - | + | - | - | |
| `UpDownCounter` instrument is supported. | | + | + | + | + | | + | + | + | + | + | |
| `AsynchronousUpDownCounter` instrument is supported. | | + | + | + | + | | + | + | + | + | + | |
| Instruments have `name` | | + | + | + | + | | + | + | + | + | + | |
Expand Down
2 changes: 1 addition & 1 deletion specification/logs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ There are typically 2 ways to collect logs from these applications.
The first approach, assuming the logs are written to files or to standard
output, requires ability to read file logs, tail them, work correctly when log
rotation is used, optionally also parse the logs to convert them into more
structured formats. Parings requires support for different parser types, which
structured formats. Parsing requires support for different parser types, which
can also be configured to parse custom formats as well as ability to add custom
parsers. Examples of common formats that parsers need to support are: CSV,
Common Log Format, Labeled Tab-separated Values (LTSV), Key/Value Pair format,
Expand Down
6 changes: 3 additions & 3 deletions specification/logs/event-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ using the same [data model](./data-model.md).
However, OpenTelemetry does recognize a subtle semantic difference between
LogRecords and Events: Events are LogRecords which have a `name` which uniquely
defines a particular class or type of event. All events with the same `name`
have `Payloads` that conform to the same schema, which assists in analysis in
have `Body` that conform to the same schema, which assists in analysis in
observability platforms. Events are described in more detail in
the [semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/events.md).

Expand Down Expand Up @@ -112,13 +112,13 @@ The effect of calling this API is to emit an `Event` to the processing pipeline.

* The `Name` of the Event, as described
in [event.name semantic conventions](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/general/events.md).
* The (`AnyValue`) (optional) `Payload` of the Event.
* The (`AnyValue`) (optional) `Body` of the Event.
* The `Timestamp` (optional) of the Event.
* The [Context](../context/README.md) (optional) associated with the Event.
* The `SeverityNumber` (optional) of the Event.
* The `Attributes` (optional) of the Event. Event `Attributes` provide
additional details about the Event which are not part of the
well-defined `Payload`.
well-defined event `Body`.

## Optional and required parameters

Expand Down

0 comments on commit f38fbab

Please sign in to comment.