Skip to content

[tracing] add OTEL quartz autoinstrumentation #7192

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

Merged
merged 102 commits into from
Oct 3, 2025
Merged

[tracing] add OTEL quartz autoinstrumentation #7192

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
1edb97f
hangfire sample app
chojomok Jul 7, 2025
1cd2c26
add otel tracing to sample app
chojomok Jul 7, 2025
1471305
send the otel traces to the agent
chojomok Jul 7, 2025
beb58a5
create Diagnostic Listener for Quartz
chojomok Jul 11, 2025
fafaa42
try duckstruct to populate args
chojomok Jul 11, 2025
3513730
update span metdata
chojomok Jul 14, 2025
7b0c45b
add additional span tags to match otel
chojomok Jul 22, 2025
8835199
fix sample app
chojomok Jul 22, 2025
732c136
setting up master quartz
chojomok Jul 31, 2025
7e2bc8e
prep prerelease quartz
chojomok Aug 1, 2025
e21d895
creating quartz integration tests
chojomok Aug 4, 2025
06616cf
add quartz snapshot
chojomok Aug 4, 2025
8ece2ec
create versioned snapshots
chojomok Aug 4, 2025
1c75b66
try to get packageversion as suffix
chojomok Aug 5, 2025
e881934
setup test to take variable packageversion (results in no package)
chojomok Aug 5, 2025
ae19e00
Update QuartzTestsV4.verified.txt
chojomok Aug 5, 2025
ab5f430
update version logic
chojomok Aug 5, 2025
ff412e7
generate proper package versions
chojomok Aug 7, 2025
010a4ce
clean build after merge
chojomok Aug 7, 2025
9b83d82
running generatepackage
chojomok Aug 7, 2025
6800615
remove our custom instrumentation and add #nullable to listener
chojomok Aug 7, 2025
838618e
Update PackageVersionsLatestMajors.g.props
chojomok Aug 8, 2025
9041083
copy masters PackageVersionsLatestMinors.g.props
chojomok Aug 8, 2025
bb3274a
copy masters packageminor
chojomok Aug 8, 2025
f80de89
match generated code to master
chojomok Aug 8, 2025
5de2a2b
generate package version changes just for quartz
chojomok Aug 8, 2025
4c95501
remove , at the end of list (protobuf)
chojomok Aug 8, 2025
583f2e4
Merge branch 'master' into mohamammad/quarz-integration
chojomok Aug 11, 2025
4af1dd6
correct package name
chojomok Aug 11, 2025
4c4e3d6
add new snapshot for 315
chojomok Aug 11, 2025
03df157
Update QuartzTestsV315plus.verified.txt
chojomok Aug 12, 2025
5366981
add snapshot for v3.15 netcorepp3.1
chojomok Aug 12, 2025
1438a14
clean up
chojomok Aug 14, 2025
7fc3620
Update tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/QuartzT…
chojomok Aug 18, 2025
060b5d5
break up sample app
chojomok Aug 18, 2025
53cc638
update isQuartz to include OTEL tags
chojomok Aug 18, 2025
c1583e4
remove component match
chojomok Aug 18, 2025
de33bd4
update v3 snapshot
chojomok Aug 18, 2025
cd3034e
update snapshots to match new file directory with sample app changes
chojomok Aug 18, 2025
05d5042
Update tracer/test/test-applications/integrations/Samples.Quartz/Jobs…
chojomok Aug 21, 2025
14a6b01
update integration tests
chojomok Aug 21, 2025
57f2551
update launch settings
chojomok Aug 21, 2025
336e710
update snapshots for v4 and added ordering to spans
chojomok Aug 21, 2025
43d1c53
order by error on spans - should fail and give new snapshots
chojomok Aug 22, 2025
a8d18c8
add code for OTEL traces into sample app
chojomok Aug 22, 2025
45fe58e
trying to create a ActivityHandler
chojomok Aug 22, 2025
aef38d8
Update QuartzActivityHandler.cs
chojomok Aug 22, 2025
c7ad15c
add logging to determine why the resource name is staying the same
chojomok Aug 22, 2025
7302b12
adding veto jobs and activity handler updates
chojomok Aug 28, 2025
cf8fbb6
enhance resource name and operation name
chojomok Sep 3, 2025
53e1bf9
add span.kind and exception to quartz activity + reflection for activ…
chojomok Sep 4, 2025
1bff6a8
refactor span metadata enhance methods
chojomok Sep 5, 2025
41e8ace
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 5, 2025
ccec123
update v3 snapshot
chojomok Sep 5, 2025
a14c7bb
update v4 snapshot
chojomok Sep 5, 2025
87cc7e6
remove updating span kind for quartz activity handler
chojomok Sep 5, 2025
f6fa8b0
remove quarz prerelease for nuget source
chojomok Sep 5, 2025
01143b7
update tests to run on windows
chojomok Sep 5, 2025
2b41d12
add try catch around CreateActivityKindSetter
chojomok Sep 8, 2025
23efaea
update 3.1 core app snapshot + activity kind reflection
chojomok Sep 8, 2025
9c9f067
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 8, 2025
c410282
generalize function casting for setter
chojomok Sep 8, 2025
88fffeb
try casting with int
chojomok Sep 8, 2025
cc7b50c
try IL to create setter method
chojomok Sep 10, 2025
2e2422f
attempt at fixing System.ArgumentException
chojomok Sep 11, 2025
988f440
fix types
chojomok Sep 11, 2025
c09f15c
remove IL for enum casting
chojomok Sep 11, 2025
f36f8ce
use activity.instance instead of ducktype class
chojomok Sep 11, 2025
8ae7d55
remove empty string case for windows test
chojomok Sep 11, 2025
7d01271
set default packageVersion
chojomok Sep 12, 2025
e422843
try GetData() to get package version
chojomok Sep 12, 2025
958d6fd
skip test for .NETFramework
chojomok Sep 15, 2025
49495e3
add back getdata
chojomok Sep 15, 2025
d94e3ef
Create QuartzTestsNETFRAMEWORK.verified.txt
chojomok Sep 15, 2025
5cb92b2
skip test for .NETFramework
chojomok Sep 15, 2025
065e91f
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 18, 2025
aa4a9ad
Update tracer/src/Datadog.Trace/Activity/Handlers/QuartzActivityHandl…
chojomok Sep 22, 2025
451817b
fix v4 snapshots and update operation name
chojomok Sep 22, 2025
16baa62
null or empty is for windows, which should run the default of v3
chojomok Sep 23, 2025
78d6cdf
update v4 snapshot to use newer preview version of 4.0
chojomok Sep 23, 2025
7aece0b
fix scrubbing for v4 events
chojomok Sep 23, 2025
c0741e0
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 23, 2025
d31be41
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 24, 2025
27e7b2e
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 25, 2025
8417d78
add debug logs to EnhanceActivityMetadata
chojomok Sep 25, 2025
20aac07
comment out package references
chojomok Sep 25, 2025
9844589
Update tracer/test/test-applications/integrations/Samples.Quartz/Prog…
chojomok Sep 25, 2025
bbf8a5f
Update tracer/build/PackageVersionsGeneratorDefinitions.json
chojomok Sep 25, 2025
f8efc23
Update tracer/src/Datadog.Trace/Activity/Handlers/QuartzActivityHandl…
chojomok Sep 25, 2025
eacf82c
Update tracer/src/Datadog.Trace/Activity/ActivityListener.cs
chojomok Sep 25, 2025
ff7fb1b
Update tracer/test/test-applications/integrations/Samples.Quartz/Prog…
chojomok Sep 26, 2025
a460bd4
add coreapp3.1 snapshots
chojomok Sep 29, 2025
b898efb
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 29, 2025
feca4f3
Merge branch 'master' into mohamammad/quarz-integration
chojomok Sep 29, 2025
f290118
fixed typo for netcoreapp in quartz test
chojomok Sep 29, 2025
25d549f
fix snapshot location
chojomok Sep 29, 2025
f5c76e0
update mockactivity5.displayname to have a setter
chojomok Sep 29, 2025
775e67d
package version is null for windows, add check for netcoreapp
chojomok Sep 30, 2025
f0c729d
Merge branch 'master' into mohamammad/quarz-integration
chojomok Oct 1, 2025
7c705c4
fix QuartzDiagnosticObserver.cs(58,25): error DDDUCK001
chojomok Oct 1, 2025
dc6b2e4
directives .netcoreapp3x instead of just 31
chojomok Oct 1, 2025
94984e4
fix unreachable code
chojomok Oct 1, 2025
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
7 changes: 7 additions & 0 deletions Datadog.Trace.Samples.g.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AWS.S3", "tracer\te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.GoogleProtobuf", "tracer\test\test-applications\integrations\Samples.GoogleProtobuf\Samples.GoogleProtobuf.csproj", "{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Quartz", "tracer\test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj", "{CF69BC17-1527-425A-9B02-8E223BC31DB8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1057,6 +1059,10 @@ Global
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9}.Release|Any CPU.Build.0 = Release|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9518425A-36A5-4B8F-B0B8-6137DB88441D} = {8CEC2042-F11C-49F5-A674-2355793B600A}
Expand Down Expand Up @@ -1232,5 +1238,6 @@ Global
{E2EDDD17-B5E6-4240-9EF8-34F2D274AA19} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{0C0578CB-3B67-4F95-8547-206CD2A560CD} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{EF8C4CCE-E79C-4D78-BF31-222A11E198B9} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{CF69BC17-1527-425A-9B02-8E223BC31DB8} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
EndGlobalSection
EndGlobal
7 changes: 7 additions & 0 deletions Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks.OpenTelemetry.In
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datadog.AzureFunctions", "tracer\src\Datadog.AzureFunctions\Datadog.AzureFunctions.csproj", "{BB073E40-F46D-E52B-662E-395EED834111}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Quartz", "tracer\test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj", "{CF69BC17-1527-425A-9B02-8E223BC31DB8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1489,6 +1491,10 @@ Global
{BB073E40-F46D-E52B-662E-395EED834111}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB073E40-F46D-E52B-662E-395EED834111}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB073E40-F46D-E52B-662E-395EED834111}.Release|Any CPU.Build.0 = Release|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF69BC17-1527-425A-9B02-8E223BC31DB8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1731,6 +1737,7 @@ Global
{501AD343-1951-FF43-0C7F-3FE3FDF5A660} = {E5439139-6F94-44FA-9590-C32FCC1C7A93}
{BD7ADF79-C948-5CC7-6BE8-A7FF8DF882C3} = {E5439139-6F94-44FA-9590-C32FCC1C7A93}
{BB073E40-F46D-E52B-662E-395EED834111} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
{CF69BC17-1527-425A-9B02-8E223BC31DB8} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
14 changes: 14 additions & 0 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
[
{
"IntegrationName": "Quartz",
"SampleProjectName": "Samples.Quartz",
"NugetPackageSearchName": "Quartz",
"MinVersion": "3.1.0",
"MaxVersionExclusive": "4.0.0",
"SpecificVersions": [
"3.*.*"
],
"VersionConditions": [{
"MinVersion": "4.0.0",
"IncludeOnlyTargetFrameworks": ["net8.0","net9.0"]
}]
},
{
"IntegrationName": "AwsSdk",
"SampleProjectName": "Samples.AWS.DynamoDBv2",
Expand Down
48 changes: 48 additions & 0 deletions tracer/build/PackageVersionsLatestMajors.g.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,54 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
-->
<Project>
<ItemGroup>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.Quartz\Samples.Quartz.csproj">
<Properties>ApiVersion=3.15.0;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>None</RequiresDockerDependency>
<SampleName>Samples.Quartz</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj">
<Properties>ApiVersion=3.7.500.4;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
Expand Down
Loading
Loading