Skip to content

Commit 04f975b

Browse files
committed
Run linting using latest linter
1 parent 3e09510 commit 04f975b

29 files changed

+315
-308
lines changed

.markdownlint.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ no-inline-html: false
1414
fenced-code-language: false
1515
no-duplicate-heading: false
1616
descriptive-link-text: false
17+
first-line-h1: false
18+
no-alt-text: false

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# All documents to be used in spell check.
2-
ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path './node_modules/*' -not -path '*semantic_conventions*' | sort)
2+
ALL_DOCS := $(shell find . -type f -name '*.md' -not -path './.github/*' -not -path './node_modules/*' -not -path '*semantic_conventions*' -not -name 'spec-compliance-matrix.md' | sort)
33
PWD := $(shell pwd)
44

55
TOOLS_DIR := ./internal/tools

oteps/0119-standard-system-metrics.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
5757
#### `system.cpu.`
5858

5959
**Description:** System level processor metrics.
60+
6061
|Name |Units |Instrument Type |Value Type|Label Key|Label Values |
6162
|----------------------|-------|-----------------|----------|---------|-----------------------------------|
6263
|system.cpu.time |seconds|SumObserver |Double |state |idle, user, system, interrupt, etc.|
@@ -67,6 +68,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
6768
#### `system.memory.`
6869

6970
**Description:** System level memory metrics.
71+
7072
|Name |Units|Instrument Type |Value Type|Label Key|Label Values |
7173
|-------------------------|-----|-----------------|----------|---------|------------------------|
7274
|system.memory.usage |bytes|UpDownSumObserver|Int64 |state |used, free, cached, etc.|
@@ -75,6 +77,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
7577
#### `system.swap.`
7678

7779
**Description:** System level swap/paging metrics.
80+
7881
|Name |Units |Instrument Type |Value Type|Label Key|Label Values|
7982
|----------------------------|----------|-----------------|----------|---------|------------|
8083
|system.swap.usage |pages |UpDownSumObserver|Int64 |state |used, free |
@@ -86,6 +89,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
8689
#### `system.disk.`
8790

8891
**Description:** System level disk performance metrics.
92+
8993
|Name |Units |Instrument Type|Value Type|Label Key|Label Values|
9094
|----------------------------|----------|---------------|----------|---------|------------|
9195
|system.disk.io<!--notlink-->|bytes |SumObserver |Int64 |device |(identifier)|
@@ -100,6 +104,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
100104
#### `system.filesystem.`
101105

102106
**Description:** System level filesystem metrics.
107+
103108
|Name |Units|Instrument Type |Value Type|Label Key|Label Values |
104109
|-----------------------------|-----|-----------------|----------|---------|--------------------|
105110
|system.filesystem.usage |bytes|UpDownSumObserver|Int64 |device |(identifier) |
@@ -110,6 +115,7 @@ In the tables below, units of `1` refer to a ratio value that is always in the r
110115
#### `system.network.`
111116

112117
**Description:** System level network metrics.
118+
113119
|Name |Units |Instrument Type |Value Type|Label Key|Label Values |
114120
|-------------------------------|-----------|-----------------|----------|---------|----------------------------------------------------------------------------------------------|
115121
|system.network.dropped\_packets|packets |SumObserver |Int64 |device |(identifier) |

oteps/0199-support-elastic-common-schema-in-opentelemetry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Example of a Nginx Access Log entry structured with ECS
148148
## Principles
149149

150150
| Description | [OTel Logs and Event Record](../specification/logs/data-model.md#log-and-event-record-definition) | [Elastic Common Schema (ECS)](https://www.elastic.co/docs/reference/ecs) |
151-
|-------------|-------------|--------|
151+
| ----------- | ------------- | -------- |
152152
| Metadata shared by all the Log Messages / Spans / Metrics of an application instance | Resource Attributes | ECS fields |
153153
| Metadata specific to each Log Message / Span / Metric data point | Attributes | ECS Fields |
154154
| Message of log events | Body | [message field](https://www.elastic.co/docs/reference/ecs/ecs-base#field-message) |
@@ -159,7 +159,7 @@ Example of a Nginx Access Log entry structured with ECS
159159
## Data Types
160160

161161
| Category | <a href="../specification/logs/data-model.md#log-and-event-record-definition">OTel Logs and Event Record</a> (all or a subset of <a href="https://protobuf.dev/programming-guides/proto3/">GRPC data types</a>) | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/field-data-types">ECS Data Types</a> |
162-
|---|---|---|
162+
| --- | --- | --- |
163163
| Text | string | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/text#text-field-type">text</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/text#match-only-text-field-type">match_only_text</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/keyword#keyword-field-type">keyword</a> <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/keyword#constant-keyword-field-type">constant_keyword</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/keyword#wildcard-field-type">wildcard</a> |
164164
| Dates | uint64 nanoseconds since Unix epoch | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/date">date</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/date_nanos">date_nanos</a> |
165165
| Numbers | number | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/number">long</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/number">double</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/number">scaled_float</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/boolean">boolean</a>… |

oteps/0258-env-context-baggage-carriers.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ Defining the specification for Environment Variables as carriers will have a
145145
wide impact to the industry in enabling better observability to systems outside
146146
of the normal HTTP microservice architecture.
147147

148-
[w3c-bag]: https://www.w3.org/TR/baggage/#header-name
149148
[bag-api]: https://opentelemetry.io/docs/specs/otel/baggage/api/
150149

151150
The above prototype example came from the resources mentioned in [this
@@ -280,9 +279,9 @@ mentioned in [opentelemetry-specification #740](https://github.com/open-telemetr
280279
* [hotel-california](https://github.com/parsonsmatt/hotel-california/issues/3)
281280

282281
Additionally, there was a prototype implementation for environment variables as
283-
context carriers written in the [Python SDK][python-env].
282+
context carriers written in the [Python SDK][python-sdkenv].
284283

285-
[python-env]: https://github.com/open-telemetry/opentelemetry-specification/issues/740#issuecomment-919657003
284+
[python-sdkenv]: https://github.com/open-telemetry/opentelemetry-specification/issues/740#issuecomment-919657003
286285

287286
## Alternatives and why they were not chosen
288287

oteps/4485-extending-attributes-to-support-complex-values.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -295,18 +295,18 @@ This approach reduces performance overhead and the volume of transmitted data an
295295
See [the gist](https://gist.github.com/lmolkova/737ebba190b206a5d60bbc075fea538b)
296296
for additional details.
297297

298-
| Backend | Handles complex attributes gracefully? | Comments |
299-
| --------------------------------- | ----- | ------------------------------ |
300-
| Jaeger (OTLP) | :white_check_mark: | serializes to JSON string |
298+
| Backend | Handles complex attributes gracefully? | Comments |
299+
| ------- | -------------------------------------- | -------- |
300+
| Jaeger (OTLP) | :white_check_mark: | serializes to JSON string |
301301
| Prometheus with OTLP remote write | :white_check_mark: | serializes to JSON string |
302-
| Grafana Tempo (OTLP) | :white_check_mark: | serializes to JSON string, viewable but can't query using this attribute |
303-
| Grafana Loki (OTLP) | :white_check_mark: | flattens |
304-
| Aspire dashboard (OTLP) | :white_check_mark: | serializes to JSON string |
305-
| ClickHouse (collector exporter) | :white_check_mark: | serializes to JSON string, can parse JSON and query |
306-
| Honeycomb (OTLP) | :white_check_mark: | flattens if less than 5 layers deep, not array or binary data, JSON string otherwise |
307-
| Logfire (OTLP) | :white_check_mark: | stored as JSON, native support for JSON in queries |
308-
| New Relic (OTLP) | :white_check_mark: | drops the complex attribute | |
309-
| Splunk (OTLP and HEC exporter) | :white_check_mark: | flattens for logs (HEC), serializes to JSON string for traces and metrics (OTLP) |
302+
| Grafana Tempo (OTLP) | :white_check_mark: | serializes to JSON string, viewable but can't query using this attribute |
303+
| Grafana Loki (OTLP) | :white_check_mark: | flattens |
304+
| Aspire dashboard (OTLP) | :white_check_mark: | serializes to JSON string |
305+
| ClickHouse (collector exporter) | :white_check_mark: | serializes to JSON string, can parse JSON and query |
306+
| Honeycomb (OTLP) | :white_check_mark: | flattens if less than 5 layers deep, not array or binary data, JSON string otherwise |
307+
| Logfire (OTLP) | :white_check_mark: | stored as JSON, native support for JSON in queries |
308+
| New Relic (OTLP) | :white_check_mark: | drops the complex attribute |
309+
| Splunk (OTLP and HEC exporter) | :white_check_mark: | flattens for logs (HEC), serializes to JSON string for traces and metrics (OTLP) |
310310

311311
> [!NOTE]
312312
> This list only reflects the behavior at the time of writing and may change in the future.

oteps/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,3 @@ Have suggestions? Concerns? Questions? **Please** raise an issue or raise the ma
8888
## Background on the OpenTelemetry OTEP process
8989

9090
Our OTEP process borrows from the [Rust RFC](https://github.com/rust-lang/rfcs) and [Kubernetes Enhancement Proposal](https://github.com/kubernetes/enhancements) processes, the former also being [very influential](https://github.com/kubernetes/enhancements/blob/master/keps/sig-architecture/0000-kep-process/README.md#prior-art) on the latter; as well as the [OpenTracing OTEP](https://github.com/opentracing/specification/blob/master/rfc_process.md) process. Massive kudos and thanks to the respective authors and communities for providing excellent prior art 💖
91-
92-
[slack-image]: https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white
93-
[slack-url]: https://cloud-native.slack.com/archives/C01N7PP1THC

oteps/entities/0264-resource-and-entities.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ The following changes are made:
206206
| Field | Type | Description | Changes |
207207
| ----- | ---- | ----------- | ------- |
208208
| schema_url | string | The Schema URL, if known. This is the identifier of the Schema that the resource data is recorded in. This field is deprecated and should no longer be used. | Will be deprecated |
209-
| dropped_attributes_count | integer | dropped_attributes_count is the number of dropped attributes. If the value is 0, then no attributes were dropped. | Unchanged |
210-
| attributes | repeated KeyValue | Set of attributes that describe the resource.<br/><br/>Attribute keys MUST be unique (it is not allowed to have more than one attribute with the same key).| Unchanged |
209+
| dropped_attributes_count | integer | dropped_attributes_count is the number of dropped attributes. If the value is 0, then no attributes were dropped. | Unchanged |
210+
| attributes | repeated KeyValue | Set of attributes that describe the resource.<br/><br/>Attribute keys MUST be unique (it is not allowed to have more than one attribute with the same key). | Unchanged |
211211
| entities | repeated ResourceEntityRef | Set of entities that participate in this Resource. | Added |
212212

213213
The DataModel would ensure that attributes in Resource are produced from both the identifying and descriptive attributes of Entity. This does not mean the protocol needs to transmit duplicate data, that design is TBD.
@@ -220,8 +220,8 @@ The entityref data model, would have the following changes from the original [en
220220
| ----- | ---- | ----------- | ------- |
221221
| schema_url | string | The Schema URL, if known. This is the identifier of the Schema that the entity data is recorded in. To learn more about Schema URL ([see docs](https://opentelemetry.io/docs/specs/otel/schemas/#schema-url)) | added |
222222
| type | string | Defines the type of the entity. MUST not change during the lifetime of the entity. For example: "service" or "host". This field is required and MUST not be empty for valid entities. | unchanged |
223-
| identifying_attributes_keys | repeated string | Attribute Keys that identify the entity.<br/>MUST not change during the lifetime of the entity. The Id must contain at least one attribute.<br/><br/>These keys MUST exists in Resource.attributes.<br/><br/>Follows OpenTelemetry common attribute definition. SHOULD follow OpenTelemetry semantic conventions for attributes.| now a reference |
224-
| descriptive_attributes_keys | repeated string | Descriptive (non-identifying) attribute keys of the entity.<br/>MAY change over the lifetime of the entity. MAY be empty. These attribute keys are not part of entity's identity.<br/><br/>These keys MUST exist in Resource.attributes.<br/><br/>Follows any value definition in the OpenTelemetry spec - it can be a scalar value, byte array, an array or map of values. Arbitrary deep nesting of values for arrays and maps is allowed.<br/><br/>SHOULD follow OpenTelemetry semantic conventions for attributes.| now a reference |
223+
| identifying_attributes_keys | repeated string | Attribute Keys that identify the entity.<br/>MUST not change during the lifetime of the entity. The Id must contain at least one attribute.<br/><br/>These keys MUST exists in Resource.attributes.<br/><br/>Follows OpenTelemetry common attribute definition. SHOULD follow OpenTelemetry semantic conventions for attributes. | now a reference |
224+
| descriptive_attributes_keys | repeated string | Descriptive (non-identifying) attribute keys of the entity.<br/>MAY change over the lifetime of the entity. MAY be empty. These attribute keys are not part of entity's identity.<br/><br/>These keys MUST exist in Resource.attributes.<br/><br/>Follows any value definition in the OpenTelemetry spec - it can be a scalar value, byte array, an array or map of values. Arbitrary deep nesting of values for arrays and maps is allowed.<br/><br/>SHOULD follow OpenTelemetry semantic conventions for attributes. | now a reference |
225225

226226
### Resource Identity
227227

0 commit comments

Comments
 (0)