diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f12a2bc5b35a..b19cb73860b1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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/ecosystem/demo/ @open-telemetry/demo-approvers @open-telemetry/demo-approvers content/zh/ @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers content/ja/ @open-telemetry/docs-maintainers @open-telemetry/docs-ja-approvers diff --git a/content/en/blog/2022/debug-otel-with-otel/index.md b/content/en/blog/2022/debug-otel-with-otel/index.md index 530842a4f0bf..622f09478107 100644 --- a/content/en/blog/2022/debug-otel-with-otel/index.md +++ b/content/en/blog/2022/debug-otel-with-otel/index.md @@ -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/ diff --git a/content/en/blog/2023/end-user-discussions-03.md b/content/en/blog/2023/end-user-discussions-03.md index fd88538c28a7..a7e2b4497c27 100644 --- a/content/en/blog/2023/end-user-discussions-03.md +++ b/content/en/blog/2023/end-user-discussions-03.md @@ -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), diff --git a/content/en/docs/concepts/instrumentation/zero-code.md b/content/en/docs/concepts/instrumentation/zero-code.md index 40144874aa87..eff66d682aac 100644 --- a/content/en/docs/concepts/instrumentation/zero-code.md +++ b/content/en/docs/concepts/instrumentation/zero-code.md @@ -48,4 +48,4 @@ Automatic instrumentation is available for the following languages: - [Java](/docs/zero-code/java/) - [JavaScript](/docs/zero-code/js/) - [PHP](/docs/languages/php/automatic/) -- [Python](/docs/languages/python/automatic/) +- [Python](/docs/zero-code/python/) diff --git a/content/en/docs/kubernetes/operator/automatic.md b/content/en/docs/kubernetes/operator/automatic.md index d606c01ed93b..22bd2963d3b2 100644 --- a/content/en/docs/kubernetes/operator/automatic.md +++ b/content/en/docs/kubernetes/operator/automatic.md @@ -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 diff --git a/content/en/docs/languages/python/getting-started.md b/content/en/docs/languages/python/getting-started.md index 53ac6c716ad4..388261189ea3 100644 --- a/content/en/docs/languages/python/getting-started.md +++ b/content/en/docs/languages/python/getting-started.md @@ -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 @@ -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 diff --git a/content/en/docs/languages/python/libraries.md b/content/en/docs/languages/python/libraries.md index faeade39fc33..25cd1ccc1449 100644 --- a/content/en/docs/languages/python/libraries.md +++ b/content/en/docs/languages/python/libraries.md @@ -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). +[automatic instrumentation for Python](/docs/zero-code/python/). [opentelemetry-python-contrib]: https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation#readme diff --git a/content/en/docs/languages/python/automatic/_index.md b/content/en/docs/zero-code/python/_index.md similarity index 96% rename from content/en/docs/languages/python/automatic/_index.md rename to content/en/docs/zero-code/python/_index.md index 3e24342ab725..50d2d9a14cfb 100644 --- a/content/en/docs/languages/python/automatic/_index.md +++ b/content/en/docs/zero-code/python/_index.md @@ -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 --- diff --git a/content/en/docs/languages/python/automatic/configuration.md b/content/en/docs/zero-code/python/configuration.md similarity index 97% rename from content/en/docs/languages/python/automatic/configuration.md rename to content/en/docs/zero-code/python/configuration.md index 11df56fbc064..f0c33f567498 100644 --- a/content/en/docs/languages/python/automatic/configuration.md +++ b/content/en/docs/zero-code/python/configuration.md @@ -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 --- @@ -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: diff --git a/content/en/docs/languages/python/automatic/example.md b/content/en/docs/zero-code/python/example.md similarity index 99% rename from content/en/docs/languages/python/automatic/example.md rename to content/en/docs/zero-code/python/example.md index d1c087a3f342..f791b02f6551 100644 --- a/content/en/docs/languages/python/automatic/example.md +++ b/content/en/docs/zero-code/python/example.md @@ -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 --- diff --git a/content/en/docs/languages/python/automatic/logs-example.md b/content/en/docs/zero-code/python/logs-example.md similarity index 99% rename from content/en/docs/languages/python/automatic/logs-example.md rename to content/en/docs/zero-code/python/logs-example.md index 7df014946a4e..3bd6076e1f0a 100644 --- a/content/en/docs/languages/python/automatic/logs-example.md +++ b/content/en/docs/zero-code/python/logs-example.md @@ -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 --- diff --git a/content/en/docs/languages/python/automatic/operator.md b/content/en/docs/zero-code/python/operator.md similarity index 90% rename from content/en/docs/languages/python/automatic/operator.md rename to content/en/docs/zero-code/python/operator.md index 7b17202b59c9..a08fd5e0219d 100644 --- a/content/en/docs/languages/python/automatic/operator.md +++ b/content/en/docs/zero-code/python/operator.md @@ -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 ---