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

[Tracer] Set _dd.base_service tag whenever a span's service name is different than the default value (DD_SERVICE) #5502

Merged
merged 31 commits into from
Sep 27, 2024
Merged

[Tracer] Set _dd.base_service tag whenever a span's service name is different than the default value (DD_SERVICE) #5502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
800c97a
Set _dd.base_service correctly
bouwkast Apr 26, 2024
69180a5
Update tests
bouwkast Apr 30, 2024
526c17c
Fix TagsListTests
bouwkast May 2, 2024
368dc8a
Update snapshots
bouwkast May 2, 2024
a253344
Add missing _dd.base_service to meta data rules
bouwkast May 2, 2024
0fdf93c
Update more snapshots
bouwkast May 2, 2024
b273b2d
Update the smoke test snapshots
bouwkast May 2, 2024
84bad6c
Properly dispose of the tracer in test
bouwkast May 3, 2024
87d74fc
Revert to using a mock
bouwkast May 3, 2024
269cea7
Update snapshots
bouwkast May 30, 2024
a4ce52e
Update snapshot
bouwkast Sep 24, 2024
6218341
Cache model.TraceChunk.DefaultServiceName
bouwkast Sep 25, 2024
16134e9
Check for default service name in TagsListTests
bouwkast Sep 25, 2024
9292f30
Fix OldMySql tests
bouwkast Sep 26, 2024
fec904a
Update MySqlCommandTests snapshots
bouwkast Sep 26, 2024
c0a2a7f
Remove no longer updated/used MySqlCommandTests snapshots
bouwkast Sep 26, 2024
75fd8c9
Update untagged NpgsqlCommandTests snapshots
bouwkast Sep 26, 2024
81d8796
Add missing NpgsqlCommandTests snapshots
bouwkast Sep 26, 2024
3f5473d
Update SQS .NET Framework snapshots
bouwkast Sep 26, 2024
300abc1
Update SNS snapshots
bouwkast Sep 26, 2024
6d88067
Add missing SNS snapshots
bouwkast Sep 26, 2024
c075fec
Update Kinesis snapshots
bouwkast Sep 26, 2024
93de148
Ignore .localstack directory
bouwkast Sep 26, 2024
be1b8ac
Update AwsDynamoDbTests snapshots
bouwkast Sep 26, 2024
f6b856a
Remove SystemDataSqlClientTests snapshots no longer created
bouwkast Sep 26, 2024
62cc006
Update Oracle test snapshots
bouwkast Sep 26, 2024
3996b08
Hack to account for _dd.base_service in test data
bouwkast Sep 26, 2024
c3f168f
Update ProcessStart OXS snapshots
bouwkast Sep 26, 2024
bee1a9f
Update test
bouwkast Sep 26, 2024
7e8d7af
Remove StackExchangeRedis snapshots I can't recreate
bouwkast Sep 26, 2024
c3d1cfc
Undo MySqlCommandTests isNewVersion
bouwkast Sep 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
Prev Previous commit
Next Next commit
Update SNS snapshots
  • Loading branch information
@bouwkast
bouwkast committed Sep 26, 2024
commit 300abc103e7dccc0b6cac6026009de32fd51f721
32 changes: 10 additions & 22 deletions tracer/test/snapshots/AwsSnsTests.NetFramework.SchemaV0.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
Tags: {
env: integration_tests,
language: dotnet,
runtime-id: Guid_1,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
runtime-id: Guid_1
},
Metrics: {
process_id: 0,
Expand All @@ -37,8 +35,7 @@
out.host: aws_sns,
runtime-id: Guid_1,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand Down Expand Up @@ -69,8 +66,7 @@
runtime-id: Guid_1,
span.kind: client,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand Down Expand Up @@ -101,8 +97,7 @@
runtime-id: Guid_1,
span.kind: client,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand All @@ -126,8 +121,7 @@
out.host: aws_sns,
runtime-id: Guid_1,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand All @@ -142,9 +136,7 @@
Tags: {
env: integration_tests,
language: dotnet,
runtime-id: Guid_1,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
runtime-id: Guid_1
},
Metrics: {
process_id: 0,
Expand All @@ -171,8 +163,7 @@
out.host: aws_sns,
runtime-id: Guid_1,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand Down Expand Up @@ -203,8 +194,7 @@
runtime-id: Guid_1,
span.kind: client,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand Down Expand Up @@ -235,8 +225,7 @@
runtime-id: Guid_1,
span.kind: client,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand All @@ -260,8 +249,7 @@
out.host: aws_sns,
runtime-id: Guid_1,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
_dd.base_service: Samples.AWS.SimpleNotificationService
},
Metrics: {
_dd.top_level: 1.0
Expand Down
24 changes: 2 additions & 22 deletions tracer/test/snapshots/AwsSnsTests.NetFramework.SchemaV1.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
Tags: {
env: integration_tests,
language: dotnet,
runtime-id: Guid_1,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
runtime-id: Guid_1
},
Metrics: {
process_id: 0,
Expand All @@ -37,8 +35,6 @@
out.host: aws_sns,
peer.service: aws_sns,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: out.host
}
},
Expand Down Expand Up @@ -67,8 +63,6 @@
peer.service: MyTopic,
span.kind: producer,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: topicname
}
},
Expand Down Expand Up @@ -97,8 +91,6 @@
peer.service: MyTopic,
span.kind: producer,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: topicname
}
},
Expand All @@ -120,8 +112,6 @@
out.host: aws_sns,
peer.service: aws_sns,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: out.host
}
},
Expand All @@ -134,9 +124,7 @@
Tags: {
env: integration_tests,
language: dotnet,
runtime-id: Guid_1,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet
runtime-id: Guid_1
},
Metrics: {
process_id: 0,
Expand All @@ -163,8 +151,6 @@
out.host: aws_sns,
peer.service: aws_sns,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: out.host
}
},
Expand Down Expand Up @@ -193,8 +179,6 @@
peer.service: MyTopic,
span.kind: producer,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: topicname
}
},
Expand Down Expand Up @@ -223,8 +207,6 @@
peer.service: MyTopic,
span.kind: producer,
topicname: MyTopic,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: topicname
}
},
Expand All @@ -246,8 +228,6 @@
out.host: aws_sns,
peer.service: aws_sns,
span.kind: client,
_dd.git.commit.sha: aaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbb,
_dd.git.repository_url: https://github.com/DataDog/dd-trace-dotnet,
_dd.peer.service.source: out.host
}
}
Expand Down