patch: manually updates examples and comments

signalfx · Jul 13, 2023 · 409c937 · 409c937
1 parent 7a4d99f
commit 409c937
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/update_instrumentation_dependencies.yaml b/.github/workflows/update_instrumentation_dependencies.yaml
@@ -56,6 +56,6 @@ jobs:
         with:
           commit-message: Update ${{ matrix.language }} instrumentation version
           title: Update ${{ matrix.language }} agent version to ${{ steps.swizzle_version.outputs.LATEST_VER }}
-          body: Use the new version of the ${{ matrix.language }} agent
+          body: Use the new version of the ${{ matrix.language }} instrumentation library
           branch: "update-${{ matrix.language }}-${{ steps.swizzle_version.outputs.LATEST_VER }}"
           base: main
diff --git a/...le-operator-and-auto-instrumentation/enable-operator-and-auto-instrumentation-values.yaml b/...le-operator-and-auto-instrumentation/enable-operator-and-auto-instrumentation-values.yaml
@@ -4,8 +4,6 @@ splunkObservability:
   logsEnabled: true
   accessToken: CHANGEME
   realm: us0
-  # Enables Always on Profiling
-  # profilingEnabled: true
 clusterName: CHANGEME
 environment: CHANGEME
 

diff --git a/...auto-instrumentation/instrumentation/instrumentation-add-custom-environment-span-tag.yaml b/...auto-instrumentation/instrumentation/instrumentation-add-custom-environment-span-tag.yaml
@@ -31,6 +31,8 @@ spec:
       value: deployment.environment=dev
     exporter:
       endpoint: http://$(SPLUNK_OTEL_AGENT):4317
+    java:
+      image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.25.0
     propagators:
     - tracecontext
     - baggage

diff --git a/...-operator-and-auto-instrumentation/instrumentation/instrumentation-add-trace-sampler.yaml b/...-operator-and-auto-instrumentation/instrumentation/instrumentation-add-trace-sampler.yaml
@@ -34,6 +34,8 @@ spec:
           fieldPath: status.hostIP
     exporter:
       endpoint: http://$(SPLUNK_OTEL_AGENT):4317
+    java:
+      image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.25.0
     propagators:
     - tracecontext
     - baggage

diff --git a/...-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling-partially.yaml b/...-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling-partially.yaml
@@ -55,6 +55,7 @@ spec:
   exporter:
     endpoint: http://$(SPLUNK_OTEL_AGENT):4317
   java:
+    image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.25.0
     env:
       - name: SPLUNK_PROFILER_ENABLED
         value: "false"

diff --git a/...e-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling.yaml b/...e-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling.yaml
@@ -46,6 +46,8 @@ spec:
       value: "true"
   exporter:
     endpoint: http://$(SPLUNK_OTEL_AGENT):4317
+  java:
+    image: ghcr.io/signalfx/splunk-otel-java/splunk-otel-java:v1.25.0
   propagators:
     - tracecontext
     - baggage

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -1415,7 +1415,6 @@ operator:
       # python:
         # Port 4318 is used for python instead of 4317 if the default endpoint value is not overridden, see: https://github.com/open-telemetry/opentelemetry-operator#opentelemetry-auto-instrumentation-injection
         # image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:X.X.X
-
   admissionWebhooks:
     certManager:
       # The cert and issuer are annoted so they are instantiated after the cert-manager CRDs are installed.