From 984f6d4aefafd7aa7b3c0aa0dd5d7928a5711b91 Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:01:02 -0700 Subject: [PATCH 1/3] Update auto-instrumentation-java-k8s.rst This change would need to be applied to NodeJS as well --- .../auto-instrumentation/auto-instrumentation-java-k8s.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst index 0aa67fc32..ab0583ad5 100644 --- a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst +++ b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst @@ -70,13 +70,13 @@ The following examples demonstrate how to set the attribute using each method: .. tabs:: - .. tab:: ``values.yaml`` + .. tab:: ``values.yaml`` (environment option) - Add the environment variable using the ``extraEnvs`` option in the ``values.yaml`` file. This adds the ``deployment.environment`` attribute to all telemetry data the Collector receives, including data from automatically-instrumented pods. + Set the `environment`` option in the ``values.yaml`` file. This adds the ``deployment.environment`` attribute to all telemetry data the Collector receives, including data from automatically-instrumented pods. .. code-block:: yaml - extraEnvs: [OTEL_RESOURCE_ATTRIBUTES=deployment.environment=prd] + environment: prd .. tab:: ``values.yaml`` (Instrumentation spec) From 7616b39ece582517a8e239539d6c06f327ef83cb Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:06:07 -0700 Subject: [PATCH 2/3] Update gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst --- .../auto-instrumentation/auto-instrumentation-java-k8s.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst index ab0583ad5..26a4be695 100644 --- a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst +++ b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst @@ -72,7 +72,7 @@ The following examples demonstrate how to set the attribute using each method: .. tab:: ``values.yaml`` (environment option) - Set the `environment`` option in the ``values.yaml`` file. This adds the ``deployment.environment`` attribute to all telemetry data the Collector receives, including data from automatically-instrumented pods. + Set the ``environment`` option in the ``values.yaml`` file. This adds the ``deployment.environment`` attribute to all telemetry data the Collector receives, including data from automatically-instrumented pods. .. code-block:: yaml From ae9ec1d9f13a01a43f6e8eae1c47f9e1e0e8cd9d Mon Sep 17 00:00:00 2001 From: jvoravong <47871238+jvoravong@users.noreply.github.com> Date: Wed, 13 Dec 2023 14:06:42 -0700 Subject: [PATCH 3/3] Update gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst --- .../auto-instrumentation/auto-instrumentation-java-k8s.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst index 26a4be695..f33ca7de6 100644 --- a/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst +++ b/gdi/opentelemetry/auto-instrumentation/auto-instrumentation-java-k8s.rst @@ -70,7 +70,7 @@ The following examples demonstrate how to set the attribute using each method: .. tabs:: - .. tab:: ``values.yaml`` (environment option) + .. tab:: ``values.yaml`` (Environment option) Set the ``environment`` option in the ``values.yaml`` file. This adds the ``deployment.environment`` attribute to all telemetry data the Collector receives, including data from automatically-instrumented pods.