diff --git a/content/en/docs/languages/net/automatic/_index.md b/content/en/docs/languages/net/automatic/_index.md index c4391f2a6842..a4aad11c69f9 100644 --- a/content/en/docs/languages/net/automatic/_index.md +++ b/content/en/docs/languages/net/automatic/_index.md @@ -23,18 +23,27 @@ The minimal supported version of [.NET Framework](https://dotnet.microsoft.com/download/dotnet-framework) is `4.6.2`. -CI tests run against the following operating systems: +Supported processor architectures are: + +- x86 +- AMD64 (x86-64) +- ARM64 ([Experimental](/docs/specs/otel/versioning-and-stability)) -- [Alpine](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/alpine.dockerfile) -- [CentOS 7](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-build.dockerfile) -- [macOS Big Sur 11](https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md) -- [Microsoft Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md) -- [Ubuntu 20.04 LTS](https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md) +{{% alert title="Note" color="info" %}} ARM64 build does not support CentOS +based images. {{% /alert %}} + +CI tests run against the following operating systems: -{{% alert title="Note" color="warning" %}} ARM architectures are not supported. -See -[#2181](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/issues/2181) -for more information. {{% /alert %}} +- [Alpine x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/alpine.dockerfile) +- [Alpine ARM64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/alpine.dockerfile) +- [Debian x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/debian.dockerfile) +- [Debian ARM64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/debian-arm64.dockerfile) +- [CentOS 7 x64](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/blob/main/docker/centos-build.dockerfile) + (.NET 8 is not supported) +- [macOS Big Sur 11 x64](https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md) +- [Microsoft Windows Server 2022 x64](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md) +- [Ubuntu 20.04 LTS x64](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2004-Readme.md) +- Ubuntu 22.04 LTS ARM64 ## Setup diff --git a/content/en/docs/languages/net/automatic/custom.md b/content/en/docs/languages/net/automatic/custom.md index 1ebb07940d7f..3771de4fcefe 100644 --- a/content/en/docs/languages/net/automatic/custom.md +++ b/content/en/docs/languages/net/automatic/custom.md @@ -18,7 +18,7 @@ To create your custom traces manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create an `ActivitySource` instance: @@ -54,7 +54,7 @@ To create your custom metrics manually, follow these steps: 1. Add the `System.Diagnostics.DiagnosticSource` dependency to your project: ```xml - + ``` 2. Create a `Meter` instance: diff --git a/content/en/docs/languages/net/automatic/nuget-packages.md b/content/en/docs/languages/net/automatic/nuget-packages.md index be7bbbe89f4c..f909d2e310e4 100644 --- a/content/en/docs/languages/net/automatic/nuget-packages.md +++ b/content/en/docs/languages/net/automatic/nuget-packages.md @@ -46,7 +46,7 @@ you to either add the missing instrumentation package or to skip the instrumentation of the corresponding package: ```terminal -~packages/opentelemetry.autoinstrumentation.buildtasks/1.4.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.3.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error. +~packages/opentelemetry.autoinstrumentation.buildtasks/1.5.0/build/OpenTelemetry.AutoInstrumentation.BuildTasks.targets(29,5): error : OpenTelemetry.AutoInstrumentation: add a reference to the instrumentation package 'MongoDB.Driver.Core.Extensions.DiagnosticSources' version 1.4.0 or add 'MongoDB.Driver.Core' to the property 'SkippedInstrumentations' to suppress this error. ``` To resolve the error either add the recommended instrumentation package or skip diff --git a/content/en/docs/languages/net/automatic/troubleshooting.md b/content/en/docs/languages/net/automatic/troubleshooting.md index 3ae24533f7ad..9ce563159ab0 100644 --- a/content/en/docs/languages/net/automatic/troubleshooting.md +++ b/content/en/docs/languages/net/automatic/troubleshooting.md @@ -59,7 +59,7 @@ When adding the NuGet packages to your project you get an error message similar to: ```txt -Could not install package 'OpenTelemetry.AutoInstrumentation.Runtime.Native 1.0.0-rc.1'. You are trying to install this package into a project that targets '.NETFramework,Version=v4.7.2', but the package does not contain any assembly references or content files that are compatible with that framework. For more information, contact the package author. +Could not install package 'OpenTelemetry.AutoInstrumentation.Runtime.Native 1.5.0'. You are trying to install this package into a project that targets '.NETFramework,Version=v4.7.2', but the package does not contain any assembly references or content files that are compatible with that framework. For more information, contact the package author. ``` The NuGet packages don't support old-style `csproj` projects. Either deploy the