Skip to content

Commit

Permalink
Add Splunk .NET docker image to the chart (#1098)
Browse files Browse the repository at this point in the history
* Add Splunk .NET docker image to the chart

* PR review

* Update .chloggen/adddotnetimage.yaml

Co-authored-by: Piotr Kiełkowicz <[email protected]>

* Update helm-charts/splunk-otel-collector/values.yaml

Co-authored-by: jvoravong <[email protected]>

---------

Co-authored-by: Piotr Kiełkowicz <[email protected]>
Co-authored-by: jvoravong <[email protected]>
  • Loading branch information
3 people authored Jan 18, 2024
1 parent ee4784a commit 0d36758
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
12 changes: 12 additions & 0 deletions .chloggen/adddotnetimage.yaml
Original file line number Diff line number Diff line change
@@ -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 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.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
4 changes: 4 additions & 0 deletions .github/workflows/update_docker_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions helm-charts/splunk-otel-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,12 @@ 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: v1.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
Expand All @@ -1204,9 +1210,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
Expand Down

0 comments on commit 0d36758

Please sign in to comment.