Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Active tracing configuration #3928

Merged
merged 151 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
e29cbca
modified some config values
ida613 Jan 4, 2024
1cc40b2
modified config values
ida613 Jan 4, 2024
53b8ce1
commented out some commit values
ida613 Jan 4, 2024
7566e4c
fixed config value bug
ida613 Jan 4, 2024
703019d
modified config value
ida613 Jan 4, 2024
30deb43
modified config value
ida613 Jan 4, 2024
f33c3ef
added config value
ida613 Jan 4, 2024
c524f80
modified config values
ida613 Jan 4, 2024
1442843
modified config value
ida613 Jan 4, 2024
031a268
modified config value
ida613 Jan 4, 2024
4540923
modified config value
ida613 Jan 4, 2024
7d7d925
modified config value
ida613 Jan 4, 2024
0cb55ff
modified config value
ida613 Jan 4, 2024
9e2d8d8
modified config value
ida613 Jan 4, 2024
8bedee2
modified config value
ida613 Jan 5, 2024
ac6df72
modified config values
ida613 Jan 5, 2024
a2f9107
modified config value
ida613 Jan 5, 2024
8e2ddab
modified config values
ida613 Jan 5, 2024
a900ed1
modified config values
ida613 Jan 5, 2024
1277198
modified config value
ida613 Jan 5, 2024
c7daa20
modified config values
ida613 Jan 5, 2024
048de35
modified config value
ida613 Jan 5, 2024
d963f58
modified config values
ida613 Jan 5, 2024
6a10b89
modified config values
ida613 Jan 8, 2024
6bfa4f4
modified config values
ida613 Jan 8, 2024
189f99c
modified config values
ida613 Jan 8, 2024
d13df87
modified config value
ida613 Jan 8, 2024
11c4058
modified config value
ida613 Jan 8, 2024
aa9e9fe
modified config value
ida613 Jan 8, 2024
d6c3924
modified config values
ida613 Jan 9, 2024
1382543
modified config value
ida613 Jan 9, 2024
3ee8668
modified config values
ida613 Jan 9, 2024
a9d2744
modified config file
ida613 Jan 9, 2024
d22bc96
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 9, 2024
67fbef6
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 9, 2024
64f70a3
deleted unused values
ida613 Jan 9, 2024
d7e203a
fixed test
ida613 Jan 9, 2024
69757f5
added active tracing configuration
ida613 Jan 9, 2024
1d4a1ee
fixed bug
ida613 Jan 9, 2024
22f1dd8
fixed bug
ida613 Jan 9, 2024
998fc84
fixed telemetry formatting bug
ida613 Jan 9, 2024
c0dea29
removed console statement
ida613 Jan 9, 2024
a902261
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 9, 2024
f755fa1
Update packages/dd-trace/src/telemetry/index.js
ida613 Jan 9, 2024
bd5378f
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 10, 2024
f0b97ef
changed variable name
ida613 Jan 10, 2024
0908740
updated config values
ida613 Jan 16, 2024
7e27128
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 16, 2024
c59cf45
moved some logic from config.js to telemetry index.js
ida613 Jan 16, 2024
3b69cbc
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 16, 2024
7ce05bc
fixed config tests
ida613 Jan 16, 2024
5055235
Update packages/dd-trace/src/config.js
ida613 Jan 17, 2024
5fe7410
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 17, 2024
718c4c1
modified config file
ida613 Jan 20, 2024
8e74bd9
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 20, 2024
a44e44e
fixed bug in config file
ida613 Jan 20, 2024
e2c8b73
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 20, 2024
ad316df
modified config file
ida613 Jan 22, 2024
2fd5be5
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 22, 2024
4ee03cc
attached options to Config
ida613 Jan 22, 2024
4f1517e
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 22, 2024
c0bc3a6
fixed bug in config.js
ida613 Jan 23, 2024
9068eea
test config file changes
ida613 Jan 23, 2024
5cd4687
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 23, 2024
43eecfd
attached options to Config
ida613 Jan 24, 2024
8dac371
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 24, 2024
09f86e8
modified config file
ida613 Jan 24, 2024
9772961
modified config file
ida613 Jan 24, 2024
39516b0
fixed bug
ida613 Jan 24, 2024
c1dc235
modified config file
ida613 Jan 24, 2024
ea66886
modified config file
ida613 Jan 24, 2024
a73b263
modified config file
ida613 Jan 24, 2024
a634b57
modified config file
ida613 Jan 24, 2024
e8a17ce
modified config file
ida613 Jan 25, 2024
4c309d8
imported lodash to replace getter and setter methods
ida613 Jan 25, 2024
879ea82
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 25, 2024
7ed0352
deleted unnecessary tests
ida613 Jan 25, 2024
1ff1f73
resolved merge conflict
ida613 Jan 25, 2024
dad5149
reverted yarn.lock changes
ida613 Jan 25, 2024
5600958
removed lodash
ida613 Jan 26, 2024
119109c
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 26, 2024
906007d
updated config test
ida613 Jan 26, 2024
0b3d0f3
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 26, 2024
934b650
removed comments
ida613 Jan 26, 2024
84e577b
modified config file
ida613 Jan 29, 2024
0e6b21c
addressed PR comments
ida613 Jan 29, 2024
b3aed5f
test hypothesis
ida613 Jan 29, 2024
ef5ddbf
fix bug
ida613 Jan 29, 2024
dd924ca
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 30, 2024
13d4408
test
ida613 Jan 30, 2024
ffa8c2b
moved utils folder
ida613 Jan 30, 2024
f93b5ed
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 30, 2024
0007702
bug fix
ida613 Jan 30, 2024
cd639b2
test
ida613 Jan 30, 2024
08bbe1f
test
ida613 Jan 30, 2024
ab7de5d
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 30, 2024
273657b
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 30, 2024
29cd31f
modified config file
ida613 Jan 30, 2024
be20034
modified config file
ida613 Jan 30, 2024
158d0f6
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Jan 31, 2024
c37fe41
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Jan 31, 2024
1908b9f
modified config file
ida613 Jan 31, 2024
60739eb
modified config file
ida613 Jan 31, 2024
4383971
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 8, 2024
13518d3
bug fix
ida613 Feb 8, 2024
b9fb4b0
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Feb 8, 2024
9fbb49f
refactor config file
ida613 Feb 8, 2024
5109fe7
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 8, 2024
1d2b32a
fix telemetry test
ida613 Feb 8, 2024
23e1715
bug fix
ida613 Feb 12, 2024
be73b51
active tracing config
ida613 Feb 14, 2024
c98a405
fix updateConfig
ida613 Feb 15, 2024
cb35704
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 15, 2024
f89795e
bug fix
ida613 Feb 15, 2024
3774f47
order env vars aphabetically
ida613 Feb 15, 2024
e09cd94
added tests for util functions
ida613 Feb 15, 2024
70528a3
Update packages/dd-trace/src/telemetry/index.js
ida613 Feb 16, 2024
4c5006d
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 16, 2024
6170ce8
sorted config values in alphabetical order and deleted duplicates
ida613 Feb 20, 2024
d238edc
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Feb 20, 2024
093304d
modified config
ida613 Feb 20, 2024
b7fb4cc
modified config
ida613 Feb 20, 2024
75713c7
removed isTrue in config
ida613 Feb 20, 2024
92ed749
deleted unused code
ida613 Feb 20, 2024
85541a0
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 20, 2024
4cff326
bug fix
ida613 Feb 20, 2024
53a383d
test
ida613 Feb 20, 2024
f7f26ca
test
ida613 Feb 20, 2024
0fc3248
test
ida613 Feb 20, 2024
fd0124c
modified config
ida613 Feb 21, 2024
a0df2a2
bug fix
ida613 Feb 21, 2024
0fcd44e
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 21, 2024
cfc3107
Update packages/dd-trace/src/config.js
ida613 Feb 21, 2024
9290737
Update packages/dd-trace/src/config.js
ida613 Feb 21, 2024
abbed6b
Update packages/dd-trace/src/config.js
ida613 Feb 21, 2024
616a20f
bug fix
ida613 Feb 21, 2024
5ffd912
resolve merge conflict
ida613 Feb 21, 2024
b84908c
addressed PR comments
ida613 Feb 25, 2024
217342b
lint error fix
ida613 Feb 25, 2024
46689a1
modified config
ida613 Feb 26, 2024
5563c6e
Update packages/dd-trace/src/config.js
ida613 Feb 26, 2024
abfc9ce
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Feb 26, 2024
18be2d2
Update packages/dd-trace/src/config.js
ida613 Feb 26, 2024
459f6a3
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Feb 26, 2024
37d6e47
Merge branch 'master' into ida613/active-tracing-configuration
ida613 Feb 26, 2024
5d71ac3
modified config
ida613 Feb 26, 2024
0c9c31a
Merge branch 'ida613/active-tracing-configuration' of github.com:Data…
ida613 Feb 26, 2024
4d520e9
Update packages/datadog-core/src/utils/src/get.js
ida613 Feb 26, 2024
eafd44e
Update packages/datadog-core/src/utils/src/has.js
ida613 Feb 26, 2024
35d7772
delete unused var
ida613 Feb 26, 2024
fec9045
modified config
ida613 Feb 26, 2024
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
11 changes: 11 additions & 0 deletions packages/datadog-core/src/utils/src/get.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict'

module.exports = (object, path) => {
const pathArr = path.split('.')
let val = object
for (const p in pathArr) {
if (val === undefined) return val
val = val[pathArr[p]]
ida613 marked this conversation as resolved.
Show resolved Hide resolved
}
return val
}
17 changes: 17 additions & 0 deletions packages/datadog-core/src/utils/src/has.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict'

module.exports = (object, path) => {
const pathArr = path.split('.')
let property = object
let i
for (i = 0; i < pathArr.length - 1; i++) {
const n = pathArr[i]
if (property.hasOwnProperty(n)) {
property = property[n]
} else {
return false
}
}
if (property.hasOwnProperty(pathArr[i])) return true
return false
ida613 marked this conversation as resolved.
Show resolved Hide resolved
}
17 changes: 17 additions & 0 deletions packages/datadog-core/src/utils/src/set.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict'

module.exports = (object, path, value) => {
const pathArr = path.split('.')
let property = object
let i
for (i = 0; i < pathArr.length - 1; i++) {
const n = pathArr[i]
if (property.hasOwnProperty(n)) {
property = property[n]
} else {
property[n] = {}
property = property[n]
Copy link
Contributor

Choose a reason for hiding this comment

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

You could avoid double lookup of property[n] if you changed the order:

Suggested change
property[n] = {}
property = property[n]
property = {}
property[n] = property

Or even

      property[n] = property = {}

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

thank you Attila you are so smart :D

}
}
property[pathArr[i]] = value
}
2 changes: 1 addition & 1 deletion packages/datadog-instrumentations/src/amqplib.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const {
addHook,
AsyncResource
} = require('./helpers/instrument')
const kebabCase = require('../../utils/src/kebabcase')
const kebabCase = require('../../datadog-core/src/utils/src/kebabcase')
const shimmer = require('../../datadog-shimmer')

const startCh = channel('apm:amqplib:command:start')
Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-graphql/src/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const pick = require('../../utils/src/pick')
const pick = require('../../datadog-core/src/utils/src/pick')
const CompositePlugin = require('../../dd-trace/src/plugins/composite')
const log = require('../../dd-trace/src/log')
const GraphQLExecutePlugin = require('./execute')
Expand Down
2 changes: 1 addition & 1 deletion packages/datadog-plugin-grpc/src/util.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const pick = require('../../utils/src/pick')
const pick = require('../../datadog-core/src/utils/src/pick')
const log = require('../../dd-trace/src/log')

module.exports = {
Expand Down
Loading
Loading