diff --git a/manifests/ruby.yml b/manifests/ruby.yml index db08f4c4cab..ed3fa1e20b4 100644 --- a/manifests/ruby.yml +++ b/manifests/ruby.yml @@ -2269,35 +2269,7 @@ manifest: - declaration: missing_feature (app-started not sent) component_version: <1.22.0 tests/test_telemetry.py::Test_Telemetry::test_telemetry_message_has_datadog_container_id: "irrelevant (cgroup in weblog is 0::/, so this test can't work)" - tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: # Modified by easy win activation script - - weblog_declaration: - '*': missing_feature - rails52: '>=2.24.0' - rails80: '>=2.24.0' - uds-rails: '>=2.24.0' - rails61: '>=2.24.0' - uds-sinatra: '>=2.24.0' - rails72: '>=2.24.0' - sinatra41: '>=2.24.0' - sinatra14: '>=2.24.0' - rack: '>=2.24.0' - sinatra32: '>=2.24.0' - sinatra22: '>=2.24.0' - rails42: '>=2.24.0' - tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting::test_telemetry_enhanced_config_reporting_precedence: # Created by easy win activation script - - weblog_declaration: - rails42: missing_feature - uds-rails: missing_feature - sinatra22: missing_feature - rails72: missing_feature - rails61: missing_feature - rails52: missing_feature - sinatra32: missing_feature - rack: missing_feature - sinatra41: missing_feature - sinatra14: missing_feature - rails80: missing_feature - uds-sinatra: missing_feature + tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: v2.31.0-dev tests/test_telemetry.py::Test_TelemetrySCAEnvVar: missing_feature tests/test_telemetry.py::Test_TelemetryV2: v1.11 tests/test_telemetry.py::Test_TelemetryV2::test_config_telemetry_completeness: irrelevant (This test causes too many friction. It has been replaced by alerts on slack channels) diff --git a/tests/test_telemetry.py b/tests/test_telemetry.py index 9b7f436b8e5..c4e31ae7ed5 100644 --- a/tests/test_telemetry.py +++ b/tests/test_telemetry.py @@ -622,6 +622,14 @@ class Test_TelemetryEnhancedConfigReporting: {"origin": "env_var", "value": "false"}, ], }, + "ruby": { + "name": "DD_LOGS_INJECTION", + "precedence": [ + {"origin": "default", "value": True}, + {"origin": "env_var", "value": False}, + {"origin": "code", "value": True}, + ], + }, } def test_telemetry_events_seq_id(self): diff --git a/utils/build/docker/ruby/rack/config.ru b/utils/build/docker/ruby/rack/config.ru index aa51e3d5417..57598375f38 100644 --- a/utils/build/docker/ruby/rack/config.ru +++ b/utils/build/docker/ruby/rack/config.ru @@ -19,6 +19,7 @@ require 'datadog/kit/appsec/events/v2' Datadog.configure do |c| c.diagnostics.debug = true + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' if c.respond_to?(:tracing) c.tracing.instrument :rack else diff --git a/utils/build/docker/ruby/rails42/config/initializers/datadog.rb b/utils/build/docker/ruby/rails42/config/initializers/datadog.rb index fc32fecafaa..916ebb12103 100644 --- a/utils/build/docker/ruby/rails42/config/initializers/datadog.rb +++ b/utils/build/docker/ruby/rails42/config/initializers/datadog.rb @@ -1,6 +1,7 @@ Datadog.configure do |c| c.diagnostics.debug = true c.appsec.instrument :active_record + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' end # Send non-web init event diff --git a/utils/build/docker/ruby/rails52/config/initializers/datadog.rb b/utils/build/docker/ruby/rails52/config/initializers/datadog.rb index dc97c3d9114..64aad9d4ca9 100644 --- a/utils/build/docker/ruby/rails52/config/initializers/datadog.rb +++ b/utils/build/docker/ruby/rails52/config/initializers/datadog.rb @@ -1,6 +1,7 @@ Datadog.configure do |c| c.diagnostics.debug = true c.appsec.instrument :active_record + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' end # Send non-web init event diff --git a/utils/build/docker/ruby/rails61/config/initializers/datadog.rb b/utils/build/docker/ruby/rails61/config/initializers/datadog.rb index dc97c3d9114..64aad9d4ca9 100644 --- a/utils/build/docker/ruby/rails61/config/initializers/datadog.rb +++ b/utils/build/docker/ruby/rails61/config/initializers/datadog.rb @@ -1,6 +1,7 @@ Datadog.configure do |c| c.diagnostics.debug = true c.appsec.instrument :active_record + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' end # Send non-web init event diff --git a/utils/build/docker/ruby/rails72/config/initializers/datadog.rb b/utils/build/docker/ruby/rails72/config/initializers/datadog.rb index 49401b91173..3df112f7ab8 100644 --- a/utils/build/docker/ruby/rails72/config/initializers/datadog.rb +++ b/utils/build/docker/ruby/rails72/config/initializers/datadog.rb @@ -4,6 +4,7 @@ Datadog.configure do |c| c.diagnostics.debug = true c.appsec.instrument :active_record + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' # Trace logging should be enabled with general tracer debugging, # but it seems the tracer debugging is not enabled via the environment diff --git a/utils/build/docker/ruby/rails80/config/initializers/datadog.rb b/utils/build/docker/ruby/rails80/config/initializers/datadog.rb index e62b394952f..6aa44bf1248 100644 --- a/utils/build/docker/ruby/rails80/config/initializers/datadog.rb +++ b/utils/build/docker/ruby/rails80/config/initializers/datadog.rb @@ -1,6 +1,7 @@ Datadog.configure do |c| c.diagnostics.debug = true c.appsec.instrument :active_record + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' # Trace logging should be enabled with general tracer debugging, # but it seems the tracer debugging is not enabled via the environment diff --git a/utils/build/docker/ruby/sinatra14/app.rb b/utils/build/docker/ruby/sinatra14/app.rb index 25ba4ba4c3b..16f55679c62 100644 --- a/utils/build/docker/ruby/sinatra14/app.rb +++ b/utils/build/docker/ruby/sinatra14/app.rb @@ -14,6 +14,7 @@ Datadog.configure do |c| c.diagnostics.debug = true + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' c.use :sinatra, service_name: ENV.fetch('DD_SERVICE', 'sinatra') unless c.respond_to?(:tracing) end diff --git a/utils/build/docker/ruby/sinatra22/app.rb b/utils/build/docker/ruby/sinatra22/app.rb index fcbe762b5fe..d82077e2a7f 100644 --- a/utils/build/docker/ruby/sinatra22/app.rb +++ b/utils/build/docker/ruby/sinatra22/app.rb @@ -14,6 +14,7 @@ Datadog.configure do |c| c.diagnostics.debug = true + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' c.use :sinatra, service_name: ENV.fetch('DD_SERVICE', 'sinatra') unless c.respond_to?(:tracing) end diff --git a/utils/build/docker/ruby/sinatra32/app.rb b/utils/build/docker/ruby/sinatra32/app.rb index fcbe762b5fe..d82077e2a7f 100644 --- a/utils/build/docker/ruby/sinatra32/app.rb +++ b/utils/build/docker/ruby/sinatra32/app.rb @@ -14,6 +14,7 @@ Datadog.configure do |c| c.diagnostics.debug = true + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' c.use :sinatra, service_name: ENV.fetch('DD_SERVICE', 'sinatra') unless c.respond_to?(:tracing) end diff --git a/utils/build/docker/ruby/sinatra41/app.rb b/utils/build/docker/ruby/sinatra41/app.rb index eff5bc485c8..b6d7d4eb34e 100644 --- a/utils/build/docker/ruby/sinatra41/app.rb +++ b/utils/build/docker/ruby/sinatra41/app.rb @@ -14,6 +14,7 @@ Datadog.configure do |c| c.diagnostics.debug = true + c.tracing.log_injection = true if ENV['CONFIG_CHAINING_TEST'] == 'true' c.use :sinatra, service_name: ENV.fetch('DD_SERVICE', 'sinatra') unless c.respond_to?(:tracing) end