Skip to content

Commit

Permalink
Merge branch 'main' into theletterf-consolidate-contributing-guides-f…
Browse files Browse the repository at this point in the history
…urther
  • Loading branch information
theletterf authored Jun 13, 2024
2 parents 2b8b4bb + 7c7b907 commit 6993fd3
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 44 deletions.
2 changes: 1 addition & 1 deletion content/en/docs/concepts/signals/logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Logs are a [stable](/docs/specs/otel/versioning-and-stability/#stable) signal in
the OpenTelemetry specification. For the individual language specific
implementations of the Logs API & SDK, the status is as follows:

{{% logs-support-table %}}
{{% signal-support-table "logs" %}}

## Specification

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/signals/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Metrics are a [stable](/docs/specs/otel/versioning-and-stability/#stable) signal
in the OpenTelemetry specification. For the individual language specific
implementations of the Metrics API & SDK, the status is as follows:

{{% metrics-support-table " " %}}
{{% signal-support-table "metrics" %}}

## Specification

Expand Down
16 changes: 8 additions & 8 deletions data/instrumentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ erlang:
name: Erlang/Elixir
status:
traces: stable
metrics: experimental
logs: experimental
metrics: development
logs: development
go:
name: Go
status:
Expand All @@ -44,19 +44,19 @@ python:
status:
traces: stable
metrics: stable
logs: experimental
logs: development
ruby:
name: Ruby
status:
traces: stable
metrics: in development
logs: in development
metrics: development
logs: development
js:
name: JavaScript
status:
traces: stable
metrics: stable
logs: experimental
logs: development
rust:
name: Rust
status:
Expand All @@ -67,5 +67,5 @@ swift:
name: Swift
status:
traces: stable
metrics: experimental
logs: in development
metrics: development
logs: development
15 changes: 0 additions & 15 deletions layouts/shortcodes/logs-support-table.md

This file was deleted.

15 changes: 0 additions & 15 deletions layouts/shortcodes/metrics-support-table.md

This file was deleted.

16 changes: 16 additions & 0 deletions layouts/shortcodes/signal-support-table.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{{ $data := $.Site.Data.instrumentation }}
{{ $signal := .Get 0 -}}

Language | {{ humanize $signal }} |
| --- | --- |
| [C++](/docs/languages/cpp/) | {{ index $data.cpp.status $signal | humanize }} |
| [C#/.NET](/docs/languages/net/) | {{ index $data.dotnet.status $signal | humanize }} |
| [Erlang/Elixir](/docs/languages/erlang/) | {{ index $data.erlang.status $signal | humanize }} |
| [Go](/docs/languages/go/) | {{ index $data.go.status $signal | humanize }} |
| [Java](/docs/languages/java/) | {{ index $data.java.status $signal | humanize }} |
| [JavaScript](/docs/languages/js/) | {{ index $data.js.status $signal | humanize }} |
| [PHP](/docs/languages/php/) | {{ index $data.php.status $signal | humanize }} |
| [Python](/docs/languages/python/) | {{index $data.python.status $signal | humanize }} |
| [Ruby](/docs/languages/ruby/) | {{ index $data.ruby.status $signal | humanize }} |
| [Rust](/docs/languages/rust/) | {{ index $data.rust.status $signal | humanize }} |
| [Swift](/docs/languages/swift/) | {{ index $data.swift.status $signal | humanize }} |
10 changes: 6 additions & 4 deletions scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@ ()

# Fix links that are to the title of the .md page
# TODO: fix these in the spec
s|(/context/api-propagators.md)#propagators-api|$1|g;
s|(/semantic_conventions/faas.md)#function-as-a-service|$1|g;
s|(/resource/sdk.md)#resource-sdk|$1|g;
s|(event-api.md#)(data-model)|$1event-$2|g;
s|(/context/api-propagators.md)#propagators-api|$1|g
if $otelSpecVers le '1.34.0'; # Ensure that https://github.com/open-telemetry/opentelemetry-specification/pull/4080 is in the new release
s|(/resource/sdk.md)#resource-sdk|$1|g
if $semconvVers le '1.26.0'; # Ensure that https://github.com/open-telemetry/semantic-conventions/pull/1154 is in the new release
s|(event-api.md#)(data-model)|$1event-$2|g
if $otelSpecVers le '1.34.0'; # Ensure that https://github.com/open-telemetry/opentelemetry-specification/pull/4075 is in the new release

s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/;
s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/;
Expand Down

0 comments on commit 6993fd3

Please sign in to comment.