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

[IA] Move python automatic page to zero-code #4717

Merged
merged 4 commits into from
Jun 21, 2024
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ content/en/docs/specs/ @open-telemetry/docs-approvers @open-te
content/en/docs/zero-code/java/ @open-telemetry/docs-approvers @open-telemetry/java-approvers @open-telemetry/java-instrumentation-approvers
content/en/docs/zero-code/js/ @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
content/en/docs/zero-code/net/ @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
content/en/docs/zero-code/python/ @open-telemetry/docs-approvers @open-telemetry/python-approvers
content/en/docs/zero-code/php/ @open-telemetry/docs-approvers @open-telemetry/php-approvers
content/en/ecosystem/demo/ @open-telemetry/demo-approvers @open-telemetry/demo-approvers
content/zh/ @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2022/debug-otel-with-otel/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ COPY opentelemetry_module.conf /etc/nginx/conf.d
https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.1
[java]:
/docs/zero-code/java/agent/configuration/#capturing-http-request-and-response-headers
[python]: /docs/languages/python/automatic/
[python]: /docs/zero-code/python/
2 changes: 1 addition & 1 deletion content/en/blog/2023/end-user-discussions-03.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ agent to the host metrics receiver for infrastructure monitoring.
maturing in OTel; for example, the Java JAR agent takes care of instrumenting
[most libraries](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/supported-libraries.md#libraries--frameworks)
that are used by applications. Auto-instrumentation is also available for
[Python](/docs/languages/python/automatic/), [.NET](/docs/zero-code/net/), and
[Python](/docs/zero-code/python/), [.NET](/docs/zero-code/net/), and
[Node.js](/docs/zero-code/js/).
- If you’re using Kubernetes, they can use the
[OTel operator](https://github.com/open-telemetry/opentelemetry-operator),
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/concepts/instrumentation/zero-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ Automatic instrumentation is available for the following languages:
- [Java](/docs/zero-code/java/)
- [JavaScript](/docs/zero-code/js/)
- [PHP](/docs/zero-code/php/)
- [Python](/docs/languages/python/automatic/)
- [Python](/docs/zero-code/python/)
2 changes: 1 addition & 1 deletion content/en/docs/kubernetes/operator/automatic.md
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ spec:

#### Learn more {#python-learn-more}

[See the Python agent Configuration docs for more details.](/docs/languages/python/automatic/configuration/#disabling-specific-instrumentations)
[See the Python agent Configuration docs for more details.](/docs/zero-code/python/configuration/#disabling-specific-instrumentations)

### Go

Expand Down
8 changes: 4 additions & 4 deletions content/en/docs/languages/python/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ flask run -p 8080

## Instrumentation

Automatic instrumentation will generate telemetry data on your behalf. There are
Zero-code instrumentation will generate telemetry data on your behalf. There are
several options you can take, covered in more detail in
[Automatic Instrumentation](../automatic/). Here we'll use the
[Zero-code Instrumentation](/docs/zero-code/python/). Here we'll use the
`opentelemetry-instrument` agent.

Install the `opentelemetry-distro` package, which contains the OpenTelemetry
Expand Down Expand Up @@ -814,8 +814,8 @@ Value: 1
## Next steps

There are several options available for automatic instrumentation and Python.
See [Automatic Instrumentation](../automatic/) to learn about them and how to
configure them.
See [Zero-code Instrumentation](/docs/zero-code/python/) to learn about them and
how to configure them.

There's a lot more to manual instrumentation than just creating a child span. To
learn details about initializing manual instrumentation and many more parts of
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/python/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ You might also want to configure an appropriate exporter to
telemetry backends.

You can also check the
[automatic instrumentation for Python](/docs/languages/python/automatic).
[Zero-code instrumentation for Python](/docs/zero-code/python/).

[opentelemetry-python-contrib]:
https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation#readme
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
title: Automatic Instrumentation
linkTitle: Automatic
title: Python zero-code instrumentation
linkTitle: Python
weight: 30
aliases: [/docs/languages/python/automatic]
# prettier-ignore
cSpell:ignore: devel distro mkdir myapp pyproject uninstrumented virtualenv Werkzeug
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
title: Agent Configuration
linkTitle: Configuration
weight: 10
aliases: [agent-config]
aliases:
- /docs/languages/python/automatic/configuration
- /docs/languages/python/automatic/agent-config
# prettier-ignore
cSpell:ignore: distro healthcheck mkdir myapp Starlette uninstrumented urllib virtualenv
---
Expand Down Expand Up @@ -119,7 +121,7 @@ outputted.
warning)
- `OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED`: to enable
auto-instrumentation of logs. Attaches OTLP handler to Python root logger. See
example [here](/docs/languages/python/automatic/logs-example)
example [here](/docs/zero-code/python/logs-example)

Examples:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Auto-Instrumentation Example
linkTitle: Example
weight: 20
aliases: [/docs/languages/python/automatic/example]
# prettier-ignore
cSpell:ignore: distro instrumentor mkdir MSIE Referer Starlette uninstrumented venv werkzeug
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Logs Auto-Instrumentation Example
linkTitle: Logs Example
weight: 20
aliases: [/docs/languages/python/automatic/logs-example]
# prettier-ignore
cSpell:ignore: distro instrumentor mkdir MSIE Referer Starlette uninstrumented virtualenv
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
title: Using the OpenTelemetry Operator to Inject Auto-Instrumentation
linkTitle: Operator
aliases: [/docs/languages/python/automatic/operator]
weight: 30
cSpell:ignore: distro mkdir uninstrumented virtualenv
---
Expand Down