Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[i18n & ja] Improved fallback config and normalize en doc links #4627

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .htmltest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ IgnoreDirs:
- ^blog/(\d+/)?page/\d+
IgnoreInternalURLs: # list of paths
IgnoreURLs: # list of regexs of paths or URLs to be ignored
- ^(/zh)?/docs/languages/\w+/(api|examples|registry)/$
- ^(/zh)?/docs/collector/registry/$
- ^(/zh)?/docs/languages/net/(metrics-api|traces-api)/
- ^((/zh)?/docs/migration/)?opencensus/$
- ^/community/end-user/feedback-survey/$
- ^(/..)?/docs/languages/\w+/(api|examples|registry)/$
- ^(/..)?/docs/collector/registry/$
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
- ^((/..)?/docs/migration/)?opencensus/$
- ^(/community/end-user/)?feedback-survey/$

- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
- ^https://www\.googletagmanager\.com
Expand Down
12 changes: 6 additions & 6 deletions content/en/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ show_banner: true

<div class="l-primary-buttons mt-5">

- [Learn more](/docs/what-is-opentelemetry/)
- [Try the demo](/docs/demo/)
- [Explore integrations](/ecosystem/integrations)
- [Learn more](docs/what-is-opentelemetry/)
- [Try the demo](docs/demo/)
- [Explore integrations](/ecosystem/integrations/)

</div>

Expand All @@ -37,8 +37,8 @@ show_banner: true
</div>
<div class="l-get-started-buttons">

- [Dev](/docs/getting-started/dev/)
- [Ops](/docs/getting-started/ops/)
- [Dev](docs/getting-started/dev/)
- [Ops](docs/getting-started/ops/)

</div>
{{< /blocks/cover >}}
Expand All @@ -50,7 +50,7 @@ generate, collect, and export telemetry data (metrics, logs, and traces) to help
you analyze your software's performance and behavior.

> OpenTelemetry is **generally available** across
> [several languages](/docs/languages/) and is suitable for use.
> [several languages](docs/languages/) and is suitable for use.

{{% /blocks/lead %}}

Expand Down
2 changes: 1 addition & 1 deletion content/en/community/end-user/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ right place!
[OpenTelemetry YouTube channel](https://www.youtube.com/@otel-official)
- To provide feedback and help prioritize issues:
- Participate in a [direct interview/feedback session](interviews-feedback/)
- Take a [survey](/community/end-user/feedback-survey/)
- Take a [survey](feedback-survey/)
- Join a panel discussion (more info coming soon!)
- Vote on issues (more info coming soon!)

Expand Down
9 changes: 4 additions & 5 deletions content/en/docs/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ aliases: [/docs/workshop/*]
OpenTelemetry, also known as OTel, is a vendor-neutral open source
[Observability](concepts/observability-primer/#what-is-observability) framework
for instrumenting, generating, collecting, and exporting telemetry data such as
[traces](/docs/concepts/signals/traces/),
[metrics](/docs/concepts/signals/metrics/), and
[logs](/docs/concepts/signals/logs/).
[traces](concepts/signals/traces/), [metrics](concepts/signals/metrics/), and
[logs](concepts/signals/logs/).

As an industry-standard, OpenTelemetry is
[supported by more than 40 observability vendors](/ecosystem/vendors/),
integrated by many [libraries, services, and apps](/ecosystem/integrations), and
adopted by [numerous end users](/ecosystem/adopters).
integrated by many [libraries, services, and apps](/ecosystem/integrations/),
and adopted by [numerous end users](/ecosystem/adopters/).

![OpenTelemetry Reference Architecture](/img/otel-diagram.svg)
4 changes: 2 additions & 2 deletions content/en/docs/getting-started/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ observability with OpenTelemetry looks like!

</div>

[^1]: If none of these roles apply to you, [let us know!][].
[^1]: If none of these roles apply to you, [let us know][].

[demo]: /ecosystem/demo/
[let us know!]:
[let us know]:
https://github.com/open-telemetry/opentelemetry.io/issues/new?title=Add%20a%20new%20persona:%20My%20Persona&body=Provide%20a%20description%20of%20your%20role%20and%20responsibilities%20and%20what%20your%20observability%20goals%20are
34 changes: 17 additions & 17 deletions content/en/docs/getting-started/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ OpenTelemetry can help you! To accomplish your goals of having your dependencies
instrumented automatically and instrumenting your own code with our API
manually, we recommend that you learn the following concepts first:

- [What is OpenTelemetry?](/docs/what-is-opentelemetry/)
- [How can I add instrumentation to my code base?](/docs/concepts/instrumentation/code-based/)
- [What is OpenTelemetry?](../../what-is-opentelemetry/)
- [How can I add instrumentation to my code base?](../../concepts/instrumentation/code-based/)

If you develop libraries, frameworks or middleware that is used as a dependency
within other software, we recommend that you learn how you can provide telemetry
natively:

- [How can I add native instrumentation to my library?](/docs/concepts/instrumentation/libraries/)
- [How can I add native instrumentation to my library?](../../concepts/instrumentation/libraries/)

Next, you can deep dive into the documentations for the
[language](/docs/languages/) you are using:

- [C++](/docs/languages/cpp/)
- [.NET](/docs/languages/net/)
- [Erlang / Elixir](/docs/languages/erlang/)
- [Go](/docs/languages/go/)
- [Java](/docs/languages/java/)
- [JavaScript / TypeScript](/docs/languages/js/)
- [PHP](/docs/languages/php/)
- [Python](/docs/languages/python/)
- [Ruby](/docs/languages/ruby/)
- [Rust](/docs/languages/rust/)
- [Swift](/docs/languages/swift/)
- [Other](/docs/languages/other/)
[language](../../languages/) you are using:

- [C++](../../languages/cpp/)
- [.NET](../../languages/net/)
- [Erlang / Elixir](../../languages/erlang/)
- [Go](../../languages/go/)
- [Java](../../languages/java/)
- [JavaScript / TypeScript](../../languages/js/)
- [PHP](../../languages/php/)
- [Python](../../languages/python/)
- [Ruby](../../languages/ruby/)
- [Rust](../../languages/rust/)
- [Swift](../../languages/swift/)
- [Other](../../languages/other/)
10 changes: 5 additions & 5 deletions content/en/docs/getting-started/ops.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ OpenTelemetry can help you! To accomplish your goal of getting telemetry out of
applications without touching their code, we recommend that you learn the
following:

- [What is OpenTelemetry?](/docs/what-is-opentelemetry/)
- [How can I instrument applications without touching their code?](/docs/concepts/instrumentation/zero-code/)
- [How can I set up a collector?](/docs/collector/)
- [How can I get automation for Kubernetes with the OpenTelemetry Operator?](/docs/kubernetes/operator/)
- [What is OpenTelemetry?](../../what-is-opentelemetry/)
- [How can I instrument applications without touching their code?](../../concepts/instrumentation/zero-code/)
- [How can I set up a collector?](../../collector/)
- [How can I get automation for Kubernetes with the OpenTelemetry Operator?](../../kubernetes/operator/)

If you are looking for a set of applications to try things out, you will find
our official [OpenTelemetry demo](/ecosystem/demo/) useful!
our official [OpenTelemetry demo](/ecosystem/demo/) useful.
46 changes: 24 additions & 22 deletions hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -210,50 +210,52 @@ security:

module:
mounts:
## en
- source: content/en
target: content
- source: tmp/community/mission-vision-values.md
target: content/community/mission.md
- source: tmp/community/roadmap.md
target: content/community/roadmap.md
# Specs, currently en only
- source: tmp/otel/specification
target: content/docs/specs/otel
- source: tmp/opamp
target: content/docs/specs/opamp
- source: tmp/otlp/docs/specification.md
target: content/docs/specs/otlp/_index.md
- source: tmp/otlp/docs/img
target: content/docs/specs/otlp/img
- source: tmp/semconv/docs
target: content/docs/specs/semconv

## ja
- source: content/ja
target: content
lang: ja
# fallback pages
# - excludeFiles: specs/*
# source: content/en/docs
# target: content/docs
# lang: ja
- source: content/en/announcements
target: content/announcements
lang: ja
- excludeFiles: specs/*
source: content/en/docs
target: content/docs
lang: ja

## zh
- source: content/zh
target: content
lang: zh
# fallback pages
- source: content/en/announcements
target: content/announcements
lang: zh
- excludeFiles: specs/*
source: content/en/docs
target: content/docs
lang: zh
- source: content/en/announcements
target: content/announcements
lang: zh

# Other site content
- source: tmp/otel/specification
target: content/docs/specs/otel
- source: tmp/opamp
target: content/docs/specs/opamp
- source: tmp/otlp/docs/specification.md
target: content/docs/specs/otlp/_index.md
- source: tmp/otlp/docs/img
target: content/docs/specs/otlp/img
- source: tmp/semconv/docs
target: content/docs/specs/semconv
- source: tmp/community/mission-vision-values.md
target: content/community/mission.md
- source: tmp/community/roadmap.md
target: content/community/roadmap.md
## static
- source: static
target: static
- source: content-modules/semantic-conventions/schemas
Expand Down