From d670dc978e172f25f12d503f0d63c869e7f03f6d Mon Sep 17 00:00:00 2001 From: Anna Urbiztondo Date: Thu, 9 Jan 2025 15:30:53 +0100 Subject: [PATCH 1/2] Zero-code header --- gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst | 2 +- gdi/opentelemetry/automatic-discovery/discovery-linux.rst | 2 +- gdi/opentelemetry/automatic-discovery/discovery-windows.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst b/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst index 76a2c3df6..21f86c01e 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst @@ -1,7 +1,7 @@ .. _discovery-kubernetes: ************************************************************************ -Automatic discovery for Kubernetes +Automatic discovery and zero-code instrumentation for Kubernetes ************************************************************************ .. meta:: diff --git a/gdi/opentelemetry/automatic-discovery/discovery-linux.rst b/gdi/opentelemetry/automatic-discovery/discovery-linux.rst index 30751c64f..0970f55f1 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-linux.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-linux.rst @@ -1,7 +1,7 @@ .. _discovery-linux: ************************************************************************ -Automatic discovery for Linux +Automatic discovery and zero-code instrumentation for Linux ************************************************************************ .. meta:: diff --git a/gdi/opentelemetry/automatic-discovery/discovery-windows.rst b/gdi/opentelemetry/automatic-discovery/discovery-windows.rst index 7522c6676..4eafcb721 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-windows.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-windows.rst @@ -1,7 +1,7 @@ .. _discovery-windows: ************************************************************************ -Automatic discovery for Windows +Automatic discovery and zero-code instrumentation for Windows ************************************************************************ .. meta:: From 8f9a37e72a97295f4c4c21992466cc49a53ed794 Mon Sep 17 00:00:00 2001 From: Anna Urbiztondo Date: Fri, 10 Jan 2025 11:43:04 +0100 Subject: [PATCH 2/2] Clarifications --- _includes/gdi/auto-discovery-intro.rst | 6 ++++-- .../automatic-discovery/discovery-kubernetes.rst | 2 +- .../automatic-discovery/discovery-linux.rst | 2 +- .../automatic-discovery/discovery-windows.rst | 10 +++------- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/_includes/gdi/auto-discovery-intro.rst b/_includes/gdi/auto-discovery-intro.rst index b9eea6408..87c221661 100644 --- a/_includes/gdi/auto-discovery-intro.rst +++ b/_includes/gdi/auto-discovery-intro.rst @@ -1,3 +1,5 @@ -Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. Auto discovery of services is only available for the Collector in Linux and Kubernetes environments. +Automatic discovery detects and collects signal data from third-party services, such as databases and web servers. Through auto discovery the Collector automatically generates a configuration snipet that you can modify and incorporate into your existing configuration to retrieve your services' data. -With automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`. \ No newline at end of file +.. caution:: Auto discovery of third-party services is only available for the Collector in Linux and Kubernetes environments. + +Via automatic discovery you can also enable zero-code instrumentation of back-end applications, which allows the Collector to retrieve data from application language runtimes without having to modify the source application code or adding any new installation or configuration steps. With this option you won't have to install and configure your instrumentation agents separately. Zero-code instrumentation using the Collector's automatic discovery feature is only available for the Java, Node.js, and .NET language runtimes. Alternatively you can deploy zero-code instrumentation independently from the Collector for 8 back-end languages, as described in :ref:`get-started-application`. \ No newline at end of file diff --git a/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst b/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst index 21f86c01e..48d538661 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-kubernetes.rst @@ -34,7 +34,7 @@ Automatic discovery and zero-code instrumentation for Kubernetes

Get started

-To enable the Collector's zero-code instrumentation of back-end applications written in Java, Node.js, and .NET see :ref:`k8s-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. +To enable zero-code instrumentation of Java, Node.js, and .NET applications running on Kubernetes via auto discovery see :ref:`k8s-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. To use the Collector's automatic discovery of third-party applications in Kubernetes environments see :ref:`k8s-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. diff --git a/gdi/opentelemetry/automatic-discovery/discovery-linux.rst b/gdi/opentelemetry/automatic-discovery/discovery-linux.rst index 0970f55f1..32359cc0a 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-linux.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-linux.rst @@ -33,7 +33,7 @@ Automatic discovery and zero-code instrumentation for Linux

Get started

-To enable the Collector's zero-code instrumentation of back-end applications written in Java, Node.js, and .NET see :ref:`linux-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. +To enable zero-code instrumentation of Java, Node.js, and .NET applications running on Linux via auto discovery see :ref:`linux-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. To use the Collector's automatic discovery and configuration of third-party applications in Linux environments see :ref:`linux-third-party`. With this option you'll only have to reuse a config file automatically generated by the Collector. diff --git a/gdi/opentelemetry/automatic-discovery/discovery-windows.rst b/gdi/opentelemetry/automatic-discovery/discovery-windows.rst index 4eafcb721..8b928f33c 100644 --- a/gdi/opentelemetry/automatic-discovery/discovery-windows.rst +++ b/gdi/opentelemetry/automatic-discovery/discovery-windows.rst @@ -12,8 +12,6 @@ Automatic discovery and zero-code instrumentation for Windows Language runtimes - - .. raw:: html
@@ -24,13 +22,11 @@ Automatic discovery and zero-code instrumentation for Windows
- - - .. raw:: html

Get started

-The Collector for Windows does not support automatic discovery of third-party services. +To enable zero-code instrumentation of .NET applications running on Windows via auto discovery see :ref:`windows-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. + +.. note:: The Collector for Windows does not support automatic discovery of third-party services. -To enable the Collector's zero-code instrumentation of back-end applications written in .NET see :ref:`windows-backend-auto-discovery`. With this option you won't have to install and configure your instrumentation agents separately. \ No newline at end of file