Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit 55c116d

Browse files
Merge pull request #2480 from splunk/urbiz-OD6494-autoconfig-sweep
[6494]: AD/zero-code sweep
2 parents 317553d + 060f09b commit 55c116d

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

gdi/opentelemetry/automatic-discovery/k8s/k8s-java-traces-tutorial/about-k8s-java-traces-tutorial.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Tutorial: Capture traces from a Java application in Kubernetes
1515
deploy-collector-k8s-java.rst
1616
k8s-java-view-apm.rst
1717

18-
Follow this tutorial for a walkthrough of instrumenting a sample Java application in a Kubernetes environment by using Splunk automatic instrumentation (formerly Zero Configuration Auto Instrumentation).
18+
Follow this tutorial for a walkthrough of instrumenting a sample Java application in a Kubernetes environment using Splunk zero-code instrumentation (formerly Zero Configuration Auto Instrumentation).
1919

2020
.. raw:: html
2121

gdi/opentelemetry/collector-kubernetes/install-k8s.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ If the chart is deployed successfully, the output displays a message informing t
179179
Use the Kubernetes Operator in OpenTelemetry
180180
============================================================================================
181181

182-
Using the Splunk Helm chart, you can install the Splunk Collector along with an upstream OpenTelemetry Kubernetes Operator for Auto Instrumentation. For more information, see :ref:`discovery-kubernetes`.
182+
Using the Splunk Helm chart, you can install the Splunk Collector along with an upstream OpenTelemetry Kubernetes Operator for zero-code instrumentation. For more information, see :ref:`discovery-kubernetes`.
183183

184184
This instance of the Kubernetes Operator is part of the upstream OpenTelemetry Operator project. See the :new-page:`OpenTelemetry Operator documentation <https://github.com/open-telemetry/opentelemetry-operator>` in GitHub for more information.
185185

gdi/opentelemetry/collector-linux/deployments-linux-ansible.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ The following table describes the variables that can be configured for this role
105105

106106
.. _ansible-zero-config:
107107

108-
Configure automatic discovery for back-end applications (Linux only)
109-
====================================================================
108+
Configure automatic discovery with zero-code instrumentation for back-end applications (Linux only)
109+
=================================================================================================================
110110

111-
You can automatically discover and instrument your back-end applications along with the Collector installation. Automatic discovery (formerly zero configuration auto instrumentation) removes the need to install and configure the SDKs separately. See :ref:`configure-auto-instrumentation` for more information.
111+
You can automatically discover and instrument your back-end applications along with the Collector installation. Automatic discovery (formerly zero configuration auto instrumentation) removes the need to install and configure the SDKs separately. See :ref:`configure-auto-instrumentation-linux` for more information.
112112

113113
The following table shows the variables that you can configure for this Ansible role:
114114

gdi/opentelemetry/collector-linux/deployments-linux-salt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ For Linux, the formula accepts the attributes described in the following table:
129129
Configure automatic discovery for back-end application(s)
130130
======================================================================
131131

132-
You can automatically instrument your back-end applications along with the Collector installation. Automatic discovery removes the need to install and configure the OpenTelemetry SDKs separately. See :ref:`configure-auto-instrumentation` for more information.
132+
You can automatically instrument your back-end applications along with the Collector installation. Automatic discovery removes the need to install and configure the OpenTelemetry SDKs separately. See :ref:`configure-auto-instrumentation-linux` for more information.
133133

134134
The following table shows the variables that can be configured for this Salt module:
135135

gdi/opentelemetry/collector-linux/install-linux-manual.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ To install the Collector for Linux using a RPM package, set up the package repos
117117
118118
yum install -y splunk-otel-collector
119119
120-
# Optional: install Splunk OpenTelemetry Auto Instrumentation
120+
# Optional: install Splunk OpenTelemetry zero-code instrumentation
121121
yum install -y splunk-otel-auto-instrumentation
122122
123123
.. tab:: dnf
@@ -137,7 +137,7 @@ To install the Collector for Linux using a RPM package, set up the package repos
137137
138138
dnf install -y splunk-otel-collector
139139
140-
# Optional: install Splunk OpenTelemetry Auto Instrumentation
140+
# Optional: install Splunk OpenTelemetry zero-code instrumentation
141141
dnf install -y splunk-otel-auto-instrumentation
142142
143143
.. tab:: zypper
@@ -157,7 +157,7 @@ To install the Collector for Linux using a RPM package, set up the package repos
157157
158158
zypper install -y splunk-otel-collector
159159
160-
# Optional: install Splunk OpenTelemetry Auto Instrumentation
160+
# Optional: install Splunk OpenTelemetry zero-code instrumentation
161161
zypper install -y splunk-otel-auto-instrumentation
162162
163163
See also:
@@ -251,7 +251,7 @@ The following applies:
251251
252252
.. _linux-packages-auto:
253253
254-
Auto Instrumentation with Debian and RPM packages
254+
Zero-code instrumentation with Debian and RPM packages
255255
--------------------------------------------------------------
256256
257257
If you prefer to install the Collector without the installer script or the Debian/RPM repositories, download the individual Debian or RPM package from the GitHub releases page and install it as shown below.
@@ -260,9 +260,9 @@ Note that:
260260
261261
* You need to have root privileges.
262262
* Download the appropriate ``splunk-otel-auto-instrumentation`` Debian or RPM package for the target system in GitHub at :new-page:`Splunk OTel Collector releases <https://github.com/signalfx/splunk-otel-collector/releases>`.
263-
* Replace ``<path to splunk-otel-auto-instrumentation deb/rpm>`` with the local path to the downloaded Auto Instrumentation package.
263+
* Replace ``<path to splunk-otel-auto-instrumentation deb/rpm>`` with the local path to the downloaded zero-code instrumentation package.
264264
265-
Run the following commands to install the Auto Instrumentation package:
265+
Run the following commands to install the zero-code instrumentation package:
266266
267267
.. tabs::
268268
@@ -278,7 +278,7 @@ Run the following commands to install the Auto Instrumentation package:
278278
279279
rpm -ivh <path to splunk-otel-auto-instrumentation rpm>
280280
281-
To upgrade the Auto Instrumentation package, run:
281+
To upgrade the zero-code instrumentation package, run:
282282
283283
.. tabs::
284284
@@ -294,13 +294,14 @@ To upgrade the Auto Instrumentation package, run:
294294
295295
sudo rpm -Uvh <path to splunk-otel-auto-instrumentation rpm>
296296
297-
Auto Instrumentation agents
297+
Zero-code instrumentation agents
298298
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
299299
300-
The ``splunk-otel-auto-instrumentation`` deb/rpm package installs and supports configuration for the following Auto Instrumentation agents:
300+
The ``splunk-otel-auto-instrumentation`` deb/rpm package installs and supports configuration for the following zero-code instrumentation agents:
301301
302302
* Java
303303
* Node.js
304+
* .Net
304305
305306
To learn more, see :ref:`linux-backend-auto-discovery`.
306307

gdi/opentelemetry/collector-linux/install-linux.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ To skip these steps and use configured repos on the target system that provide t
8585
sudo sh /tmp/splunk-otel-collector.sh --realm $SPLUNK_REALM --skip-collector-repo --skip-fluentd-repo \
8686
-- $SPLUNK_ACCESS_TOKEN
8787
88-
.. _configure-auto-instrumentation:
88+
.. _configure-auto-instrumentation-linux:
8989

9090
Configure automatic discovery for back-end applications
9191
==================================================================
@@ -215,8 +215,8 @@ Collector
215215
- Removes the Splunk OpenTelemetry Collector for Linux.
216216
-
217217

218-
Automatic Discovery for back-end services
219-
--------------------------------------------------------------------
218+
Automatic discovery with zero-code instrumentation for back-end services
219+
---------------------------------------------------------------------------------------
220220

221221
.. list-table::
222222
:header-rows: 1
@@ -227,16 +227,16 @@ Automatic Discovery for back-end services
227227
- Description
228228
- Default value
229229
* - ``--with[out]-instrumentation``
230-
- Whether to install the ``splunk-otel-auto-instrumentation`` package and add the ``libsplunk.so`` shared object library to ``/etc/ld.so.preload`` to activate auto instrumentation for all supported processes on the host. Cannot be combined with the ``--with-systemd-instrumentation`` option. See :ref:`linux-backend-auto-discovery` for more information.
230+
- Whether to install the ``splunk-otel-auto-instrumentation`` package and add the ``libsplunk.so`` shared object library to ``/etc/ld.so.preload`` to activate zero-code instrumentation for all supported processes on the host. Cannot be combined with the ``--with-systemd-instrumentation`` option. See :ref:`linux-backend-auto-discovery` for more information.
231231
- ``--without-instrumentation``
232232
* - ``--with[out]-systemd-instrumentation``
233-
- Whether to install the ``splunk-otel-auto-instrumentation`` package and configure a systemd drop-in file to activate auto instrumentation for all supported applications running as systemd services. Cannot be combined with the ``--with-instrumentation`` option. See :ref:`linux-backend-auto-discovery` for more information.
233+
- Whether to install the ``splunk-otel-auto-instrumentation`` package and configure a systemd drop-in file to activate zero-code instrumentation for all supported applications running as systemd services. Cannot be combined with the ``--with-instrumentation`` option. See :ref:`linux-backend-auto-discovery` for more information.
234234
- ``--without-systemd-instrumentation``
235235
* - ``--with[out]-instrumentation-sdk <sdk>``
236-
- Whether to enable auto instrumentation for a specific language. This option takes a comma separated set of values representing supported auto-instrumentation SDKs. Currently supported values: ``java``, ``node``, and ``dotnet``. Use ``--with-instrumentation-sdk`` to enable only the specified language(s), for example ``--with-instrumentation-sdk java``. Note: .NET (``dotnet``) auto instrumentation is only supported on x86_64/amd64.
236+
- Whether to enable zero-code instrumentation for a specific language. This option takes a comma separated set of values representing supported auto-instrumentation SDKs. Currently supported values: ``java``, ``node``, and ``dotnet``. Use ``--with-instrumentation-sdk`` to enable only the specified language(s), for example ``--with-instrumentation-sdk java``. Note: .NET (``dotnet``) zero-code instrumentation is only supported on x86_64/amd64.
237237
- ``--with-instrumentation-sdk java,nodejs,dotnet``
238238
* - ``--npm-path <path>``
239-
- If Auto Instrumentation for Node.js is enabled, ``npm`` is required to install the included Splunk OpenTelemetry Auto Instrumentation for Node.js package. If ``npm`` is not found via the ``command -v npm`` shell command or if installation fails, Auto Instrumentation for Node.js will not be activated. Use this option to specify a custom path to ``npm``, for example ``--npm-path /my/path/to/npm``.
239+
- If zero-code instrumentation for Node.js is enabled, ``npm`` is required to install the included Splunk OpenTelemetry zero-code instrumentation for Node.js package. If ``npm`` is not found via the ``command -v npm`` shell command or if installation fails, zero-code instrumentation for Node.js will not be activated. Use this option to specify a custom path to ``npm``, for example ``--npm-path /my/path/to/npm``.
240240
- ``npm``
241241
* - ``--deployment-environment <value>``
242242
- Set the ``deployment.environment`` resource attribute to the specified value. If not specified, the ``Environment`` in the Splunk APM UI will appear as ``unknown`` for all instrumented applications. The resource attribute will be appended to the ``OTEL_RESOURCE_ATTRIBUTES`` environment variable.
@@ -266,7 +266,7 @@ Automatic Discovery for back-end services
266266
- Activate or deactivate collection and exporting metrics for all activated SDKs that support the ``SPLUNK_METRICS_ENABLED`` environment variable.
267267
- ``--disable-metrics``
268268
* - ``--instrumentation-version``
269-
- The ``splunk-otel-auto-instrumentation`` package version to install. Note: The minimum supported version for Java and Node.js auto instrumentation is 0.87.0, and the minimum supported version for .NET auto instrumentation is 0.99.0.
269+
- The ``splunk-otel-auto-instrumentation`` package version to install. Note: The minimum supported version for Java and Node.js zero-code instrumentation is 0.87.0, and the minimum supported version for .NET zero-code instrumentation is 0.99.0.
270270
- ``latest``
271271

272272
Fluentd

0 commit comments

Comments
 (0)