Skip to content

Commit 0bd77c1

Browse files
anna-gitanna-git
committed
Adapt platform key usage in tests
1 parent 5cddf29 commit 0bd77c1

File tree

16 files changed

+77
-77
lines changed

16 files changed

+77
-77
lines changed

‎tracer/src/Datadog.Trace/Configuration/ImmutableGCPFunctionSettings.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ public ImmutableGCPFunctionSettings(IConfigurationSource? source, IConfiguration
2222
source ??= NullConfigurationSource.Instance;
2323
var config = new ConfigurationBuilder(source, telemetry);
2424

25-
var deprecatedFunctionKey = config.WithKeys(PlatformKeys.GCPFunction.DeprecatedFunctionNameKey).AsString();
26-
var deprecatedProjectKey = config.WithKeys(PlatformKeys.GCPFunction.DeprecatedProjectKey).AsString();
25+
var deprecatedFunctionKey = config.WithKeys(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey).AsString();
26+
var deprecatedProjectKey = config.WithKeys(PlatformKeys.GcpFunction.DeprecatedProjectKey).AsString();
2727
IsDeprecatedFunction = deprecatedFunctionKey != null && deprecatedProjectKey != null;
2828

29-
var functionNameKey = config.WithKeys(PlatformKeys.GCPFunction.FunctionNameKey).AsString();
30-
var functionTargetKey = config.WithKeys(PlatformKeys.GCPFunction.FunctionTargetKey).AsString();
29+
var functionNameKey = config.WithKeys(PlatformKeys.GcpFunction.FunctionNameKey).AsString();
30+
var functionTargetKey = config.WithKeys(PlatformKeys.GcpFunction.FunctionTargetKey).AsString();
3131
IsNewerFunction = functionNameKey != null && functionTargetKey != null;
3232

3333
IsGCPFunction = IsDeprecatedFunction || IsNewerFunction;

‎tracer/src/Datadog.Trace/Util/EnvironmentHelpers.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ public static bool IsAwsLambda()
174174
/// </summary>
175175
public static bool IsGoogleCloudFunctions()
176176
{
177-
return (EnvironmentVariableExists(PlatformKeys.GCPFunction.FunctionNameKey) &&
178-
EnvironmentVariableExists(PlatformKeys.GCPFunction.FunctionTargetKey)) ||
179-
(EnvironmentVariableExists(PlatformKeys.GCPFunction.DeprecatedFunctionNameKey) &&
180-
EnvironmentVariableExists(PlatformKeys.GCPFunction.DeprecatedProjectKey));
177+
return (EnvironmentVariableExists(PlatformKeys.GcpFunction.FunctionNameKey) &&
178+
EnvironmentVariableExists(PlatformKeys.GcpFunction.FunctionTargetKey)) ||
179+
(EnvironmentVariableExists(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey) &&
180+
EnvironmentVariableExists(PlatformKeys.GcpFunction.DeprecatedProjectKey));
181181
}
182182

183183
/// <summary>

‎tracer/src/Datadog.Trace/Util/EnvironmentHelpersNoLogging.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ internal static bool IsServerlessEnvironment(out Exception? exceptionInReading)
2626
var isServerless = CheckEnvVar(LambdaMetadata.FunctionNameEnvVar, ref firstException)
2727
|| (CheckEnvVar(PlatformKeys.AzureAppService.SiteNameKey, ref firstException)
2828
&& !CheckEnvVar(ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, ref firstException))
29-
|| (CheckEnvVar(PlatformKeys.GCPFunction.FunctionNameKey, ref firstException)
30-
&& CheckEnvVar(PlatformKeys.GCPFunction.FunctionTargetKey, ref firstException))
31-
|| (CheckEnvVar(PlatformKeys.GCPFunction.DeprecatedFunctionNameKey, ref firstException)
32-
&& CheckEnvVar(PlatformKeys.GCPFunction.DeprecatedProjectKey, ref firstException));
29+
|| (CheckEnvVar(PlatformKeys.GcpFunction.FunctionNameKey, ref firstException)
30+
&& CheckEnvVar(PlatformKeys.GcpFunction.FunctionTargetKey, ref firstException))
31+
|| (CheckEnvVar(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey, ref firstException)
32+
&& CheckEnvVar(PlatformKeys.GcpFunction.DeprecatedProjectKey, ref firstException));
3333

3434
exceptionInReading = firstException;
3535
return isServerless;

‎tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/DbScopeFactoryTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ public async Task CreateDbCommandScope_ReturnNullForAdoNetDisabledIntegration(Ty
102102

103103
var tracerSettings = TracerSettings.Create(new()
104104
{
105-
{ string.Format(ConfigurationKeys.Integrations.Enabled, integrationName), "true" },
106-
{ string.Format(ConfigurationKeys.Integrations.Enabled, nameof(IntegrationId.AdoNet)), "false" },
105+
{ string.Format(IntegrationSettings.IntegrationEnabled, integrationName), "true" },
106+
{ string.Format(IntegrationSettings.IntegrationEnabled, nameof(IntegrationId.AdoNet)), "false" },
107107
});
108108
await using var tracer = TracerHelper.CreateWithFakeAgent(tracerSettings);
109109

@@ -750,7 +750,7 @@ private static ScopedTracer CreateTracerWithIntegrationEnabled(string integratio
750750
// Set up tracer
751751
var tracerSettings = TracerSettings.Create(new()
752752
{
753-
{ string.Format(ConfigurationKeys.Integrations.Enabled, integrationName), enabled },
753+
{ string.Format(IntegrationSettings.IntegrationEnabled, integrationName), enabled },
754754
});
755755
return TracerHelper.Create(tracerSettings);
756756
}

‎tracer/test/Datadog.Trace.IntegrationTests/Tagging/AASTagsTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,12 @@ private IConfigurationSource GetMockVariables()
202202
// This is a needed configuration for the AAS extension
203203
{ ConfigurationKeys.ApiKey, "1" },
204204
{ ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, "1" },
205-
{ ConfigurationKeys.AzureAppService.WebsiteOwnerNameKey, $"SubscriptionId+ResourceGroup-EastUSwebspace" },
206-
{ ConfigurationKeys.AzureAppService.ResourceGroupKey, "SiteResourceGroup" },
207-
{ ConfigurationKeys.AzureAppService.SiteNameKey, "SiteName" },
208-
{ ConfigurationKeys.AzureAppService.OperatingSystemKey, "windows" },
209-
{ ConfigurationKeys.AzureAppService.InstanceIdKey, "InstanceId" },
210-
{ ConfigurationKeys.AzureAppService.InstanceNameKey, "InstanceName" },
205+
{ PlatformKeys.AzureAppService.WebsiteOwnerNameKey, $"SubscriptionId+ResourceGroup-EastUSwebspace" },
206+
{ PlatformKeys.AzureAppService.ResourceGroupKey, "SiteResourceGroup" },
207+
{ PlatformKeys.AzureAppService.SiteNameKey, "SiteName" },
208+
{ PlatformKeys.AzureAppService.OperatingSystemKey, "windows" },
209+
{ PlatformKeys.AzureAppService.InstanceIdKey, "InstanceId" },
210+
{ PlatformKeys.AzureAppService.InstanceNameKey, "InstanceName" },
211211
};
212212

213213
return new NameValueConfigurationSource(collection);

‎tracer/test/Datadog.Trace.TestHelpers/PlatformHelpers/AzureAppServiceHelper.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public static IConfigurationSource GetRequiredAasConfigurationValues(
5050
{
5151
var vars = Environment.GetEnvironmentVariables();
5252

53-
if (vars.Contains(ConfigurationKeys.AzureAppService.InstanceNameKey))
53+
if (vars.Contains(PlatformKeys.AzureAppService.InstanceNameKey))
5454
{
5555
// This is the COMPUTERNAME key which we'll remove for consistent testing
56-
vars.Remove(ConfigurationKeys.AzureAppService.InstanceNameKey);
56+
vars.Remove(PlatformKeys.AzureAppService.InstanceNameKey);
5757
}
5858

5959
if (vars.Contains(ConfigurationKeys.DebugEnabled))
@@ -73,22 +73,22 @@ public static IConfigurationSource GetRequiredAasConfigurationValues(
7373
vars.Add(ConfigurationKeys.AzureAppService.SiteExtensionVersionKey, "3.0.0");
7474
}
7575

76-
vars.Add(ConfigurationKeys.AzureAppService.WebsiteOwnerNameKey, $"{subscriptionId}+{planResourceGroup}-EastUSwebspace");
77-
vars.Add(ConfigurationKeys.AzureAppService.ResourceGroupKey, siteResourceGroup);
78-
vars.Add(ConfigurationKeys.AzureAppService.SiteNameKey, deploymentId);
79-
vars.Add(ConfigurationKeys.AzureAppService.OperatingSystemKey, RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "windows" : "linux");
80-
vars.Add(ConfigurationKeys.AzureAppService.InstanceIdKey, "instance_id");
81-
vars.Add(ConfigurationKeys.AzureAppService.InstanceNameKey, "instance_name");
76+
vars.Add(PlatformKeys.AzureAppService.WebsiteOwnerNameKey, $"{subscriptionId}+{planResourceGroup}-EastUSwebspace");
77+
vars.Add(PlatformKeys.AzureAppService.ResourceGroupKey, siteResourceGroup);
78+
vars.Add(PlatformKeys.AzureAppService.SiteNameKey, deploymentId);
79+
vars.Add(PlatformKeys.AzureAppService.OperatingSystemKey, RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "windows" : "linux");
80+
vars.Add(PlatformKeys.AzureAppService.InstanceIdKey, "instance_id");
81+
vars.Add(PlatformKeys.AzureAppService.InstanceNameKey, "instance_name");
8282
vars.Add(ConfigurationKeys.DebugEnabled, ddTraceDebug);
8383

8484
if (functionsVersion != null)
8585
{
86-
vars.Add(ConfigurationKeys.AzureFunctions.FunctionsExtensionVersion, functionsVersion);
86+
vars.Add(PlatformKeys.AzureFunctions.FunctionsExtensionVersion, functionsVersion);
8787
}
8888

8989
if (functionsRuntime != null)
9090
{
91-
vars.Add(ConfigurationKeys.AzureFunctions.FunctionsWorkerRuntime, functionsRuntime);
91+
vars.Add(PlatformKeys.AzureFunctions.FunctionsWorkerRuntime, functionsRuntime);
9292
}
9393

9494
vars.Add(ConfigurationKeys.AzureAppService.AasEnableCustomTracing, enableCustomTracing ?? "false");

‎tracer/test/Datadog.Trace.Tests/Configuration/ImmutableAzureAppServiceSettingsTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void IsUnsafeToTrace(string value, bool expected)
3636
[InlineData("test1+test2", "test1")]
3737
public void SubscriptionId(string value, string expected)
3838
{
39-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.WebsiteOwnerNameKey, value));
39+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.WebsiteOwnerNameKey, value));
4040
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
4141

4242
settings.SubscriptionId.Should().Be(expected);
@@ -46,7 +46,7 @@ public void SubscriptionId(string value, string expected)
4646
[MemberData(nameof(StringTestCases))]
4747
public void ResourceGroup(string value, string expected)
4848
{
49-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.ResourceGroupKey, value));
49+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.ResourceGroupKey, value));
5050
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
5151

5252
settings.ResourceGroup.Should().Be(expected);
@@ -56,7 +56,7 @@ public void ResourceGroup(string value, string expected)
5656
[MemberData(nameof(StringTestCases))]
5757
public void SiteName(string value, string expected)
5858
{
59-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.SiteNameKey, value));
59+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.SiteNameKey, value));
6060
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
6161

6262
settings.SiteName.Should().Be(expected);
@@ -72,9 +72,9 @@ public void SiteName(string value, string expected)
7272
public void ResourceId(string subscriptionId, string siteName, string resourceGroup, string expected)
7373
{
7474
var source = CreateConfigurationSource(
75-
(ConfigurationKeys.AzureAppService.SiteNameKey, siteName),
76-
(ConfigurationKeys.AzureAppService.ResourceGroupKey, resourceGroup),
77-
(ConfigurationKeys.AzureAppService.WebsiteOwnerNameKey, subscriptionId));
75+
(PlatformKeys.AzureAppService.SiteNameKey, siteName),
76+
(PlatformKeys.AzureAppService.ResourceGroupKey, resourceGroup),
77+
(PlatformKeys.AzureAppService.WebsiteOwnerNameKey, subscriptionId));
7878

7979
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
8080

@@ -85,7 +85,7 @@ public void ResourceId(string subscriptionId, string siteName, string resourceGr
8585
[MemberData(nameof(StringTestCases), "unknown", Strings.AllowEmpty)]
8686
public void InstanceId(string value, string expected)
8787
{
88-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.InstanceIdKey, value));
88+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.InstanceIdKey, value));
8989
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
9090

9191
settings.InstanceId.Should().Be(expected);
@@ -95,7 +95,7 @@ public void InstanceId(string value, string expected)
9595
[MemberData(nameof(StringTestCases), "unknown", Strings.AllowEmpty)]
9696
public void InstanceName(string value, string expected)
9797
{
98-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.InstanceNameKey, value));
98+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.InstanceNameKey, value));
9999
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
100100

101101
settings.InstanceName.Should().Be(expected);
@@ -105,7 +105,7 @@ public void InstanceName(string value, string expected)
105105
[MemberData(nameof(StringTestCases), "unknown", Strings.AllowEmpty)]
106106
public void OperatingSystem(string value, string expected)
107107
{
108-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.OperatingSystemKey, value));
108+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.OperatingSystemKey, value));
109109
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
110110

111111
settings.OperatingSystem.Should().Be(expected);
@@ -125,7 +125,7 @@ public void SiteExtensionVersion(string value, string expected)
125125
[MemberData(nameof(StringTestCases))]
126126
public void FunctionsWorkerRuntime(string value, string expected)
127127
{
128-
var source = CreateConfigurationSource((ConfigurationKeys.AzureFunctions.FunctionsWorkerRuntime, value));
128+
var source = CreateConfigurationSource((PlatformKeys.AzureFunctions.FunctionsWorkerRuntime, value));
129129
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
130130

131131
settings.FunctionsWorkerRuntime.Should().Be(expected);
@@ -135,7 +135,7 @@ public void FunctionsWorkerRuntime(string value, string expected)
135135
[MemberData(nameof(StringTestCases))]
136136
public void FunctionsExtensionVersion(string value, string expected)
137137
{
138-
var source = CreateConfigurationSource((ConfigurationKeys.AzureFunctions.FunctionsExtensionVersion, value));
138+
var source = CreateConfigurationSource((PlatformKeys.AzureFunctions.FunctionsExtensionVersion, value));
139139
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
140140

141141
settings.FunctionsExtensionVersion.Should().Be(expected);
@@ -150,8 +150,8 @@ public void FunctionsExtensionVersion(string value, string expected)
150150
public void IsFunctionsApp(string functionsWorkerRuntime, string functionsExtensionVersion, bool expected)
151151
{
152152
var source = CreateConfigurationSource(
153-
(ConfigurationKeys.AzureFunctions.FunctionsWorkerRuntime, functionsWorkerRuntime),
154-
(ConfigurationKeys.AzureFunctions.FunctionsExtensionVersion, functionsExtensionVersion));
153+
(PlatformKeys.AzureFunctions.FunctionsWorkerRuntime, functionsWorkerRuntime),
154+
(PlatformKeys.AzureFunctions.FunctionsExtensionVersion, functionsExtensionVersion));
155155
var settings = new ImmutableAzureAppServiceSettings(source, NullConfigurationTelemetry.Instance);
156156

157157
settings.IsFunctionsApp.Should().Be(expected);

‎tracer/test/Datadog.Trace.Tests/Configuration/ImmutableGCPFunctionSettingsTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class ImmutableGCPFunctionSettingsTests : SettingsTestsBase
1919
public void GetIsGCPFunctionTrueWhenDeprecatedFunctionsEnvVarsExist()
2020
{
2121
var source = CreateConfigurationSource(
22-
(ConfigurationKeys.GCPFunction.DeprecatedFunctionNameKey, "value"),
23-
(ConfigurationKeys.GCPFunction.DeprecatedProjectKey, "value"));
22+
(PlatformKeys.GcpFunction.DeprecatedFunctionNameKey, "value"),
23+
(PlatformKeys.GcpFunction.DeprecatedProjectKey, "value"));
2424

2525
var settings = new ImmutableGCPFunctionSettings(source, NullConfigurationTelemetry.Instance);
2626
settings.IsDeprecatedFunction.Should().BeTrue();
@@ -32,8 +32,8 @@ public void GetIsGCPFunctionTrueWhenDeprecatedFunctionsEnvVarsExist()
3232
public void GetIsGCPFunctionTrueWhenNonDeprecatedFunctionsEnvVarsExist()
3333
{
3434
var source = CreateConfigurationSource(
35-
(ConfigurationKeys.GCPFunction.FunctionNameKey, "value"),
36-
(ConfigurationKeys.GCPFunction.FunctionTargetKey, "value"));
35+
(PlatformKeys.GcpFunction.FunctionNameKey, "value"),
36+
(PlatformKeys.GcpFunction.FunctionTargetKey, "value"));
3737

3838
var settings = new ImmutableGCPFunctionSettings(source, NullConfigurationTelemetry.Instance);
3939
settings.IsNewerFunction.Should().BeTrue();

‎tracer/test/Datadog.Trace.Tests/Configuration/IntegrationSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void SettingsRespectsOverride(bool initiallyEnabled)
9090
var name = nameof(IntegrationId.Kafka);
9191
var source = new NameValueConfigurationSource(new()
9292
{
93-
{ string.Format(ConfigurationKeys.Integrations.Enabled, name), initiallyEnabled.ToString() },
93+
{ string.Format(IntegrationSettings.IntegrationEnabled, name), initiallyEnabled.ToString() },
9494
});
9595

9696
var settings = new IntegrationSettings(name, source: source, isExplicitlyDisabled: true);
@@ -105,7 +105,7 @@ public void SettingsRespectsOriginalIfNotOverridden(bool initiallyEnabled)
105105
var name = nameof(IntegrationId.Kafka);
106106
var source = new NameValueConfigurationSource(new()
107107
{
108-
{ string.Format(ConfigurationKeys.Integrations.Enabled, name), initiallyEnabled.ToString() },
108+
{ string.Format(IntegrationSettings.IntegrationEnabled, name), initiallyEnabled.ToString() },
109109
});
110110

111111
var settings = new IntegrationSettings(name, source: source, isExplicitlyDisabled: false);

‎tracer/test/Datadog.Trace.Tests/Configuration/MutableSettingsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ public void KafkaCreateConsumerScopeEnabled(string value, bool expected)
522522
[Fact]
523523
public void DisableTracerIfNoApiKeyInAas()
524524
{
525-
var source = CreateConfigurationSource((ConfigurationKeys.AzureAppService.SiteNameKey, "site-name"));
525+
var source = CreateConfigurationSource((PlatformKeys.AzureAppService.SiteNameKey, "site-name"));
526526
var settings = new TracerSettings(source);
527527
var mutable = GetMutableSettings(source, settings);
528528

0 commit comments

Comments
 (0)