Skip to content

Commit b4ea171

Browse files
committed
Review feedback
1 parent 21cc17b commit b4ea171

22 files changed

+59
-53
lines changed

.textlintrc.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ rules:
2424
terminology:
2525
defaultTerms: true
2626
skip: []
27+
exclude:
28+
- 'readme(s)?'
29+
- 'to-?do(s)?(?=[ ,.])'
2730
terms:
2831
- Actix
2932
- Ajax
@@ -87,6 +90,7 @@ rules:
8790
- Python
8891
- Quarkus
8992
- Rails
93+
- README
9094
- Redis
9195
- Ruby
9296
- Rust
@@ -99,6 +103,7 @@ rules:
99103
- Thanos
100104
- Traefik
101105
- TypeScript
106+
- UNIX
102107
- URL
103108
- WordPress
104109
- WSGI
@@ -169,6 +174,7 @@ rules:
169174
- [repos, repositories]
170175
- ['screen[- ]shot(s)?', screenshot$1]
171176
- ['time[- ]stamp(s)?', timestamp$1]
177+
- ["to-?do(s)?", "TODO$1"]
172178
- ["uid['’]?(s)?", UID$1]
173179
- ['(walk)-(throughs?)', $1$2] # cSpell:disable-line
174180
- ['(work)-(arounds?)', $1$2]

CHANGELOG.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ release.
407407
- Define syntax for escaping declarative configuration environment variable
408408
references.
409409
([#4375](https://github.com/open-telemetry/opentelemetry-specification/pull/4375))
410-
- Resolve various declarative config todos.
410+
- Resolve various declarative config TODOs.
411411
([#4394](https://github.com/open-telemetry/opentelemetry-specification/pull/4394))
412412

413413
## v1.41.0 (2025-01-21)
@@ -799,7 +799,7 @@ release.
799799
([#3945](https://github.com/open-telemetry/opentelemetry-specification/pull/3945))
800800
- Prometheus: represent Prometheus Info, StateSet and Unknown-typed metrics in OTLP.
801801
([#3868](https://github.com/open-telemetry/opentelemetry-specification/pull/3868))
802-
- Update and reorganize the Prometheus sdk exporter specification.
802+
- Update and reorganize the Prometheus SDK exporter specification.
803803
([#3872](https://github.com/open-telemetry/opentelemetry-specification/pull/3872))
804804

805805
### SDK Configuration
@@ -1478,9 +1478,9 @@ release.
14781478

14791479
### Logs
14801480

1481-
- Update log readme "request context" to "trace context".
1481+
- Update log README "request context" to "trace context".
14821482
([#3332](https://github.com/open-telemetry/opentelemetry-specification/pull/3332))
1483-
- Remove log readme document status.
1483+
- Remove log README document status.
14841484
([#3334](https://github.com/open-telemetry/opentelemetry-specification/pull/3334))
14851485
- Break out compatibility document on recording trace context in non-OTLP Log Format
14861486
([#3331](https://github.com/open-telemetry/opentelemetry-specification/pull/3331))
@@ -1577,7 +1577,7 @@ release.
15771577

15781578
- Rename Logs API to Logs Bridge API to prevent confusion.
15791579
([#3197](https://github.com/open-telemetry/opentelemetry-specification/pull/3197))
1580-
- Move event language from log readme to event-api.
1580+
- Move event language from log README to event-api.
15811581
([#3252](https://github.com/open-telemetry/opentelemetry-specification/pull/3252))
15821582

15831583
### Resource
@@ -1603,7 +1603,7 @@ release.
16031603
([#3250](https://github.com/open-telemetry/opentelemetry-specification/pull/3250))
16041604
- Mark the attribute naming guidelines in the specification as stable.
16051605
([#3220](https://github.com/open-telemetry/opentelemetry-specification/pull/3220))
1606-
- Mark telemetry schema readme stable.
1606+
- Mark telemetry schema README stable.
16071607
([#3221](https://github.com/open-telemetry/opentelemetry-specification/pull/3221))
16081608
- Remove mention of `net.transport` from HTTP semantic conventions
16091609
([#3244](https://github.com/open-telemetry/opentelemetry-specification/pull/3244))
@@ -1938,7 +1938,7 @@ release.
19381938
([#2874](https://github.com/open-telemetry/opentelemetry-specification/pull/2874))
19391939
- Add `process.paging.faults` metric to semantic conventions
19401940
([#2827](https://github.com/open-telemetry/opentelemetry-specification/pull/2827))
1941-
- Define semantic conventions yaml for Non-OTLP conventions
1941+
- Define semantic conventions YAML for Non-OTLP conventions
19421942
([#2850](https://github.com/open-telemetry/opentelemetry-specification/pull/2850))
19431943
- Add more semantic convetion attributes of Apache RocketMQ
19441944
([#2881](https://github.com/open-telemetry/opentelemetry-specification/pull/2881))
@@ -1990,7 +1990,7 @@ release.
19901990

19911991
- Add environment variables for configuring the `BatchLogRecordProcessor`.
19921992
([#2785](https://github.com/open-telemetry/opentelemetry-specification/pull/2785))
1993-
- Fix inconsistencies in log readme
1993+
- Fix inconsistencies in log README
19941994
([#2800](https://github.com/open-telemetry/opentelemetry-specification/pull/2800)).
19951995

19961996
### Resource
@@ -3052,7 +3052,7 @@ Updates:
30523052
- Resource attributes: lowerecased the allowed values of the `aws.ecs.launchtype`
30533053
attribute
30543054
([#1339](https://github.com/open-telemetry/opentelemetry-specification/pull/1339))
3055-
- Trace Exporters: Fix todos in Jaeger exporter spec
3055+
- Trace Exporters: Fix TODOs in Jaeger exporter spec
30563056
([#1374](https://github.com/open-telemetry/opentelemetry-specification/pull/1374))
30573057
- Clarify that Jaeger/Zipkin exporters must rely on the default Resource to
30583058
get service.name if none was specified.

oteps/0016-named-tracers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Meter meter = OpenTelemetry.getMeterProvider().getMeter("io.opentelemetry.contri
5050

5151
These factories (`TracerProvider` and `MeterProvider`) replace the global `Tracer` / `Meter` singleton objects as ubiquitous points to request Tracer and Meter instances.
5252

53-
The _name_ used to create a Tracer or Meter must identify the _instrumentation_ libraries (also referred to as _integrations_) and not the library being instrumented. These instrumentation libraries could be libraries developed in an OpenTelemetry repository, a 3rd party implementation, or even auto-injected code (see [OpenTelemetry Without Manual Instrumentation OTEP](https://github.com/open-telemetry/oteps/blob/main/text/0001-telemetry-without-manual-instrumentation.md)). See also the examples for identifiers at the end.
53+
The _name_ used to create a Tracer or Meter must identify the _instrumentation_ libraries (also referred to as _integrations_) and not the library being instrumented. These instrumentation libraries could be libraries developed in an OpenTelemetry repository, a third-party implementation, or even auto-injected code (see [OpenTelemetry Without Manual Instrumentation OTEP](https://github.com/open-telemetry/oteps/blob/main/text/0001-telemetry-without-manual-instrumentation.md)). See also the examples for identifiers at the end.
5454
If a library (or application) has instrumentation built-in, it is both the instrumenting and instrumented library and should pass its own name here. In all other cases (and to distinguish them from that case), the distinction between instrumenting and instrumented library is very important. For example, if an HTTP library `com.example.http` is instrumented by either `io.opentelemetry.contrib.examplehttp`, then it is important that the Tracer is not named `com.example.http`, but `io.opentelemetry.contrib.examplehttp` after the actual instrumentation library.
5555

5656
If no name (null or empty string) is specified, following the suggestions in ["error handling proposal"](https://github.com/open-telemetry/opentelemetry-specification/pull/153), a "smart default" will be applied and a default Tracer / Meter implementation is returned.

oteps/0119-standard-system-metrics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This OTEP is largely based on the existing implementation in the OpenTelemetry C
66

77
## Trade-offs and mitigations
88

9-
When naming a metric instrument, there is a trade-off between discoverability and ambiguity. For example, a metric called `system.cpu.load_average` is very discoverable, but the meaning of this metric is ambiguous. [Load average](https://en.wikipedia.org/wiki/Load_(computing)) is well defined on Unix, but is not a standard metric on Windows. While discoverability is important, names must be unambiguous.
9+
When naming a metric instrument, there is a trade-off between discoverability and ambiguity. For example, a metric called `system.cpu.load_average` is very discoverable, but the meaning of this metric is ambiguous. [Load average](https://en.wikipedia.org/wiki/Load_(computing)) is well defined on UNIX, but is not a standard metric on Windows. While discoverability is important, names must be unambiguous.
1010

1111
## Prior art
1212

@@ -151,5 +151,5 @@ Some programming languages have multiple runtime environments that vary signific
151151
- Should the individual runtimes have their specific naming conventions in the spec?
152152
- Is it OK to include instruments specific to an OS (or OS family) under a top-level prefix, as long as they are unambiguous? For example, naming inode related instruments, which of the below is preferred?
153153
1. Top level: `system.filesystem.inodes.*`
154-
2. Unix family level: `system.unix.filesystem.inodes.*`
155-
3. One for each Unix OS: `system.linux.filesystem.inodes.*`, `system.freebsd.filesystem.inodes.*`, `system.netbsd.filesystem.inodes.*`, etc.
154+
2. UNIX family level: `system.unix.filesystem.inodes.*`
155+
3. One for each UNIX OS: `system.linux.filesystem.inodes.*`, `system.freebsd.filesystem.inodes.*`, `system.netbsd.filesystem.inodes.*`, etc.

oteps/0122-otlp-http-json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This is a proposal to add HTTP Transport extension supporting JSON serialization
1919

2020
## Motivation
2121

22-
Protobuf is a relatively big dependency, which some clients are not willing to take. For example, WebJS, iOS/Android (in some scenarios, the size of the installation package is limited, do not want to introduce protobuf dependencies). Plain JSON is a smaller dependency and is built in the standard libraries of many programming languages.
22+
Protobuf is a relatively big dependency, which some clients are not willing to take. For example, WebJS, iOS/Android (in some scenarios, the size of the installation package is limited, do not want to introduce protobuf dependencies). Plain JSON is a smaller dependency and is built-in the standard libraries of many programming languages.
2323

2424
## OTLP/HTTP+JSON Protocol Details
2525

oteps/0152-telemetry-schemas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ The downsides are:
10471047

10481048
## Prior Art
10491049

1050-
- [OpenTelemetry Log Data Model: Body metadata](https://docs.google.com/document/d/1ZExye1lW43owwaxcbjOvl0P2qER-UaYd_MyxItc2h0k/edit#)
1050+
- [OpenTelemetry Log Data Model: Body Metadata](https://docs.google.com/document/d/1ZExye1lW43owwaxcbjOvl0P2qER-UaYd_MyxItc2h0k/edit#)
10511051
by Christian Beedgen.
10521052

10531053
- [Generic event encoding schemas](https://docs.google.com/document/d/11ccT_zBbiCfwKyi6TMuy2sA3nUdElNQsDJOQ79icVKs/edit#)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Example of a NGINX Access Log entry structured with ECS
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> |
162162
| --- | --- | --- |
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> |
164-
| 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> |
164+
| 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>… |
166166
| Objects | uint32, uint64… | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/object">object</a> (JSON object), <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/flattened">flattened</a> (An entire JSON object as a single field value) |
167167
| Structured Objects | No complex semantic data type specified for the moment (e.g. string is being used for ip addresses rather than having an "ip" data structure in OTel). <br/> Note that OTel supports arrays and nested objects. | <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/ip">ip</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/geo-point">geo_point</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/geo-shape">geo_shape</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/version">version</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/range">long_range</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/range">date_range</a>, <a href="https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/range">ip_range</a> |
@@ -185,7 +185,7 @@ As the markdown code of the tables is hard to read and maintain with very long l
185185
</td>
186186
</tr>
187187
<tr>
188-
<td><a href="../specification/logs/data-model.md#log-and-event-record-definition">Timestamp</a> (uint64 nanoseconds since Unix epoch)
188+
<td><a href="../specification/logs/data-model.md#log-and-event-record-definition">Timestamp</a> (uint64 nanoseconds since UNIX epoch)
189189
</td>
190190
<td><a href="https://www.elastic.co/docs/reference/ecs/ecs-base#field-timestamp">@timestamp</a> (date)
191191
</td>

oteps/0225-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ In choosing to recommend JSON schema, the working group looked at the following
299299
* [Cue](https://cuelang.org/) - A promising simpler language to define a schema, the working group decided against CUE because:
300300
* Tooling available for validating CUE files in languages outside of Go were limited.
301301
* Familiarity and learning curve would create problems for both users and contributors of OpenTelemetry.
302-
* [Protobuf](https://protobuf.dev) - With protobuf already used heavily in OpenTelemetry, the format was worth investigating as an option to define the schema. The working group decided against Protobuf because:
302+
* [Protobuf](https://protobuf.dev) - With protobuf already used heavily in OpenTelemetry, the format was worth investigating as an option to define the schema. The working group decided against protobuf because:
303303
* Validation errors are the result of serialization errors which can be difficult to interpret.
304304
* Limitations in the schema definition language result in poor ergonomics if type safety is to be retained.
305305

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ processes.
1111
* [Example Context](#example-context)
1212
* [Distributed Tracing in OpenTofu Prototype Example](#distributed-tracing-in-opentofu-prototype-example)
1313
* [Core Specification Changes](#core-specification-changes)
14-
* [Unix](#unix-limitations)
14+
* [UNIX](#unix-limitations)
1515
* [Windows](#windows-limitations)
1616
* [Allowed Characters](#allowed-characters)
1717
* [Trade-offs and Mitigations](#trade-offs-and-mitigations)
@@ -199,9 +199,9 @@ variables for the carrier that align with context propagator specifications.
199199
[python-env]: https://github.com/Div95/opentelemetry-python/tree/feature/env_propagator/propagator/opentelemetry-propagator-env
200200
[swift-env]: https://github.com/open-telemetry/opentelemetry-swift-core/blob/c84cdc1760e20fc3a448c4e8aaae490f7d48ac67/Sources/OpenTelemetrySdk/Trace/Propagation/EnvironmentContextPropagator.swift
201201

202-
### Unix Limitations
202+
### UNIX Limitations
203203

204-
Unix system utilities use upper-case for environment variables and lower-case
204+
UNIX system utilities use upper-case for environment variables and lower-case
205205
are reserved for applications. Using upper-case will prevent conflicts with
206206
internal application variables.
207207

oteps/entities/0256-entities-data-model.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ type used by the ID field, which is more restricted in the shape.
689689
Are we happy with this discrepancy?
690690

691691
Here is corresponding
692-
[Todo item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411493).
692+
[TODO item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411493).
693693

694694
### Classes of Entity Types
695695

@@ -698,7 +698,7 @@ and non-infrastructure entities (logical entities) such as Service? Is this dist
698698
important?
699699

700700
Here is corresponding
701-
[Todo item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411407).
701+
[TODO item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411407).
702702

703703
### Multiple Observers
704704

@@ -733,7 +733,7 @@ events that contain the same ObserverId value will overwrite attributes from the
733733
reporting of the EntityState event from that observer.
734734

735735
Here is corresponding
736-
[Todo item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411289).
736+
[TODO item](https://github.com/orgs/open-telemetry/projects/85/views/1?pane=issue&itemId=62411289).
737737

738738
### Is Type part of Entity's identity?
739739

@@ -750,7 +750,7 @@ entity that describes the Collector has some other attribute in its ID (for exam
750750
`agent.type` attribute [if it gets accepted](https://github.com/open-telemetry/semantic-conventions/pull/950)).
751751

752752
Here is corresponding
753-
[Todo item](https://github.com/orgs/open-telemetry/projects/85?pane=issue&itemId=57053320).
753+
[TODO item](https://github.com/orgs/open-telemetry/projects/85?pane=issue&itemId=57053320).
754754

755755
### Choosing from Multiple IDs
756756

@@ -762,7 +762,7 @@ We need to provide a recommendation for the cases when more than one valid ident
762762
exists about how to make a choice between the identifiers.
763763

764764
Here is corresponding
765-
[Todo item](https://github.com/orgs/open-telemetry/projects/85?pane=issue&itemId=57053415).
765+
[TODO item](https://github.com/orgs/open-telemetry/projects/85?pane=issue&itemId=57053415).
766766

767767
## Future Work
768768

0 commit comments

Comments
 (0)