Skip to content

Commit

Permalink
Merge branch 'main' into cardinality-limit-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias authored Jul 12, 2023
2 parents b43f349 + 9206132 commit 312b794
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 6 deletions.
8 changes: 6 additions & 2 deletions .markdown_link_check_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
],
"replacementPatterns": [
{
"pattern": "^/",
"replacement": "{{BASEURL}}/"
"pattern": "^/",
"replacement": "{{BASEURL}}/"
},
{
"pattern": "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/[^/]+/(specification|supplementary-guidelines)/",
"replacement": "LINK-CHECK-ERROR-USE-LOCAL-PATH-TO-DOC-PAGE-NOT-EXTERNAL-URL/"
}
],
"retryOn429": true,
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@ Added telemetry schemas documents to the specification ([#2008](https://github.c
- Implementations can ignore links with invalid SpanContext([#1492](https://github.com/open-telemetry/opentelemetry-specification/pull/1492))
- Add `none` as a possible value for OTEL_TRACES_EXPORTER to disable export
([#1439](https://github.com/open-telemetry/opentelemetry-specification/pull/1439))
- Add [`ForceFlush`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#forceflush) to SDK's `TracerProvider` ([#1452](https://github.com/open-telemetry/opentelemetry-specification/pull/1452))
- Add [`ForceFlush`](/specification/trace/sdk.md#forceflush) to SDK's `TracerProvider` ([#1452](https://github.com/open-telemetry/opentelemetry-specification/pull/1452))

### Metrics

Expand Down
1 change: 1 addition & 0 deletions specification/common/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!--- Hugo front matter used to generate the website version of this page:
aliases: [/docs/reference/specification/common/common]
--->

# Common specification concepts

**Status**: [Stable, Feature-freeze](../document-status.md)
Expand Down
4 changes: 4 additions & 0 deletions specification/compatibility/opencensus.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!--- Hugo front matter used to generate the website version of this page:
linkTitle: OpenCensus
--->

# OpenCensus Compatibility

**Status**: [Stable](../document-status.md), Unless otherwise specified.
Expand Down
4 changes: 4 additions & 0 deletions specification/compatibility/opentracing.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<!--- Hugo front matter used to generate the website version of this page:
linkTitle: OpenTracing
--->

# OpenTracing Compatibility

**Status**: [Stable](../document-status.md).
Expand Down
7 changes: 7 additions & 0 deletions specification/compatibility/prometheus_and_openmetrics.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<!--- Hugo front matter used to generate the website version of this page:
linkTitle: Prometheus and OpenMetrics
aliases:
- /docs/reference/specification/compatibility/openmetrics
- /docs/specs/otel/compatibility/openmetrics
--->

# Prometheus and OpenMetrics Compatibility

**Status**: [Experimental](../document-status.md)
Expand Down
4 changes: 3 additions & 1 deletion specification/configuration/sdk-environment-variables.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<!--- Hugo front matter used to generate the website version of this page:
title: Environment Variable Specification
linkTitle: Env var
aliases: [/docs/reference/specification/sdk-environment-variables]
aliases:
- /docs/reference/specification/sdk-environment-variables
- /docs/specs/otel/sdk-environment-variables
--->

# OpenTelemetry Environment Variable Specification
Expand Down
1 change: 1 addition & 0 deletions specification/context/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!--- Hugo front matter used to generate the website version of this page:
aliases: [/docs/reference/specification/context/context]
--->

# Context

**Status**: [Stable, Feature-freeze](../document-status.md).
Expand Down
2 changes: 1 addition & 1 deletion specification/logs/noop.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--- Hugo front matter used to generate the website version of this page:
linkTitle: noop
linkTitle: No-Op
--->

# Logs Bridge API No-Op Implementation
Expand Down
2 changes: 1 addition & 1 deletion specification/metrics/noop.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--- Hugo front matter used to generate the website version of this page:
linkTitle: noop
linkTitle: No-Op
--->

# Metrics No-Op API Implementation
Expand Down

0 comments on commit 312b794

Please sign in to comment.