Skip to content

Commit f846681

Browse files
authored
Remove warnings around AWS resource detectors (#92)
1 parent c7b0c6e commit f846681

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.3" />
4545
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.6.0-beta.3" />
4646

47-
<PackageReference Include="OpenTelemetry.ResourceDetectors.AWS" Version="1.4.0-beta.1" />
4847
<PackageReference Include="OpenTelemetry.ResourceDetectors.Azure" Version="1.0.0-beta.4" />
4948
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.5" />
5049
</ItemGroup>
5150

5251
<!-- Non-stable instrumentation packages with no dependencies, non netstandard2.0 -->
5352
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
53+
<PackageReference Include="OpenTelemetry.ResourceDetectors.AWS" Version="1.4.0-beta.1" />
5454
<PackageReference Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.2" />
5555
<PackageReference Include="OpenTelemetry.ResourceDetectors.Process" Version="0.1.0-alpha.2" />
5656
<PackageReference Include="OpenTelemetry.ResourceDetectors.ProcessRuntime" Version="0.1.0-alpha.2" />

src/Grafana.OpenTelemetry.Base/Instrumentations/AWSResource.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6+
#if !NETSTANDARD
67
using OpenTelemetry.ResourceDetectors.AWS;
78
using OpenTelemetry.Resources;
89

@@ -15,7 +16,7 @@ internal class AWSResourceInitializer : InstrumentationInitializer
1516
protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder)
1617
{
1718
return builder
18-
#if !NETFRAMEWORK && !NETSTANDARD
19+
#if !NETFRAMEWORK
1920
.AddDetector(new AWSECSResourceDetector())
2021
.AddDetector(new AWSEKSResourceDetector())
2122
#endif
@@ -24,3 +25,4 @@ protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder bu
2425
}
2526
}
2627
}
28+
#endif

src/Grafana.OpenTelemetry.Base/Instrumentations/InstrumentationInitializer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ internal abstract class InstrumentationInitializer
3535
new SqlClientInitializer(),
3636
new StackExchangeRedisInitializer(),
3737
new WcfInitializer(),
38-
new AWSResourceInitializer(),
3938
new AzureResourceInitializer(),
4039
new ContainerResourceInitializer(),
4140
#if !NETSTANDARD
41+
new AWSResourceInitializer(),
4242
new HostResourceInitializer(),
4343
new ProcessResourceInitializer(),
4444
new ProcessRuntimeResourceInitializer()

0 commit comments

Comments
 (0)