diff --git a/CHANGELOG.md b/CHANGELOG.md index 372eff54..8351f6f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ### BREAKING CHANGES +* Removes AWS and Azure resource detectors. + ([#114](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/114)) * Drops supports for .NET 7. EOL was May 24 2024 ([#116](https://github.com/grafana/grafana-opentelemetry-dotnet/pull/116)) * Separates resource detectors and instrumentations. Removes resource detector diff --git a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj index fa4fc688..a6881aff 100644 --- a/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj +++ b/src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj @@ -43,13 +43,10 @@ - - - diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEBSDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEBSDetectorInitializer.cs index bebf8bfb..ee368208 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEBSDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEBSDetectorInitializer.cs @@ -14,7 +14,12 @@ internal class AWSEBSDetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAWSEBSDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.AWS", + "OpenTelemetry.Resources.AWSResourceBuilderExtensions", + "AddAWSEBSDetector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEC2DetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEC2DetectorInitializer.cs index 2020e65d..a1ef0d26 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEC2DetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEC2DetectorInitializer.cs @@ -14,7 +14,12 @@ internal class AWSEC2DetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAWSEC2Detector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.AWS", + "OpenTelemetry.Resources.AWSResourceBuilderExtensions", + "AddAWSEC2Detector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSECSDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSECSDetectorInitializer.cs index 99e08fa9..7416c875 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSECSDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSECSDetectorInitializer.cs @@ -14,7 +14,12 @@ internal class AWSECSDetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAWSECSDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.AWS", + "OpenTelemetry.Resources.AWSResourceBuilderExtensions", + "AddAWSECSDetector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEKSDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEKSDetectorInitializer.cs index 7842653c..1654894c 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEKSDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AWSEKSDetectorInitializer.cs @@ -14,7 +14,12 @@ internal class AWSEKSDetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAWSEKSDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.AWS", + "OpenTelemetry.Resources.AWSResourceBuilderExtensions", + "AddAWSEKSDetector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureAppServiceDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureAppServiceDetectorInitializer.cs index 71804e95..aaff5f45 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureAppServiceDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureAppServiceDetectorInitializer.cs @@ -13,7 +13,12 @@ internal class AzureAppServiceDetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAzureAppServiceDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.Azure", + "OpenTelemetry.Resources.AzureResourceBuilderExtensions", + "AddAzureAppServiceDetector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureContainerAppsDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureContainerAppsDetectorInitializer.cs index c3664719..e401007d 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureContainerAppsDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureContainerAppsDetectorInitializer.cs @@ -13,7 +13,12 @@ internal class AzureContainerAppsDetectorInitializer : ResourceDetectorInitializ protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAzureContainerAppsDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.Azure", + "OpenTelemetry.Resources.AzureResourceBuilderExtensions", + "AddAzureContainerAppsDetector", + new object[] { builder }); + return builder; } } } diff --git a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureVMDetectorInitializer.cs b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureVMDetectorInitializer.cs index 424044d6..4b03c753 100644 --- a/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureVMDetectorInitializer.cs +++ b/src/Grafana.OpenTelemetry.Base/ResourceDetectors/AzureVMDetectorInitializer.cs @@ -13,7 +13,12 @@ internal class AzureVMDetectorInitializer : ResourceDetectorInitializer protected override ResourceBuilder InitializeResourceDetector(ResourceBuilder builder) { - return builder.AddAzureVMDetector(); + ReflectionHelper.CallStaticMethod( + "OpenTelemetry.Resources.Azure", + "OpenTelemetry.Resources.AzureResourceBuilderExtensions", + "AddAzureVMDetector", + new object[] { builder }); + return builder; } } }