Merge branch 'main' into skip-admin-tests

Author: martincostello

.cspell/dot-net.txt

@@ -41,4 +41,5 @@ stdlibc
 struct
 TRACEFILE
 typeof
+WCFCORE
 Xunit

.github/workflows/format-native.yml

@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag: v6.0.1
 
       - name: Setup Go
-        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # tag: v6.1.0
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # tag: v6.2.0
         with:
           go-version: '1.23.5'
           cache: false # Suppress a warning given that there are no go.sum files in the repo

CHANGELOG.md

@@ -17,6 +17,9 @@ This component adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.h
 - Support for file-based configuration of the IL rewrite for
   SqlClient instrumentation setting
 - Add support for `StackExchange.Redis` for applications targeting .NET Framework.
+- Automatically set the `service.instance.id` resource attribute if not provided.
+- Support for [CoreWCF.Primitives](https://www.nuget.org/packages/CoreWCF.Primitives/)
+  traces instrumentation for versions `1.8.0`+.
 
 ### Changed
 

OpenTelemetry.AutoInstrumentation.sln

@@ -256,6 +256,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.NoCode", "t
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework", "src\OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework\OpenTelemetry.AutoInstrumentation.Assemblies.NetFramework.csproj", "{B69564D4-7D5B-7147-6CBA-233BB8A33C50}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication.Wcf.Core", "test\test-applications\integrations\TestApplication.Wcf.Core\TestApplication.Wcf.Core.csproj", "{0F864722-CE44-4D99-9B67-CF0ED1893FF1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1620,6 +1622,22 @@ Global
 		{B69564D4-7D5B-7147-6CBA-233BB8A33C50}.Release|x64.Build.0 = Release|Any CPU
 		{B69564D4-7D5B-7147-6CBA-233BB8A33C50}.Release|x86.ActiveCfg = Release|Any CPU
 		{B69564D4-7D5B-7147-6CBA-233BB8A33C50}.Release|x86.Build.0 = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|Any CPU.Build.0 = Debug|x64
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|Any CPU.ActiveCfg = Release|x64
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|Any CPU.Build.0 = Release|x64
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|ARM64.Build.0 = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|x64.Build.0 = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1715,6 +1733,7 @@ Global
 		{665280EB-F428-4C04-A293-33228C73BF8A} = {E409ADD3-9574-465C-AB09-4324D205CC7C}
 		{500BF40F-EECB-4F6A-377B-EDBDFFDE09BE} = {E409ADD3-9574-465C-AB09-4324D205CC7C}
 		{B69564D4-7D5B-7147-6CBA-233BB8A33C50} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
+		{0F864722-CE44-4D99-9B67-CF0ED1893FF1} = {E409ADD3-9574-465C-AB09-4324D205CC7C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}

build/LibraryVersions.g.cs

@@ -190,5 +190,11 @@ public static partial class LibraryVersion
                 new("2.12.0"),
             ]
         },
+        {
+            "TestApplication.Wcf.Core",
+            [
+                new("1.8.0", supportedFrameworks: [ "net10.0", "net9.0", "net8.0" ]),
+            ]
+        },
     };
 }

docker/debian-arm64.dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:51060ced0e5dc1282a587a092783132ba8b0ec25150d3bc61e99bf0ef2d62593
+FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:ddc0e6d46a459d1c740dd9e3d2668bc50f24d420274fb751e39cbf75154b9485
 # There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via dotnet-install
 
 RUN apt-get update && \

docker/debian.dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:51060ced0e5dc1282a587a092783132ba8b0ec25150d3bc61e99bf0ef2d62593
+FROM mcr.microsoft.com/dotnet/sdk:9.0.308-bookworm-slim@sha256:ddc0e6d46a459d1c740dd9e3d2668bc50f24d420274fb751e39cbf75154b9485
 # There is no official base image for .NET SDK 10+ on Debian, so install .NET10 via apt-get
 
 RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \

docs/config.md

@@ -152,6 +152,7 @@ due to lack of stable semantic convention.
 | `SQLCLIENT`           | [Microsoft.Data.SqlClient](https://www.nuget.org/packages/Microsoft.Data.SqlClient), [System.Data.SqlClient](https://www.nuget.org/packages/System.Data.SqlClient) \[7\]  and `System.Data` (shipped with .NET Framework) | * \[8\]                | source                   | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
 | `STACKEXCHANGEREDIS`  | [StackExchange.Redis](https://www.nuget.org/packages/StackExchange.Redis)                                                                                                                                                 | ≥2.6.122 & < 3.0.0     | source & bytecode        | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
 | `WCFCLIENT`           | WCF                                                                                                                                                                                                                       | *                      | source & bytecode        | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
+| `WCFCORE`             | [CoreWCF.Primitives](https://www.nuget.org/packages/CoreWCF.Primitives) **Not supported on .NET Framework**                                                                                                               | ≥1.8.0                 | source                   | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
 | `WCFSERVICE`          | WCF **Not supported on .NET**.                                                                                                                                                                                            | *                      | source & bytecode        | [Experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/versioning-and-stability.md) |
 
 \[1\]: Only integrated pipeline mode is supported.

docs/file-based-configuration.md

@@ -513,6 +513,7 @@ instrumentation/development:
       sqlclient:           # Microsoft.Data.SqlClient & System.Data.SqlClient
       stackexchangeredis:  # StackExchange.Redis
       wcfclient:           # WCF Client
+      wcfcore:             # CoreWCF.Primitives
       wcfservice:          # WCF Service
     metrics:
       aspnet:              # ASP.NET metrics

src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs

@@ -52,6 +52,7 @@ public static TracerProviderBuilder UseEnvironmentVariables(
                 TracerInstrumentation.MySqlData => builder.AddSource("connector-net"),
                 TracerInstrumentation.EntityFrameworkCore => Wrappers.AddEntityFrameworkCoreInstrumentation(builder, pluginManager, lazyInstrumentationLoader, settings),
                 TracerInstrumentation.GraphQL => Wrappers.AddGraphQLInstrumentation(builder, pluginManager, lazyInstrumentationLoader, settings),
+                TracerInstrumentation.WcfCore => builder.AddSource("CoreWCF.Primitives"),
 #endif
                 _ => null
             };