Skip to content

Commit ccb7ac0

Browse files
Fixing references to v1 in unit tests
1 parent 737c29c commit ccb7ac0

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

tracer/test/Datadog.Trace.Tests/Configuration/Schema/MessagingSchemaTests.cs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,7 @@ public void CreateMsmqTagsReturnsCorrectImplementation(object schemaVersionObjec
129129
public void CreateAwsS3TagsReturnsCorrectImplementation(object schemaVersionObject, bool peerServiceTagsEnabled, bool removeClientServiceNamesEnabled)
130130
{
131131
var schemaVersion = (SchemaVersion)schemaVersionObject; // Unbox SchemaVersion, which is only defined internally
132-
var expectedType = schemaVersion switch
133-
{
134-
SchemaVersion.V0 when peerServiceTagsEnabled == false => typeof(AwsS3Tags),
135-
_ => typeof(AwsS3V1Tags),
136-
};
132+
var expectedType = typeof(AwsS3Tags);
137133

138134
var namingSchema = new NamingSchema(schemaVersion, peerServiceTagsEnabled, removeClientServiceNamesEnabled, DefaultServiceName, _mappings, new Dictionary<string, string>());
139135
namingSchema.Messaging.CreateAwsS3Tags("spanKind").Should().BeOfType(expectedType);
@@ -144,11 +140,7 @@ public void CreateAwsS3TagsReturnsCorrectImplementation(object schemaVersionObje
144140
public void CreateAwsSqsTagsReturnsCorrectImplementation(object schemaVersionObject, bool peerServiceTagsEnabled, bool removeClientServiceNamesEnabled)
145141
{
146142
var schemaVersion = (SchemaVersion)schemaVersionObject; // Unbox SchemaVersion, which is only defined internally
147-
var expectedType = schemaVersion switch
148-
{
149-
SchemaVersion.V0 when peerServiceTagsEnabled == false => typeof(AwsSqsTags),
150-
_ => typeof(AwsSqsV1Tags),
151-
};
143+
var expectedType = typeof(AwsSqsTags);
152144

153145
var namingSchema = new NamingSchema(schemaVersion, peerServiceTagsEnabled, removeClientServiceNamesEnabled, DefaultServiceName, _mappings, new Dictionary<string, string>());
154146
namingSchema.Messaging.CreateAwsSqsTags("spanKind").Should().BeOfType(expectedType);
@@ -159,11 +151,7 @@ public void CreateAwsSqsTagsReturnsCorrectImplementation(object schemaVersionObj
159151
public void CreateAwsSnsTagsReturnsCorrectImplementation(object schemaVersionObject, bool peerServiceTagsEnabled, bool removeClientServiceNamesEnabled)
160152
{
161153
var schemaVersion = (SchemaVersion)schemaVersionObject; // Unbox SchemaVersion, which is only defined internally
162-
var expectedType = schemaVersion switch
163-
{
164-
SchemaVersion.V0 when peerServiceTagsEnabled == false => typeof(AwsSnsTags),
165-
_ => typeof(AwsSnsV1Tags),
166-
};
154+
var expectedType = typeof(AwsSnsTags);
167155

168156
var namingSchema = new NamingSchema(schemaVersion, peerServiceTagsEnabled, removeClientServiceNamesEnabled, DefaultServiceName, _mappings, new Dictionary<string, string>());
169157
namingSchema.Messaging.CreateAwsSnsTags("spanKind").Should().BeOfType(expectedType);
@@ -174,11 +162,7 @@ public void CreateAwsSnsTagsReturnsCorrectImplementation(object schemaVersionObj
174162
public void CreateAwsEventBridgeTagsReturnsCorrectImplementation(object schemaVersionObject, bool peerServiceTagsEnabled, bool removeClientServiceNamesEnabled)
175163
{
176164
var schemaVersion = (SchemaVersion)schemaVersionObject; // Unbox SchemaVersion, which is only defined internally
177-
var expectedType = schemaVersion switch
178-
{
179-
SchemaVersion.V0 when peerServiceTagsEnabled == false => typeof(AwsEventBridgeTags),
180-
_ => typeof(AwsEventBridgeV1Tags),
181-
};
165+
var expectedType = typeof(AwsEventBridgeTags);
182166

183167
var namingSchema = new NamingSchema(schemaVersion, peerServiceTagsEnabled, removeClientServiceNamesEnabled, DefaultServiceName, _mappings, new Dictionary<string, string>());
184168
namingSchema.Messaging.CreateAwsEventBridgeTags("spanKind").Should().BeOfType(expectedType);

0 commit comments

Comments
 (0)