From 409c93744cf2fb910c0cff88f34c8391bb1fa977 Mon Sep 17 00:00:00 2001 From: jvoravong Date: Thu, 13 Jul 2023 13:02:01 -0600 Subject: [PATCH] patch: manually updates examples and comments --- .github/workflows/update_instrumentation_dependencies.yaml | 2 +- .../enable-operator-and-auto-instrumentation-values.yaml | 2 -- .../instrumentation-add-custom-environment-span-tag.yaml | 2 ++ .../instrumentation/instrumentation-add-trace-sampler.yaml | 2 ++ .../instrumentation-enable-profiling-partially.yaml | 1 + .../instrumentation/instrumentation-enable-profiling.yaml | 2 ++ helm-charts/splunk-otel-collector/values.yaml | 1 - 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update_instrumentation_dependencies.yaml b/.github/workflows/update_instrumentation_dependencies.yaml index 67e2ce8b4..b5ebb6506 100644 --- 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/examples/enable-operator-and-auto-instrumentation/enable-operator-and-auto-instrumentation-values.yaml b/examples/enable-operator-and-auto-instrumentation/enable-operator-and-auto-instrumentation-values.yaml index 0b3ab01b5..bad14c1eb 100644 --- a/examples/enable-operator-and-auto-instrumentation/enable-operator-and-auto-instrumentation-values.yaml +++ b/examples/enable-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/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-custom-environment-span-tag.yaml b/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-custom-environment-span-tag.yaml index 0bee1ef5b..47689b427 100644 --- a/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-custom-environment-span-tag.yaml +++ b/examples/enable-operator-and-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/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-trace-sampler.yaml b/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-trace-sampler.yaml index 85e75f69d..0d3763503 100644 --- a/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-add-trace-sampler.yaml +++ b/examples/enable-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/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling-partially.yaml b/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling-partially.yaml index 720066809..124408711 100644 --- a/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling-partially.yaml +++ b/examples/enable-operator-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/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling.yaml b/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling.yaml index 548a28a66..0fee2208f 100644 --- a/examples/enable-operator-and-auto-instrumentation/instrumentation/instrumentation-enable-profiling.yaml +++ b/examples/enable-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 index 4fe4ce617..96f20c76b 100644 --- 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.