Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions integration-tests/appsec/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe('RASP', () => {
DD_APPSEC_RASP_ENABLED: 'true',
DD_APPSEC_RULES: path.join(cwd, 'appsec/rasp/rasp_rules.json'),
DD_APPSEC_RASP_COLLECT_REQUEST_BODY: String(collectRequestBody),
DD_TRACE_STARTUP_LOGS: 'false',
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appsec test makes sure that no logs exist when blocking a request. Rather than patching it to ignore the DD startup log, this seemed more correct

},
}, stdOutputHandler, stdOutputHandler)
axios = Axios.create({ baseURL: proc.url })
Expand Down
2 changes: 2 additions & 0 deletions packages/dd-trace/src/config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const pkg = require('../pkg')
const { isFalse, isTrue } = require('../util')
const { DD_MAJOR } = require('../../../../version')
const { getEnvironmentVariable: getEnv } = require('./helper')

const {
Expand Down Expand Up @@ -117,6 +118,7 @@ const defaultsWithoutSupportedConfigurationEntry = {
// TODO: These entries should be removed. They are off by default
// because they rely on other configs.
const defaultsWithConditionalRuntimeBehavior = {
startupLogs: DD_MAJOR >= 6,
isGitUploadEnabled: false,
isImpactedTestsEnabled: false,
isIntelligentTestRunnerEnabled: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/dd-trace/test/config/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ describe('Config', () => {
{ name: 'spanAttributeSchema', value: 'v0', origin: 'default' },
{ name: 'spanComputePeerService', value: false, origin: 'calculated' },
{ name: 'spanRemoveIntegrationFromService', value: false, origin: 'default' },
{ name: 'startupLogs', value: false, origin: 'default' },
{ name: 'startupLogs', value: DD_MAJOR >= 6, origin: 'default' },
{ name: 'stats.enabled', value: false, origin: 'calculated' },
{ name: 'tagsHeaderMaxLength', value: 512, origin: 'default' },
{ name: 'telemetry.debug', value: false, origin: 'default' },
Expand Down
Loading