bumping up version (#4642)

signalfx · Apr 9, 2024 · dbd436c · dbd436c
1 parent 2a40c5c
commit dbd436c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/deployments/chef/CHANGELOG.md b/deployments/chef/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## chef-v0.12.0
+
+- `splunk_ballast_size_mib` is deprecated and removed. For Splunk Otel Collector version `0.97.0` or greater, `GOMEMLIMIT` env var is introduced. The default is set to 90% of the `SPLUNK_TOTAL_MEM_MIB`. For more information regarding the usage, please follow the instructions ([here](https://github.com/signalfx/splunk-otel-collector?tab=readme-ov-file#from-0961-to-0970)).
+
 ## chef-v0.11.0
 
 - On Windows the `SPLUNK_*` environment variables were moved from the machine scope to the collector service scope.

diff --git a/deployments/chef/README.md b/deployments/chef/README.md
@@ -102,11 +102,7 @@ required `splunk_access_token` attribute and some optional attributes:
   Collector. The `SPLUNK_MEMORY_TOTAL_MIB` environment variable will be set
   with this value for the Collector service. (**default:** `512`)
 
-- `splunk_ballast_size_mib`: Explicitly set the ballast size for the Collector
-  instead of the value calculated from the `splunk_memory_total_mib` attribute.
-  This should be set to 1/3 to 1/2 of configured memory. The
-  `SPLUNK_BALLAST_SIZE_MIB` environment variable will be set with this value
-  for the Collector service. (**default:** `''`)
+- `gomemlimit`: The `GOMEMLIMIT` environment variable is introduced for the Splunk Otel Collector version >=0.97.0, allowing the limitation of memory usage in the GO runtime. This feature can help enhance GC (Garbage Collection) related performance and prevent GC related Out of Memory (OOM) situations.
 
 - `splunk_listen_interface`: The network interface the collector receivers
   will listen on (**default** `0.0.0.0`).

diff --git a/deployments/chef/attributes/default.rb b/deployments/chef/attributes/default.rb
@@ -20,7 +20,7 @@
 default['splunk_otel_collector']['splunk_hec_url'] = "#{node['splunk_otel_collector']['splunk_ingest_url']}/v1/log"
 default['splunk_otel_collector']['splunk_hec_token'] = "#{node['splunk_otel_collector']['splunk_access_token']}"
 default['splunk_otel_collector']['splunk_memory_total_mib'] = '512'
-default['splunk_otel_collector']['splunk_ballast_size_mib'] = ''
+default['splunk_otel_collector']['gomemlimit'] = ''
 default['splunk_otel_collector']['splunk_listen_interface'] = ''
 
 default['splunk_otel_collector']['collector_config'] = {}

diff --git a/deployments/chef/metadata.rb b/deployments/chef/metadata.rb
@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license 'Apache-2.0'
 description 'Install/Configure the Splunk OpenTelemetry Collector'
-version '0.11.0'
+version '0.12.0'
 chef_version '>= 16.0'
 
 supports 'amazon'

diff --git a/deployments/chef/recipes/collector_win_registry.rb b/deployments/chef/recipes/collector_win_registry.rb
@@ -15,8 +15,8 @@
   { name: 'SPLUNK_TRACE_URL', type: :string, data: node['splunk_otel_collector']['splunk_trace_url'].to_s },
 ]
 
-unless node['splunk_otel_collector']['splunk_ballast_size_mib'].to_s.strip.empty?
-  collector_env_vars.push({ name: 'SPLUNK_BALLAST_SIZE_MIB', type: :string, data: node['splunk_otel_collector']['splunk_ballast_size_mib'].to_s })
+unless node['splunk_otel_collector']['gomemlimit'].to_s.strip.empty?
+  collector_env_vars.push({ name: 'GOMEMLIMIT', type: :string, data: node['splunk_otel_collector']['gomemlimit'].to_s })
 end
 unless node['splunk_otel_collector']['splunk_listen_interface'].to_s.strip.empty?
   collector_env_vars.push({ name: 'SPLUNK_LISTEN_INTERFACE', type: :string, data: node['splunk_otel_collector']['splunk_listen_interface'].to_s })

diff --git a/deployments/chef/templates/splunk-otel-collector.conf.erb b/deployments/chef/templates/splunk-otel-collector.conf.erb
@@ -33,8 +33,9 @@ SPLUNK_MEMORY_TOTAL_MIB=<%= node['splunk_otel_collector']['splunk_memory_total_m
 SPLUNK_LISTEN_INTERFACE=<%= node['splunk_otel_collector']['splunk_listen_interface'] %>
 <% end -%>
 
-# How much memory to allocate to the ballast. This should be set to 1/3 to 1/2 of configured memory.
-SPLUNK_BALLAST_SIZE_MIB=<%= node['splunk_otel_collector']['splunk_ballast_size_mib'] %>
+<% unless node['splunk_otel_collector']['gomemlimit'].to_s.strip.empty? -%>
+GOMEMLIMIT=<%= node['splunk_otel_collector']['gomemlimit'] %>
+<% end -%>
 
 # The path to the Smart Agent bundle.
 SPLUNK_BUNDLE_DIR=<%= node['splunk_otel_collector']['splunk_bundle_dir'] %>