From 561310605aace6a797b76948987350137bc41a9b Mon Sep 17 00:00:00 2001 From: jeffreyc-splunk Date: Wed, 28 Aug 2024 10:30:54 -0400 Subject: [PATCH] chef: add logs exporter option --- deployments/chef/CHANGELOG.md | 4 ++++ deployments/chef/README.md | 8 ++++++++ deployments/chef/attributes/default.rb | 1 + deployments/chef/kitchen.yml | 8 ++++++++ deployments/chef/metadata.rb | 2 +- .../00-splunk-otel-auto-instrumentation.conf.erb | 3 +++ deployments/chef/templates/dotnet.conf.erb | 3 +++ deployments/chef/templates/java.conf.erb | 3 +++ deployments/chef/templates/node.conf.erb | 3 +++ .../with_custom_preload_dotnet_instrumentation/test.rb | 1 + .../with_custom_preload_instrumentation/test.rb | 1 + .../with_custom_preload_java_instrumentation/test.rb | 1 + .../with_custom_preload_node_instrumentation/test.rb | 1 + .../with_custom_systemd_dotnet_instrumentation/test.rb | 1 + .../with_custom_systemd_instrumentation/test.rb | 1 + .../with_custom_systemd_java_instrumentation/test.rb | 1 + .../with_custom_systemd_node_instrumentation/test.rb | 1 + .../with_default_preload_dotnet_instrumentation/test.rb | 1 + .../with_default_preload_instrumentation/test.rb | 1 + .../test.rb | 1 + .../with_default_preload_java_instrumentation/test.rb | 1 + .../with_default_preload_node_instrumentation/test.rb | 1 + .../with_default_systemd_dotnet_instrumentation/test.rb | 1 + .../with_default_systemd_instrumentation/test.rb | 1 + .../test.rb | 1 + .../with_default_systemd_java_instrumentation/test.rb | 1 + .../with_default_systemd_node_instrumentation/test.rb | 1 + 27 files changed, 52 insertions(+), 1 deletion(-) diff --git a/deployments/chef/CHANGELOG.md b/deployments/chef/CHANGELOG.md index 80588e3d9c..96bddf3b8c 100644 --- a/deployments/chef/CHANGELOG.md +++ b/deployments/chef/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## chef-v0.16.0 + +- Add support for the ``auto_instrumentation_logs_exporter` option to configure the `OTEL_LOGS_EXPORTER` environment variable. + ## chef-v0.15.0 - Breaking Change: The default for the `auto_instrumentation_otlp_endpoint` option has been changed from diff --git a/deployments/chef/README.md b/deployments/chef/README.md index 1fe8993ae0..612693eeee 100644 --- a/deployments/chef/README.md +++ b/deployments/chef/README.md @@ -292,6 +292,14 @@ after installation/configuration in order for any change to take effect. `0.104.0`. (**default:** `''`, i.e. defer to the default `OTEL_METRICS_EXPORTER` value for each activated SDK) +- `auto_instrumentation_logs_exporter` (Linux only): Set the exporter for + collected logs by all activated SDKs, for example `otlp`. Set the value to + `none` to disable collection and export of logs. The value will be set to the + `OTEL_LOGS_EXPORTER` environment variable. Only applicable if + `auto_instrumentation_version` is `latest` or >= `0.108.0`. + (**default:** `''`, i.e. defer to the default `OTEL_LOGS_EXPORTER` value for + each activated SDK) + ### Auto Instrumentation for .NET on Windows ***Warning:*** The `Environment` property in the diff --git a/deployments/chef/attributes/default.rb b/deployments/chef/attributes/default.rb index 9fb7342487..206a77d25b 100644 --- a/deployments/chef/attributes/default.rb +++ b/deployments/chef/attributes/default.rb @@ -100,6 +100,7 @@ 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_metrics_exporter'] = '' + default['splunk_otel_collector']['auto_instrumentation_logs_exporter'] = '' default['splunk_otel_collector']['auto_instrumentation_otlp_endpoint'] = '' default['splunk_otel_collector']['auto_instrumentation_otlp_endpoint_protocol'] = '' default['splunk_otel_collector']['with_auto_instrumentation_sdks'] = %w(java nodejs dotnet) diff --git a/deployments/chef/kitchen.yml b/deployments/chef/kitchen.yml index 2fd8500904..8e1124c292 100644 --- a/deployments/chef/kitchen.yml +++ b/deployments/chef/kitchen.yml @@ -177,6 +177,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_systemd_instrumentation run_list: @@ -212,6 +213,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_preload_java_instrumentation run_list: @@ -243,6 +245,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_systemd_java_instrumentation run_list: @@ -275,6 +278,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_preload_node_instrumentation run_list: @@ -312,6 +316,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_systemd_node_instrumentation run_list: @@ -350,6 +355,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_preload_dotnet_instrumentation run_list: @@ -381,6 +387,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_systemd_dotnet_instrumentation run_list: @@ -413,6 +420,7 @@ suites: auto_instrumentation_otlp_endpoint: http://0.0.0.0:4317 auto_instrumentation_otlp_endpoint_protocol: grpc auto_instrumentation_metrics_exporter: none + auto_instrumentation_logs_exporter: none - name: with_default_preload_instrumentation_without_npm run_list: diff --git a/deployments/chef/metadata.rb b/deployments/chef/metadata.rb index 6dc44d05c0..8118e93cc6 100644 --- a/deployments/chef/metadata.rb +++ b/deployments/chef/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'signalfx-support@splunk.com' license 'Apache-2.0' description 'Install/Configure the Splunk OpenTelemetry Collector' -version '0.15.0' +version '0.16.0' chef_version '>= 16.0' supports 'amazon' diff --git a/deployments/chef/templates/00-splunk-otel-auto-instrumentation.conf.erb b/deployments/chef/templates/00-splunk-otel-auto-instrumentation.conf.erb index 9e4c80494d..f58e2c4f1a 100644 --- a/deployments/chef/templates/00-splunk-otel-auto-instrumentation.conf.erb +++ b/deployments/chef/templates/00-splunk-otel-auto-instrumentation.conf.erb @@ -35,3 +35,6 @@ DefaultEnvironment="OTEL_EXPORTER_OTLP_PROTOCOL=<%= node['splunk_otel_collector' <% if defined?(node['splunk_otel_collector']['auto_instrumentation_metrics_exporter']) && node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] != "" -%> DefaultEnvironment="OTEL_METRICS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] %>" <% end -%> +<% if defined?(node['splunk_otel_collector']['auto_instrumentation_logs_exporter']) && node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] != "" -%> +DefaultEnvironment="OTEL_LOGS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] %>" +<% end -%> diff --git a/deployments/chef/templates/dotnet.conf.erb b/deployments/chef/templates/dotnet.conf.erb index e53201442b..e6c4675ced 100644 --- a/deployments/chef/templates/dotnet.conf.erb +++ b/deployments/chef/templates/dotnet.conf.erb @@ -26,3 +26,6 @@ OTEL_EXPORTER_OTLP_PROTOCOL=<%= node['splunk_otel_collector']['auto_instrumentat <% if defined?(node['splunk_otel_collector']['auto_instrumentation_metrics_exporter']) && node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] != "" -%> OTEL_METRICS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] %> <% end -%> +<% if defined?(node['splunk_otel_collector']['auto_instrumentation_logs_exporter']) && node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] != "" -%> +OTEL_LOGS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] %> +<% end -%> diff --git a/deployments/chef/templates/java.conf.erb b/deployments/chef/templates/java.conf.erb index e0501598cd..594bf4dd9e 100644 --- a/deployments/chef/templates/java.conf.erb +++ b/deployments/chef/templates/java.conf.erb @@ -19,3 +19,6 @@ OTEL_EXPORTER_OTLP_PROTOCOL=<%= node['splunk_otel_collector']['auto_instrumentat <% if defined?(node['splunk_otel_collector']['auto_instrumentation_metrics_exporter']) && node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] != "" -%> OTEL_METRICS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] %> <% end -%> +<% if defined?(node['splunk_otel_collector']['auto_instrumentation_logs_exporter']) && node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] != "" -%> +OTEL_LOGS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] %> +<% end -%> diff --git a/deployments/chef/templates/node.conf.erb b/deployments/chef/templates/node.conf.erb index da36b7c09b..fa026b1e20 100644 --- a/deployments/chef/templates/node.conf.erb +++ b/deployments/chef/templates/node.conf.erb @@ -19,3 +19,6 @@ OTEL_EXPORTER_OTLP_PROTOCOL=<%= node['splunk_otel_collector']['auto_instrumentat <% if defined?(node['splunk_otel_collector']['auto_instrumentation_metrics_exporter']) && node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] != "" -%> OTEL_METRICS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_metrics_exporter'] %> <% end -%> +<% if defined?(node['splunk_otel_collector']['auto_instrumentation_logs_exporter']) && node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] != "" -%> +OTEL_LOGS_EXPORTER=<%= node['splunk_otel_collector']['auto_instrumentation_logs_exporter'] %> +<% end -%> diff --git a/deployments/chef/test/integration/with_custom_preload_dotnet_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_preload_dotnet_instrumentation/test.rb index 0cebae3494..ffba88564d 100644 --- a/deployments/chef/test/integration/with_custom_preload_dotnet_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_preload_dotnet_instrumentation/test.rb @@ -50,6 +50,7 @@ its('content') { should match /^OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}$/ } its('content') { should match /^OTEL_EXPORTER_OTLP_PROTOCOL=grpc$/ } its('content') { should match /^OTEL_METRICS_EXPORTER=none$/ } + its('content') { should match /^OTEL_LOGS_EXPORTER=none$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_preload_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_preload_instrumentation/test.rb index e830b624d0..2ae6045e1f 100644 --- a/deployments/chef/test/integration/with_custom_preload_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_preload_instrumentation/test.rb @@ -68,6 +68,7 @@ its('content') { should match /^OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}$/ } its('content') { should match /^OTEL_EXPORTER_OTLP_PROTOCOL=grpc$/ } its('content') { should match /^OTEL_METRICS_EXPORTER=none$/ } + its('content') { should match /^OTEL_LOGS_EXPORTER=none$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_preload_java_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_preload_java_instrumentation/test.rb index e486fc5654..60188b2162 100644 --- a/deployments/chef/test/integration/with_custom_preload_java_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_preload_java_instrumentation/test.rb @@ -43,6 +43,7 @@ its('content') { should match /^OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}$/ } its('content') { should match /^OTEL_EXPORTER_OTLP_PROTOCOL=grpc$/ } its('content') { should match /^OTEL_METRICS_EXPORTER=none$/ } + its('content') { should match /^OTEL_LOGS_EXPORTER=none$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_preload_node_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_preload_node_instrumentation/test.rb index 266cc18714..e950caed65 100644 --- a/deployments/chef/test/integration/with_custom_preload_node_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_preload_node_instrumentation/test.rb @@ -43,6 +43,7 @@ its('content') { should match /^OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}$/ } its('content') { should match /^OTEL_EXPORTER_OTLP_PROTOCOL=grpc$/ } its('content') { should match /^OTEL_METRICS_EXPORTER=none$/ } + its('content') { should match /^OTEL_LOGS_EXPORTER=none$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_systemd_dotnet_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_systemd_dotnet_instrumentation/test.rb index 5cd39951e9..9a9949a2da 100644 --- a/deployments/chef/test/integration/with_custom_systemd_dotnet_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_systemd_dotnet_instrumentation/test.rb @@ -50,6 +50,7 @@ its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}"$/ } its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_PROTOCOL=grpc"$/ } its('content') { should match /^DefaultEnvironment="OTEL_METRICS_EXPORTER=none"$/ } + its('content') { should match /^DefaultEnvironment="OTEL_LOGS_EXPORTER=none"$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_systemd_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_systemd_instrumentation/test.rb index f8209e9542..2d4ac12adb 100644 --- a/deployments/chef/test/integration/with_custom_systemd_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_systemd_instrumentation/test.rb @@ -52,6 +52,7 @@ its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}"$/ } its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_PROTOCOL=grpc"$/ } its('content') { should match /^DefaultEnvironment="OTEL_METRICS_EXPORTER=none"$/ } + its('content') { should match /^DefaultEnvironment="OTEL_LOGS_EXPORTER=none"$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_systemd_java_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_systemd_java_instrumentation/test.rb index 8908e6f153..04e51a9997 100644 --- a/deployments/chef/test/integration/with_custom_systemd_java_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_systemd_java_instrumentation/test.rb @@ -50,6 +50,7 @@ its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}"$/ } its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_PROTOCOL=grpc"$/ } its('content') { should match /^DefaultEnvironment="OTEL_METRICS_EXPORTER=none"$/ } + its('content') { should match /^DefaultEnvironment="OTEL_LOGS_EXPORTER=none"$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_custom_systemd_node_instrumentation/test.rb b/deployments/chef/test/integration/with_custom_systemd_node_instrumentation/test.rb index cfd78fafb9..799bc2b924 100644 --- a/deployments/chef/test/integration/with_custom_systemd_node_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_custom_systemd_node_instrumentation/test.rb @@ -50,6 +50,7 @@ its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_ENDPOINT=#{otlp_endpoint}"$/ } its('content') { should match /^DefaultEnvironment="OTEL_EXPORTER_OTLP_PROTOCOL=grpc"$/ } its('content') { should match /^DefaultEnvironment="OTEL_METRICS_EXPORTER=none"$/ } + its('content') { should match /^DefaultEnvironment="OTEL_LOGS_EXPORTER=none"$/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_preload_dotnet_instrumentation/test.rb b/deployments/chef/test/integration/with_default_preload_dotnet_instrumentation/test.rb index f682bbf25c..060dd90871 100644 --- a/deployments/chef/test/integration/with_default_preload_dotnet_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_preload_dotnet_instrumentation/test.rb @@ -47,6 +47,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_preload_instrumentation/test.rb b/deployments/chef/test/integration/with_default_preload_instrumentation/test.rb index a8cee106c6..9861707e01 100644 --- a/deployments/chef/test/integration/with_default_preload_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_preload_instrumentation/test.rb @@ -65,6 +65,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_preload_instrumentation_without_npm/test.rb b/deployments/chef/test/integration/with_default_preload_instrumentation_without_npm/test.rb index 42b41ed71c..fc607188bd 100644 --- a/deployments/chef/test/integration/with_default_preload_instrumentation_without_npm/test.rb +++ b/deployments/chef/test/integration/with_default_preload_instrumentation_without_npm/test.rb @@ -56,6 +56,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_preload_java_instrumentation/test.rb b/deployments/chef/test/integration/with_default_preload_java_instrumentation/test.rb index b09441bcb8..4cf1451bdb 100644 --- a/deployments/chef/test/integration/with_default_preload_java_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_preload_java_instrumentation/test.rb @@ -40,6 +40,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_preload_node_instrumentation/test.rb b/deployments/chef/test/integration/with_default_preload_node_instrumentation/test.rb index b4f2f65819..9cc7943d9e 100644 --- a/deployments/chef/test/integration/with_default_preload_node_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_preload_node_instrumentation/test.rb @@ -40,6 +40,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_systemd_dotnet_instrumentation/test.rb b/deployments/chef/test/integration/with_default_systemd_dotnet_instrumentation/test.rb index c36cf0fade..5b05fdb633 100644 --- a/deployments/chef/test/integration/with_default_systemd_dotnet_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_systemd_dotnet_instrumentation/test.rb @@ -49,6 +49,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_systemd_instrumentation/test.rb b/deployments/chef/test/integration/with_default_systemd_instrumentation/test.rb index fc30d5bbee..0be12d6377 100644 --- a/deployments/chef/test/integration/with_default_systemd_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_systemd_instrumentation/test.rb @@ -51,6 +51,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_systemd_instrumentation_without_npm/test.rb b/deployments/chef/test/integration/with_default_systemd_instrumentation_without_npm/test.rb index 876c2c67e4..758e5915cc 100644 --- a/deployments/chef/test/integration/with_default_systemd_instrumentation_without_npm/test.rb +++ b/deployments/chef/test/integration/with_default_systemd_instrumentation_without_npm/test.rb @@ -50,6 +50,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_systemd_java_instrumentation/test.rb b/deployments/chef/test/integration/with_default_systemd_java_instrumentation/test.rb index 8896f0fb9e..91a2014469 100644 --- a/deployments/chef/test/integration/with_default_systemd_java_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_systemd_java_instrumentation/test.rb @@ -49,6 +49,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do diff --git a/deployments/chef/test/integration/with_default_systemd_node_instrumentation/test.rb b/deployments/chef/test/integration/with_default_systemd_node_instrumentation/test.rb index f5c5745704..319e6133aa 100644 --- a/deployments/chef/test/integration/with_default_systemd_node_instrumentation/test.rb +++ b/deployments/chef/test/integration/with_default_systemd_node_instrumentation/test.rb @@ -49,6 +49,7 @@ its('content') { should_not match /.*OTEL_EXPORTER_OTLP_ENDPOINT.*/ } its('content') { should_not match /.*OTEL_EXPORTER_OTLP_PROTOCOL.*/ } its('content') { should_not match /.*OTEL_METRICS_EXPORTER.*/ } + its('content') { should_not match /.*OTEL_LOGS_EXPORTER.*/ } end describe service('splunk-otel-collector') do