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.

Sign up for GitHub

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

Jump to bottom

contrib/database/sql: sql comment tag injection experimental feature #1226

Merged
merged 104 commits into from Jun 15, 2022
Merged

contrib/database/sql: sql comment tag injection experimental feature #1226

merged 104 commits into from Jun 15, 2022

Commits on Jun 15, 2022

  1. Add sqlcommenter comments to traced queries

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ad88ff6 View commit details
    Browse the repository at this point in the history

  2. Move comments as query prefix

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    58df219 View commit details
    Browse the repository at this point in the history

  3. Use QueryTextCarrier for propagating tags to query text

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3177df6 View commit details
    Browse the repository at this point in the history

  4. Fix Query Not Mutated

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    409dcc3 View commit details
    Browse the repository at this point in the history

  5. Refactor to SQLCommentCarrier

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    4345bab View commit details
    Browse the repository at this point in the history

  6. Fix SQLCommentCarrier passed as value instead of pointer

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3ddbbef View commit details
    Browse the repository at this point in the history

  7. Add Missing calls to CommentQuery

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ef7a6f6 View commit details
    Browse the repository at this point in the history

  8. Move call to inject context into SQL Comments Further Down

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    79cd4b2 View commit details
    Browse the repository at this point in the history

  9. Add godoc and move main function to top

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    f2b78d0 View commit details
    Browse the repository at this point in the history

  10. Add hack to set service name and meta tags to sql comments

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    33a6288 View commit details
    Browse the repository at this point in the history

  11. Set trace meta as tags

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    4c45603 View commit details
    Browse the repository at this point in the history

  12. Remove unused function

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    44fec1f View commit details
    Browse the repository at this point in the history

  13. DBM-1020 Remove meta info from sql comments and shorten sql comment t… 

    …ag keys
    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    df7baa0 View commit details
    Browse the repository at this point in the history

  14. Add SQL Commenting Injection Mode Feature, Env and Version

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    6960385 View commit details
    Browse the repository at this point in the history

  15. Only inject service name in sql comments when it's not empty

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    cc22234 View commit details
    Browse the repository at this point in the history

  16. Fix linting error

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    8591b70 View commit details
    Browse the repository at this point in the history

  17. Fix broken test (bad copy-pasta)

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    b728ee3 View commit details
    Browse the repository at this point in the history

  18. Fix linting errors

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    5ffca62 View commit details
    Browse the repository at this point in the history

  19. Refactor to handle code overrides

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    9577c6d View commit details
    Browse the repository at this point in the history

  20. Create new parent version key for propagation of the parent service v… 

    …ersion into sql comments
    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ef456e4 View commit details
    Browse the repository at this point in the history

  21. Add explicit guard around sql comment injection

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    a754c9b View commit details
    Browse the repository at this point in the history

  22. Rename sqlCommentInjectionMode

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    0699673 View commit details
    Browse the repository at this point in the history

  23. Add ExperimentalInjector interface

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ceab980 View commit details
    Browse the repository at this point in the history

  24. Fix broken tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ba1ee99 View commit details
    Browse the repository at this point in the history

  25. Add commenting mode tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    51b2c2e View commit details
    Browse the repository at this point in the history

  26. Fix sqlcomment tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    45bd67d View commit details
    Browse the repository at this point in the history

  27. Keep tryStartTrace only on methods that can do injection

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    505b865 View commit details
    Browse the repository at this point in the history

  28. Force close rows for more deterministic test

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    089fa01 View commit details
    Browse the repository at this point in the history

  29. Fix typo in defer calls

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    29b3703 View commit details
    Browse the repository at this point in the history

  30. Fix linting error

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    1d48c37 View commit details
    Browse the repository at this point in the history

  31. Cleanup of self-review

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    d678962 View commit details
    Browse the repository at this point in the history

  32. Use tryTrace instead of tryStartTrace on Close

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ae32223 View commit details
    Browse the repository at this point in the history

  33. Implement ForeachKey on SQLCommentCarrier

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    8d86d3f View commit details
    Browse the repository at this point in the history

  34. Use iota for comment injection modes

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    9a34a17 View commit details
    Browse the repository at this point in the history

  35. Add missing dots

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3d3160e View commit details
    Browse the repository at this point in the history

  36. Rename ExperimentalInjector to WithOptionsInjector

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3ad8cb9 View commit details
    Browse the repository at this point in the history

  37. Revert back to using tryTrace only with sql commenting done separately

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    e0a6d43 View commit details
    Browse the repository at this point in the history

  38. Update WithOptionsInjector godoc

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    40f417f View commit details
    Browse the repository at this point in the history

  39. Update godoc and add leftover TODO task

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3ddd663 View commit details
    Browse the repository at this point in the history

  40. Update some godoc with dots

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    1fa47fe View commit details
    Browse the repository at this point in the history

  41. Fix tests?

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    4a5cd0e View commit details
    Browse the repository at this point in the history

  42. Fix broken sampling priority injection when nil span context

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    0d7f225 View commit details
    Browse the repository at this point in the history

  43. Fix issue with nil span context when writing parent env and version

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    eeb5bce View commit details
    Browse the repository at this point in the history

  44. Formatting/styling updates

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    a7f1077 View commit details
    Browse the repository at this point in the history

  45. Address some formatting/styling comments

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    6d1577a View commit details
    Browse the repository at this point in the history

  46. Add Missing godoc

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    529e2e6 View commit details
    Browse the repository at this point in the history

  47. WIP: Refactor SQL Comment Injection to New Propagator and Carrier

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    1b449c0 View commit details
    Browse the repository at this point in the history

  48. Fix sql tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ea8872f View commit details
    Browse the repository at this point in the history

  49. Add propagator configuration for sql comment injection mode

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    19a749b View commit details
    Browse the repository at this point in the history

  50. Add godoc and better sql comment propagator tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    e980168 View commit details
    Browse the repository at this point in the history

  51. Formatting / Styling Fixes

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    1b08ad0 View commit details
    Browse the repository at this point in the history

  52. Reorganize imports

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3d973d5 View commit details
    Browse the repository at this point in the history

  53. Remove obsolete code

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    d70dd5d View commit details
    Browse the repository at this point in the history

  54. More reorganization of imports

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    25131c0 View commit details
    Browse the repository at this point in the history

  55. Remove accidental duplicated line

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    b1c9579 View commit details
    Browse the repository at this point in the history

  56. Add missing copyright headers

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ecacc6d View commit details
    Browse the repository at this point in the history

  57. Make SQLCommentPropagator be a no-op on Extract

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ab995ec View commit details
    Browse the repository at this point in the history

  58. Fix getPropagators not including SQLCommentPropagator

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    32a0a31 View commit details
    Browse the repository at this point in the history

  59. Revert comma removal

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    0f4c463 View commit details
    Browse the repository at this point in the history

  60. Update ddtrace/tracer/option.go 

    Co-authored-by: Andrew Glaude <andrew.glaude@datadoghq.com>
    @alexandre-normand @ajgajg1134
    alexandre-normand and ajgajg1134 committed Jun 15, 2022
    Copy the full SHA
    28c1b59 View commit details
    Browse the repository at this point in the history

  61. Make spancontext.meta thread safe

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    423a065 View commit details
    Browse the repository at this point in the history

  62. Update comment around setting of ParentVersion

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    182b92a View commit details
    Browse the repository at this point in the history

  63. Fix sql comment span id being the parent span id instead of the SQL s… 

    …pan's.
    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    165f6e5 View commit details
    Browse the repository at this point in the history

  64. Fix linting error

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    98730b9 View commit details
    Browse the repository at this point in the history

  65. Update comments to reflect latest implementation

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    53f7bff View commit details
    Browse the repository at this point in the history

  66. Update condition on sql comment injection mode

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    940cca6 View commit details
    Browse the repository at this point in the history

  67. Update ddtrace/tracer/sqlcomment.go 

    Co-authored-by: Andrew Glaude <andrew.glaude@datadoghq.com>
    @alexandre-normand @ajgajg1134
    alexandre-normand and ajgajg1134 committed Jun 15, 2022
    Copy the full SHA
    83db4a1 View commit details
    Browse the repository at this point in the history

  68. Update ddtrace/tracer/sqlcomment.go 

    Co-authored-by: Andrew Glaude <andrew.glaude@datadoghq.com>
    @alexandre-normand @ajgajg1134
    alexandre-normand and ajgajg1134 committed Jun 15, 2022
    Copy the full SHA
    c7aeb0e View commit details
    Browse the repository at this point in the history

  69. Address last PR feedback

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    0cbb92d View commit details
    Browse the repository at this point in the history

  70. Remove custom propagator

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    733dd7b View commit details
    Browse the repository at this point in the history

  71. WIP: Removed propagator in favor or handling in chainedPropagator

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    ab44809 View commit details
    Browse the repository at this point in the history

  72. Fix linting errors

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    7d71b81 View commit details
    Browse the repository at this point in the history

  73. Fix gorm tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    363ab4c View commit details
    Browse the repository at this point in the history

  74. Fix wrong import order

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    a07504f View commit details
    Browse the repository at this point in the history

  75. Gofmt

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    4d7aba0 View commit details
    Browse the repository at this point in the history

  76. Update log statement

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    7d3fbb8 View commit details
    Browse the repository at this point in the history

  77. Misc cleanup

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    f8bc080 View commit details
    Browse the repository at this point in the history

  78. Simplify tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    83bf1ae View commit details
    Browse the repository at this point in the history

  79. Update contrib/database/sql/conn.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    6726b3d View commit details
    Browse the repository at this point in the history

  80. Update contrib/database/sql/conn.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    b6b62e7 View commit details
    Browse the repository at this point in the history

  81. Update contrib/database/sql/conn.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    7993393 View commit details
    Browse the repository at this point in the history

  82. Change sql comment testing strategy

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    738c446 View commit details
    Browse the repository at this point in the history

  83. Inline sqlcommenter implementation

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    e22347a View commit details
    Browse the repository at this point in the history

  84. Fix mode handling bug

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3576b56 View commit details
    Browse the repository at this point in the history

  85. Add godoc to mockdriver

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    39b6a53 View commit details
    Browse the repository at this point in the history

  86. Fix tests

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    d3605f0 View commit details
    Browse the repository at this point in the history

  87. Update contrib/database/sql/conn.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    452d890 View commit details
    Browse the repository at this point in the history

  88. Update contrib/database/sql/conn.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    8415c84 View commit details
    Browse the repository at this point in the history

  89. Update ddtrace/tracer/sqlcomment.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    7e742dc View commit details
    Browse the repository at this point in the history

  90. Use span id instead of allowing options

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    bd54cb3 View commit details
    Browse the repository at this point in the history

  91. Address some but not all comments

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    b351637 View commit details
    Browse the repository at this point in the history

  92. Update contrib/database/sql/internal/mockdriver.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    ffc7af4 View commit details
    Browse the repository at this point in the history

  93. Update contrib/database/sql/internal/mockdriver.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    42f27e9 View commit details
    Browse the repository at this point in the history

  94. Update ddtrace/tracer/sqlcomment.go 

    Co-authored-by: Gabriel Aszalos <gabriel.aszalos@gmail.com>
    @alexandre-normand @gbbr
    alexandre-normand and gbbr committed Jun 15, 2022
    Copy the full SHA
    2a0dbed View commit details
    Browse the repository at this point in the history

  95. Rename sqlcomment test cases

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    cb5a1b8 View commit details
    Browse the repository at this point in the history

  96. Gofmt mockdriver.go

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    8a2d5d4 View commit details
    Browse the repository at this point in the history

  97. More Renaming

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    04b59ca View commit details
    Browse the repository at this point in the history

  98. Add Benchmark and Include an Optimized Implementation of CommentQuery

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3cfb8d0 View commit details
    Browse the repository at this point in the history

  99. Revert "Use span id instead of allowing options" 

    This reverts commit ea84e8c.
    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    037c0f7 View commit details
    Browse the repository at this point in the history

  100. Address some more comments

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    685ee1f View commit details
    Browse the repository at this point in the history

  101. Tweak test to increase confidence that sql comment span ids are new

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    d39e3fb View commit details
    Browse the repository at this point in the history

  102. Address a few more

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    6b53e19 View commit details
    Browse the repository at this point in the history

  103. Make SQLCommentInjection mode a string

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    b92c0ef View commit details
    Browse the repository at this point in the history

  104. Reorder imports

    @alexandre-normand
    alexandre-normand committed Jun 15, 2022
    Copy the full SHA
    3e87cec View commit details
    Browse the repository at this point in the history