test

Author: jeffreyc-splunk

.github/workflows/chef-test.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - dotnet-zc-chef
     paths:
       - '.github/workflows/chef-test.yml'
       - 'deployments/chef/**'

deployments/chef/attributes/default.rb

@@ -100,6 +100,6 @@
   default['splunk_otel_collector']['auto_instrumentation_enable_profiler_memory'] = false
   default['splunk_otel_collector']['auto_instrumentation_enable_metrics'] = false
   default['splunk_otel_collector']['auto_instrumentation_otlp_endpoint'] = 'http://127.0.0.1:4317'
-  default['splunk_otel_collector']['with_auto_instrumentation_sdks'] = %w(java nodejs)
+  default['splunk_otel_collector']['with_auto_instrumentation_sdks'] = %w(java nodejs dotnet)
   default['splunk_otel_collector']['auto_instrumentation_npm_path'] = 'npm'
 end

deployments/chef/recipes/auto_instrumentation.rb

@@ -5,6 +5,8 @@
 with_systemd = node['splunk_otel_collector']['auto_instrumentation_systemd'].to_s.downcase == 'true'
 with_java = node['splunk_otel_collector']['with_auto_instrumentation_sdks'].include?('java')
 with_nodejs = node['splunk_otel_collector']['with_auto_instrumentation_sdks'].include?('nodejs') && with_new_instrumentation
+dotnet_supported = node['cpu']['architecture'] == 'x86_64' && (node['splunk_otel_collector']['auto_instrumentation_version'] == 'latest' || Gem::Version.new(node['splunk_otel_collector']['auto_instrumentation_version']) >= Gem::Version.new('0.99.0'))
+with_dotnet = node['splunk_otel_collector']['with_auto_instrumentation_sdks'].include?('dotnet') && dotnet_supported
 npm_path = node['splunk_otel_collector']['auto_instrumentation_npm_path']
 lib_dir = '/usr/lib/splunk-instrumentation'
 splunk_otel_js_path = "#{lib_dir}/splunk-otel-js.tgz"
@@ -13,6 +15,7 @@
 zc_config_dir = '/etc/splunk/zeroconfig'
 java_config_file = "#{zc_config_dir}/java.conf"
 nodejs_config_file = "#{zc_config_dir}/node.conf"
+dotnet_config_file = "#{zc_config_dir}/dotnet.conf"
 old_config_file = "#{lib_dir}/instrumentation.conf"
 systemd_config_dir = '/usr/lib/systemd/system.conf.d'
 systemd_config_file = "#{systemd_config_dir}/00-splunk-otel-auto-instrumentation.conf"
@@ -66,7 +69,7 @@
 end
 
 if with_systemd
-  [java_config_file, nodejs_config_file, old_config_file].each do |config_file|
+  [java_config_file, nodejs_config_file, dotnet_config_file, old_config_file].each do |config_file|
     file config_file do
       action :delete
     end
@@ -79,10 +82,11 @@
       installed_version: lazy { node['packages']['splunk-otel-auto-instrumentation']['version'] },
       with_java: lazy { with_java },
       with_nodejs: lazy { node.run_state[:with_nodejs] }
+      with_dotnet: lazy { with_dotnet },
     )
     source '00-splunk-otel-auto-instrumentation.conf.erb'
     notifies :run, 'execute[reload systemd]', :delayed
-    only_if { with_java || node.run_state[:with_nodejs] }
+    only_if { with_java || node.run_state[:with_nodejs] || with_dotnet }
   end
 elsif with_new_instrumentation
   [old_config_file, systemd_config_file].each do |config_file|
@@ -115,8 +119,15 @@
     source 'node.conf.erb'
     only_if { node.run_state[:with_nodejs] }
   end
+  template dotnet_config_file do
+    variables(
+      installed_version: lazy { node['packages']['splunk-otel-auto-instrumentation']['version'] }
+    )
+    source 'dotnet.conf.erb'
+    only_if { node.run_state[:with_dotnet] }
+  end
 else
-  [java_config_file, nodejs_config_file, systemd_config_file].each do |config_file|
+  [java_config_file, nodejs_config_file, dotnet_config_file, systemd_config_file].each do |config_file|
     file config_file do
       action :delete
     end
@@ -135,6 +146,7 @@
     with_systemd: lazy { with_systemd },
     with_java: lazy { with_java },
     with_nodejs: lazy { node.run_state[:with_nodejs] }
+    with_dotnet: lazy { with_dotnet },
   )
   source 'ld.so.preload.erb'
 end

deployments/chef/templates/00-splunk-otel-auto-instrumentation.conf.erb

@@ -5,6 +5,16 @@ DefaultEnvironment="JAVA_TOOL_OPTIONS=-javaagent:<%= node['splunk_otel_collector
 <% if @with_nodejs -%>
 DefaultEnvironment="NODE_OPTIONS=-r /usr/lib/splunk-instrumentation/splunk-otel-js/node_modules/@splunk/otel/instrument"
 <% end -%>
+<% if @with_dotnet -%>
+DefaultEnvironment="CORECLR_ENABLE_PROFILING=1"
+DefaultEnvironment="CORECLR_PROFILER={918728DD-259F-4A6A-AC2B-B85E1B658318}"
+DefaultEnvironment="CORECLR_PROFILER_PATH=/usr/lib/splunk-instrumentation/splunk-otel-dotnet/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so"
+DefaultEnvironment="DOTNET_ADDITIONAL_DEPS=/usr/lib/splunk-instrumentation/splunk-otel-dotnet/AdditionalDeps"
+DefaultEnvironment="DOTNET_SHARED_STORE=/usr/lib/splunk-instrumentation/splunk-otel-dotnet/store"
+DefaultEnvironment="DOTNET_STARTUP_HOOKS=/usr/lib/splunk-instrumentation/splunk-otel-dotnet/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll"
+DefaultEnvironment="OTEL_DOTNET_AUTO_HOME=/usr/lib/splunk-instrumentation/splunk-otel-dotnet"
+DefaultEnvironment="OTEL_DOTNET_AUTO_PLUGINS=Splunk.OpenTelemetry.AutoInstrumentation.Plugin,Splunk.OpenTelemetry.AutoInstrumentation"
+<% end -%>
 <% if defined?(node['splunk_otel_collector']['auto_instrumentation_resource_attributes']) && node['splunk_otel_collector']['auto_instrumentation_resource_attributes'] != "" -%>
 DefaultEnvironment="OTEL_RESOURCE_ATTRIBUTES=splunk.zc.method=splunk-otel-auto-instrumentation-<%= @installed_version %>-systemd,<%= node['splunk_otel_collector']['auto_instrumentation_resource_attributes'] %>"
 <% else -%>