Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
b84b78a
create masstransit 7 and 8 sampleapp
chojomok Jan 12, 2026
044148f
move sample app and create publish and consume span
chojomok Jan 12, 2026
13d54cf
match tags on MT 7 to MT8
chojomok Jan 14, 2026
419a9f7
add #nullable enable
chojomok Jan 14, 2026
1b680e3
remove publish span integration
chojomok Jan 14, 2026
5246dc5
remove unused consume integration
chojomok Jan 14, 2026
0f0fd85
create integration test+snapshot
chojomok Jan 14, 2026
602f465
change integration to use ducktpying
chojomok Jan 15, 2026
24ad225
move ducktypes into new dir
chojomok Jan 15, 2026
d5fde81
simplify integration using duckfield
chojomok Jan 15, 2026
e5bd6c2
clean up destination name
chojomok Jan 15, 2026
cdf08c5
simplify sample app
chojomok Jan 15, 2026
a1e2d55
delete old sample app start fresh with new one
chojomok Jan 15, 2026
c8972e8
changes i forgot to commit
chojomok Jan 15, 2026
3525a1b
get sample apps working
chojomok Jan 15, 2026
c7eb719
get sample app injector to work
chojomok Jan 15, 2026
f2513ea
rabbitmq and inmemory filters
chojomok Jan 26, 2026
707f80a
add filter for send and publish
chojomok Jan 26, 2026
d3a0f18
update rabbitmq to use context propagation for publish spans
chojomok Jan 26, 2026
a4ce327
add context propagation for SNS and add AzureBus calltarget
chojomok Jan 26, 2026
05161f6
use a single hook to add the filters
chojomok Jan 26, 2026
dd91a6a
remove unused files
chojomok Jan 27, 2026
4a9907c
fix sqs/sns context propgation
chojomok Jan 27, 2026
08dd11e
update integration test
chojomok Jan 27, 2026
745ac02
remove linq usage and update the test to use count on all the masstra…
chojomok Jan 27, 2026
0322134
Merge branch 'master' into mohammad/mass_transit_intg
chojomok Jan 27, 2026
2800371
merge conflicts + rebuild
chojomok Jan 27, 2026
8cc3dd2
refactor code
chojomok Jan 27, 2026
6be801c
remove the calltarget approach for creating process spans
chojomok Jan 27, 2026
5d65b7a
refactor to match the syntax used in hangfire pr
chojomok Jan 27, 2026
be61e7d
add a lock to the filter to ensure only adding the filter once. Updat…
chojomok Jan 27, 2026
ff8bff8
move tags
chojomok Jan 27, 2026
2c5a4f6
add saga tagging and remove the interlock as we may need to inject mu…
chojomok Jan 27, 2026
14d9b44
add saga spans to the snapshot
chojomok Jan 28, 2026
b85d652
use diagnostic source approach instead
chojomok Jan 28, 2026
e0ca301
change logs to debug logs
chojomok Jan 28, 2026
d48a635
move methods to to common
chojomok Jan 28, 2026
164828e
no longer looking for active activity as it doesn't exist in this sce…
chojomok Jan 29, 2026
e69d9d8
add exception to spans
chojomok Jan 30, 2026
a1858cc
change resource name to match MT8 otel names
chojomok Jan 30, 2026
668d79c
update resource names and restore trace.manualinstrumentation sample app
chojomok Feb 2, 2026
b93ef31
Merge branch 'master' into mohammad/mass_transit_intg
chojomok Feb 2, 2026
8ac5596
rebuild after merging master
chojomok Feb 2, 2026
58fc1a7
update consume context tags to use ducktypes
chojomok Feb 2, 2026
5b50e2f
recieve context to use ducktpying
chojomok Feb 2, 2026
444e159
remove span tags not in MT8
chojomok Feb 2, 2026
8ef0bcb
change the code directory
chojomok Feb 2, 2026
2c64b6c
header extraction via ducktypes
chojomok Feb 2, 2026
42722a9
attempt ducktpying for header injection
chojomok Feb 2, 2026
ffd7b32
updating the md
chojomok Feb 2, 2026
ea17247
remove ducktyping for scenarios where it fails most of the time. rely…
chojomok Feb 6, 2026
be4e8aa
clean up context propgation
chojomok Feb 6, 2026
9b1dce0
code clean up and renaming send to produce in methods
chojomok Feb 12, 2026
f0572df
create masstransitv8 snapshot
chojomok Mar 2, 2026
703b6f5
update mt7 spans
chojomok Mar 2, 2026
ca3b17c
fix recieve context propagation and remove duplicate saga spans
chojomok Mar 2, 2026
98910d0
improve snapshot ordering for readability
chojomok Mar 2, 2026
6266902
update snapshot order to be more deterministic
chojomok Mar 2, 2026
816330d
add additional logging
chojomok Mar 4, 2026
d3c5cf3
remove legacy code from previous iterations
chojomok Mar 4, 2026
625f0ad
methodize the code to create spans
chojomok Mar 4, 2026
ddd0071
update getactivityid and remove operation name logic (it's unused)
chojomok Mar 4, 2026
0ca80a7
remove usage of masstransitactivityid
chojomok Mar 4, 2026
c0936f8
moving away from using activity as a key to datadog span
chojomok Mar 4, 2026
7d61603
update comment on exception storage
chojomok Mar 4, 2026
ee4b258
setting exception in bytecode
chojomok Mar 5, 2026
53a71df
use concurrent dictionary table for in memory and setup testing param…
chojomok Mar 6, 2026
0c45b8d
remove unecessary mt8 spans
chojomok Mar 6, 2026
fd379d7
use bye instrumentation instead of concurrent dictionary for context …
chojomok Mar 9, 2026
de1d8be
remove unused Datadog.Trace.Configuration
chojomok Mar 9, 2026
4f4f446
ducktpy args to get headers
chojomok Mar 12, 2026
10facf7
use ducktyping and duckcopy instead of reflection
chojomok Mar 13, 2026
3c573da
use ducktpying for sendcontext
chojomok Mar 16, 2026
f94439e
remove reflection for reading headers
chojomok Mar 16, 2026
01e9558
Merge branch 'master' into mohammad/mass_transit_intg
chojomok Mar 16, 2026
46469c8
post merge master fix
chojomok Mar 16, 2026
62a0973
comment clean up
chojomok Mar 16, 2026
a856bdb
remove old mds
chojomok Mar 16, 2026
5321c66
cleanup for performance and best practices
chojomok Mar 16, 2026
4357d4c
update masstrasnit 8 sample app
chojomok Mar 16, 2026
b186d68
update mt8 sample app to include all supported versions
chojomok Mar 16, 2026
2dc7f6c
For the sake of unit tests, define a default constructor
chojomok Mar 17, 2026
e333454
Update DictionarySendHeadersInnerCopy.cs
chojomok Mar 18, 2026
588f3ed
use public class instead of record
chojomok Mar 18, 2026
c47c2dc
update rabbitmq portion to work with CI
chojomok Mar 18, 2026
3421bfa
require all docker dependent containers
chojomok Mar 18, 2026
472bef1
rabbitmq scrubber for mt8
chojomok Mar 18, 2026
00ce97a
update docker dependency in package versions
chojomok Mar 18, 2026
f2b5b8a
don't run tests on windows due to docker dependency
chojomok Mar 19, 2026
7d036ae
test formatting changes
chojomok Mar 19, 2026
6d708df
Merge branch 'master' into mohammad/mass_transit_intg
chojomok Mar 19, 2026
d1c8ba2
create separate windows test with just inmemory
chojomok Mar 24, 2026
35aecb6
Merge branch 'master' into mohammad/mass_transit_intg
chojomok Mar 24, 2026
cb18df6
add MT diagnostic observer to framework and make windows test only ru…
chojomok Mar 24, 2026
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,332 changes: 1,325 additions & 7 deletions Datadog.Trace.Samples.g.sln

Large diffs are not rendered by default.

1,846 changes: 1,839 additions & 7 deletions Datadog.Trace.sln

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -727,10 +727,11 @@ services:
- azurite
- azure-eventhubs-emulator
- cosmosdb-emulator
- rabbitmq
- test-agent
environment:
- TIMEOUT_LENGTH=120
command: elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 mongo:27017 localstack:4566 sqledge:1433 azureservicebus-emulator:5672 azure-eventhubs-emulator:5672 cosmosdb-emulator:8081 test-agent:8126 test-agent:4317 test-agent:4318
command: elasticsearch5:9200 elasticsearch6:9200 elasticsearch7:9200 mongo:27017 localstack:4566 sqledge:1433 azureservicebus-emulator:5672 azure-eventhubs-emulator:5672 cosmosdb-emulator:8081 rabbitmq:5672 test-agent:8126 test-agent:4317 test-agent:4318

IntegrationTests.ARM64:
build:
Expand Down
20 changes: 20 additions & 0 deletions tracer/build/PackageVersionsGeneratorDefinitions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
[
{
"IntegrationName": "MassTransit7",
"SampleProjectName": "Samples.MassTransit7",
"NugetPackageSearchName": "MassTransit",
"MinVersion": "7.0.0",
"MaxVersionExclusive": "8.0.0",
"SpecificVersions": [
"7.*.*"
]
},
{
"IntegrationName": "MassTransit8",
"SampleProjectName": "Samples.MassTransit8",
"NugetPackageSearchName": "MassTransit",
"MinVersion": "8.0.0",
"MaxVersionExclusive": "9.0.0",
"SpecificVersions": [
"8.*.*"
]
},
{
"IntegrationName": "Hangfire",
"SampleProjectName": "Samples.Hangfire",
Expand Down
55 changes: 55 additions & 0 deletions tracer/build/PackageVersionsLatestMajors.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,61 @@ NOTE: This code was generated by the GeneratePackageVersions tool. To safely
-->
<Project>
<ItemGroup>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net5.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net6.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net7.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net8.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net9.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>
<PackageVersionSample Include="test\test-applications\integrations\Samples.MassTransit7\Samples.MassTransit7.csproj">
<Properties>ApiVersion=7.3.1;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net10.0</TargetFramework>
<RequiresDockerDependency>All</RequiresDockerDependency>
<SampleName>Samples.MassTransit7</SampleName>
</PackageVersionSample>

<PackageVersionSample Include="test\test-applications\integrations\Samples.Hangfire\Samples.Hangfire.csproj">
<Properties>ApiVersion=1.8.23;RestoreRecursive=false;BuildProjectReferences=false</Properties>
<TargetFramework>net48</TargetFramework>
Expand Down
Loading
Loading