From adcc141c331cd9d4bcb2e40713b4d1647fbd5be1 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Tue, 2 Jan 2024 10:03:51 -0800 Subject: [PATCH 1/4] Add Splunk .NET docker image to the chart --- .chloggen/adddotnetimage.yaml | 12 ++++++++++++ .github/workflows/update_docker_images.yaml | 4 ++++ helm-charts/splunk-otel-collector/values.yaml | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .chloggen/adddotnetimage.yaml diff --git a/.chloggen/adddotnetimage.yaml b/.chloggen/adddotnetimage.yaml new file mode 100644 index 0000000000..449616bd07 --- /dev/null +++ b/.chloggen/adddotnetimage.yaml @@ -0,0 +1,12 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement +# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) +component: operator +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Use the Splunk Otel .NET docker image by default when auto-instrumenting with the operator +# One or more tracking issues related to the change +issues: [1098] +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/.github/workflows/update_docker_images.yaml b/.github/workflows/update_docker_images.yaml index 3f0ff5f7bb..caa4af950f 100644 --- a/.github/workflows/update_docker_images.yaml +++ b/.github/workflows/update_docker_images.yaml @@ -30,6 +30,10 @@ jobs: component: 'operator' yaml_file_path: 'helm-charts/splunk-otel-collector/values.yaml' yaml_value_path: '.operator.instrumentation.spec.nodejs' + - name: 'dotnet' + component: 'operator' + yaml_file_path: 'helm-charts/splunk-otel-collector/values.yaml' + yaml_value_path: '.operator.instrumentation.spec.dotnet' - name: 'fluentd-hec' component: 'agent' yaml_file_path: 'helm-charts/splunk-otel-collector/values.yaml' diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index 04a51b8fc8..c58ca0f2db 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1180,6 +1180,9 @@ operator: nodejs: repository: ghcr.io/signalfx/splunk-otel-js/splunk-otel-js tag: v2.6.1 + dotnet: + repository: ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet + tag: 1.2.1 go: repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-go tag: v0.8.0-alpha @@ -1189,9 +1192,6 @@ operator: python: repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python tag: 0.41b0 - dotnet: - repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet - tag: 1.2.0 nginx: repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nginx tag: 1.0.3 From d76de7b2fec99e4cbd02d2f8d329621407cc6330 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 4 Jan 2024 08:43:07 -0800 Subject: [PATCH 2/4] PR review --- .../rendered_manifests/operator/instrumentation.yaml | 6 ++++-- helm-charts/splunk-otel-collector/values.yaml | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml index 0bca8d3aa1..ad4fbf6077 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/operator/instrumentation.yaml @@ -35,10 +35,12 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES value: splunk.zc.method=autoinstrumentation-apache-httpd:1.0.3 dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:1.2.0 + image: ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet:1.2.1 env: + - name: OTEL_DOTNET_AUTO_PLUGINS + value: "Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation" - name: OTEL_RESOURCE_ATTRIBUTES - value: splunk.zc.method=autoinstrumentation-dotnet:1.2.0 + value: splunk.zc.method=splunk-otel-dotnet:1.2.1 # dotnet auto-instrumentation uses http/proto by default, so data must be sent to 4318 instead of 4317. # See: https://github.com/open-telemetry/opentelemetry-operator#opentelemetry-auto-instrumentation-injection - name: OTEL_EXPORTER_OTLP_ENDPOINT diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index c58ca0f2db..e42c7594c7 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1183,6 +1183,9 @@ operator: dotnet: repository: ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet tag: 1.2.1 + env: + - name: OTEL_DOTNET_AUTO_PLUGINS + value: Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation go: repository: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-go tag: v0.8.0-alpha From 45bed20be0aa4cceaa8be30ed5056446b7f8fd8e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Fri, 5 Jan 2024 12:16:41 -0800 Subject: [PATCH 3/4] Update .chloggen/adddotnetimage.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Piotr Kiełkowicz --- .chloggen/adddotnetimage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chloggen/adddotnetimage.yaml b/.chloggen/adddotnetimage.yaml index 449616bd07..e552b39448 100644 --- a/.chloggen/adddotnetimage.yaml +++ b/.chloggen/adddotnetimage.yaml @@ -3,7 +3,7 @@ change_type: enhancement # The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other) component: operator # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Use the Splunk Otel .NET docker image by default when auto-instrumenting with the operator +note: Use the Splunk Distribution of OpenTelemetry .NET docker image by default when auto-instrumenting with the operator # One or more tracking issues related to the change issues: [1098] # (Optional) One or more lines of additional information to render under the primary note. From a645fa76dacfb8233d14a3dac478fe6508db6258 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 11 Jan 2024 08:48:42 -0800 Subject: [PATCH 4/4] Update helm-charts/splunk-otel-collector/values.yaml Co-authored-by: jvoravong <47871238+jvoravong@users.noreply.github.com> --- helm-charts/splunk-otel-collector/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml index e42c7594c7..264af91b23 100644 --- a/helm-charts/splunk-otel-collector/values.yaml +++ b/helm-charts/splunk-otel-collector/values.yaml @@ -1182,7 +1182,7 @@ operator: tag: v2.6.1 dotnet: repository: ghcr.io/signalfx/splunk-otel-dotnet/splunk-otel-dotnet - tag: 1.2.1 + tag: v1.2.1 env: - name: OTEL_DOTNET_AUTO_PLUGINS value: Splunk.OpenTelemetry.AutoInstrumentation.Plugin, Splunk.OpenTelemetry.AutoInstrumentation