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

Move languages under /docs/instrumentation #963

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
6 changes: 3 additions & 3 deletions content/en/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ mission_url: https://github.com/open-telemetry/community/blob/main/mission-visio
<div class="l-get-started-buttons">

- [Collector]({{< relref "/docs/collector/getting-started" >}})
- [Go]({{< relref "/docs/go/getting-started" >}})
- [.NET]({{< relref "/docs/net/getting-started" >}})
- [JavaScript]({{< relref "/docs/js/getting-started" >}})
- [Go]({{< relref "/docs/instrumentation/go/getting-started" >}})
- [.NET]({{< relref "/docs/instrumentation/net/getting-started" >}})
- [JavaScript]({{< relref "/docs/instrumentation/js/getting-started" >}})
- [<i class="fas fa-ellipsis-h"></i>]({{< relref "docs" >}})
</div>
{{< /blocks/cover >}}
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ others. This page captures terminology used in the project and what it means.
Libraries]({{< relref "/docs/reference/specification/trace/sdk#span-processor" >}})
and the
[Collector](/docs/collector/configuration/#processors).
- **[Propagators](/docs/go/instrumentation/#propagators-and-context):** Used to
- **[Propagators](/docs/instrumentation/go/instrumentation/#propagators-and-context):** Used to
serialize and deserialize specific parts of telemetry data such as span
context and `Baggage` in `Spans`.
- **[Proto](/docs/concepts/components/#proto):** Language independent interface types.
Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/concepts/instrumenting-library.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ try (Scope unused = span.makeCurrent()) {
}
```

Here're the full [examples of context extraction in Java](/docs/java/manual_instrumentation/#context-propagation), check out OpenTelemetry documentation in your language.
Here're the full [examples of context extraction in Java](/docs/instrumentation/java/manual_instrumentation/#context-propagation), check out OpenTelemetry documentation in your language.

In the case of a messaging system, you may receive more than one message at once. Received messages become [*links*](/docs/java/manual_instrumentation/#create-spans-with-links) on the span you create.
In the case of a messaging system, you may receive more than one message at once. Received messages become [*links*](/docs/instrumentation/java/manual_instrumentation/#create-spans-with-links) on the span you create.
Refer to [messaging conventions]({{< relref "/docs/reference/specification/trace/semantic_conventions/messaging" >}}) for details (WARNING: messaging conventions are [under constructions](https://github.com/open-telemetry/oteps/pull/173) 🚧).

### Injecting context
Expand All @@ -200,7 +200,7 @@ try (Scope unused = span.makeCurrent()) {
}
```

Here's the full [example of context injection in Java](/docs/java/manual_instrumentation/#context-propagation).
Here's the full [example of context injection in Java](/docs/instrumentation/java/manual_instrumentation/#context-propagation).

There might be some exceptions:

Expand Down
1 change: 0 additions & 1 deletion content/en/docs/go

This file was deleted.

13 changes: 13 additions & 0 deletions content/en/docs/instrumentation/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
title: Instrumentation
weight: 2
---

OpenTelemetry code instrumentation is supported for the languages listed below.
Depending on the language, topics covered will include some or all of the
following:

- Automatic instrumentation
- Manual instrumentation
- Exporting data

1 change: 1 addition & 0 deletions content/en/docs/instrumentation/go
1 change: 1 addition & 0 deletions content/en/docs/instrumentation/java
1 change: 1 addition & 0 deletions content/en/docs/instrumentation/php
1 change: 1 addition & 0 deletions content/en/docs/instrumentation/python
1 change: 1 addition & 0 deletions content/en/docs/instrumentation/ruby
1 change: 0 additions & 1 deletion content/en/docs/java

This file was deleted.

1 change: 0 additions & 1 deletion content/en/docs/php

This file was deleted.

1 change: 0 additions & 1 deletion content/en/docs/python

This file was deleted.

1 change: 0 additions & 1 deletion content/en/docs/ruby

This file was deleted.

7 changes: 7 additions & 0 deletions layouts/index.redirects
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@
# https://github.com/open-telemetry/opentelemetry.io/issues/635#issuecomment-953920483
/docs/java/automatic_instrumentation https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/README.md
/docs/java/getting_started https://opentelemetry.io/docs/java/manual_instrumentation/

{{ $languages := (.Site.GetPage "/docs/instrumentation").Pages -}}
{{ range $languages -}}
{{ $lang := .File.ContentBaseName -}}
/docs/{{ $lang }} /docs/instrumentation/{{ $lang }}
/docs/{{ $lang }}/* /docs/instrumentation/{{ $lang }}/:splat
{{ end -}}