Merge branch 'master' into nacho/IISASMretry

Author: NachoEchevarria

.azure-pipelines/ultimate-pipeline.yml

@@ -33,6 +33,7 @@ pr:
       - docs/
       - tracer/README.MD
       - tracer/samples/
+      - tracer/tools/Build-AzureFunctionsNuget.ps1
       - AGENTS.md
       - LICENSE
       - NOTICE

.github/CODEOWNERS

@@ -109,6 +109,7 @@
 /tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/HttpBypassTests.cs         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
 /tracer/samples/AzureFunctionsWithAgentLessLogging/                             @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
 /docs/development/**/AzureFunctions*.md                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp
+/tracer/tools/Build-AzureFunctionsNuget.ps1                                     @DataDog/apm-serverless
 
 ## Serverless (GCP)
 /tracer/src/**/*GCP*.cs                                                         @DataDog/tracing-dotnet @DataDog/apm-serverless @DataDog/serverless-azure-and-gcp

.github/labeller.yml

@@ -47,6 +47,9 @@ labels:
   - name: "area:builds"
     title: "^\\[?(?i)build"
 
+  - name: "area:builds"
+    title: "^\\[?(?i)(version bump)"
+
   - name: "area:ssi"
     title: "^\\[?(?i)(fleet installer)"
 

.gitlab-ci.yml

@@ -248,10 +248,11 @@ dsm_throughput:
     - when: manual
 
 
-validate_supported_configurations_local_file:
+validate_supported_configurations_v2_local_file:
   stage: build
   rules:
     - when: on_success
-  extends: .validate_supported_configurations_local_file
+  extends: .validate_supported_configurations_v2_local_file
   variables:
     LOCAL_JSON_PATH: "tracer/src/Datadog.Trace/Configuration/supported-configurations.json"
+    BACKFILLED: true

.gitlab/benchmarks/macrobenchmarks.yml

@@ -743,6 +743,12 @@ check-slo-breaches:
     DDOCTOSTS_POLICY: "gitlab.github-access.read-contents"
     ARTIFACTS_DIR: "reports"
     SLO_FILE: ".gitlab/benchmarks/bp-runner.fail-on-breach.yml"
+  artifacts:
+    name: "artifacts"
+    when: always
+    paths:
+      - reports/
+    expire_in: 3 months
 
 notify-slo-breaches:
   extends: .notify-slo-breaches

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE MANUALLY 
+# DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/75745fafbee537a84b24d8d5fe735299438cbe46d6949d686cd73818296c5f44/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/f14ac28614630d12bcfe6cba4fd8d72dce142c62ff0b053ba7c323622104ebd7/one-pipeline.yml

AGENTS.md

@@ -396,6 +396,15 @@ The tracer runs in-process with customer applications and must have minimal perf
 - `docs/development/CI/TroubleshootingCIFailures.md` — Investigating build/test failures in Azure DevOps
 - `docs/development/CI/RunSmokeTestsLocally.md` — Running smoke tests locally
 
+## Configuration
+
+📖 **Load when**: Need reference for tracer configuration settings and environment variables
+- **`tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml`** — Human-readable descriptions and default values for all `DD_*` environment variables
+- **`tracer/src/Datadog.Trace/Configuration/supported-configurations.json`** — Machine-readable config metadata: product categorization, key aliases, and deprecations (consumed by source generators)
+
+📖 **Load when**: Adding a new `DD_*` configuration key or modifying the configuration system
+- **`docs/development/Configuration/AddingConfigurationKeys.md`** — Step-by-step guide for adding config keys: JSON/YAML definitions, source generators, aliases, telemetry normalization, and related analyzers
+
 ## Security & Configuration
 
 - Do not commit secrets; prefer env vars (`DD_*`). `.env` should not contain credentials.

docs/development/Configuration/AddingConfigurationKeys.md

@@ -22,9 +22,9 @@ This guide explains how to add new configuration keys to the .NET Tracer. Config
 
 Configuration keys in the .NET Tracer are defined in two source files:
 
-- **`tracer/src/Datadog.Trace/Configuration/supported-configurations.json`** - Defines the configuration keys, their 
+- **`tracer/src/Datadog.Trace/Configuration/supported-configurations.json`** - Defines the configuration keys, their
   environment variable names, and optional fallbacks.
-- **`tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml`** - Contains XML documentation for 
+- **`tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml`** - Contains XML documentation for
   each key. We're using yaml here as it makes it easier for some of the long documentation summaries and formatting.
 
 Two source generators read these files at build time:
@@ -40,22 +40,39 @@ Two source generators read these files at build time:
 
 ### 1. Add the Configuration Key Definition
 
-Add your new configuration key to `tracer/src/Datadog.Trace/Configuration/supported-configurations.json`, specifying 
-an arbitrary version string (e.g. `"A"`, as shown below). and specifying the product if required. Any product name 
-is allowed, but try to reuse the existing ones (see [Common products](#common-products)) if it makes sense, as they will create another partial class, ie 
+Add your new configuration key to `tracer/src/Datadog.Trace/Configuration/supported-configurations.json`, specifying
+an implementation string (`"A"` being the default one, as shown below) and specifying the product if required. Any product name
+is allowed, but try to reuse the existing ones (see [Common products](#common-products)) if it makes sense, as they will create another partial class, ie
 ConfigurationKeys.ProductName.cs. Without a product name, the keys will go in the main class, ConfigurationKeys.cs.
 
+**Required fields (mandatory):**
+- `implementation`: The implementation identifier
+  - `"A"` being the default one, it needs to match the registry implementation with the same type and default values
+- `type`: The type of the configuration value (for example `string`, `boolean`, `int`, `decimal`)
+- `default`: The default value applied by the tracer when the env var is not set. Use `null` if there is no default.
+
+These fields are mandatory to keep the configuration registry complete and to ensure consistent behavior and documentation across products.
+
 **Example:**
 ```json
 {
+  "version": "2",
   "supportedConfigurations": {
-    "DD_TRACE_SAMPLE_RATE": {
-      "version": ["A"]
-    },
-    "OTEL_EXPORTER_OTLP_TIMEOUT": {
-      "version": ["A"],
-      "product": "OpenTelemetry"
-    }
+    "DD_TRACE_SAMPLE_RATE": [
+      {
+        "implementation": "A",
+        "type": "decimal",
+        "default": null
+      }
+    ],
+    "OTEL_EXPORTER_OTLP_TIMEOUT": [
+      {
+        "implementation": "A",
+        "type": "int",
+        "default": null,
+        "product": "OpenTelemetry"
+      }
+    ]
   }
 }
 ```
@@ -84,13 +101,22 @@ OTEL_EXPORTER_OTLP_LOGS_TIMEOUT: |
 
 ### 3. (Optional) Add Aliases
 
-Configuration keys can have **aliases** that are checked in order of appearance when the primary key is not found. Add them to the `aliases` section in `supported-configurations.json`:
+Configuration keys can have **aliases** that are checked in order of appearance when the primary key is not found. Add them to the `aliases` property of the configuration entry in `supported-configurations.json`:
 
 ```json
 {
-  "aliases": {
+  "version": "2",
+  "supportedConfigurations": {
     "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT": [
-      "OTEL_EXPORTER_OTLP_TIMEOUT"
+      {
+        "implementation": "A",
+        "type": "int",
+        "default": null,
+        "product": "OpenTelemetry",
+        "aliases": [
+          "OTEL_EXPORTER_OTLP_TIMEOUT"
+        ]
+      }
     ]
   }
 }
@@ -384,7 +410,7 @@ dotnet build tracer/src/Datadog.Trace/Datadog.Trace.csproj
 
 ## Related Files
 
-- **Source generators:** 
+- **Source generators:**
   - `tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs` - Generates configuration key constants
   - `tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigKeyAliasesSwitcherGenerator.cs` - Generates alias resolution logic
 - **Configuration source:** `tracer/src/Datadog.Trace/Configuration/supported-configurations.json`

profiler/src/ProfilerEngine/Datadog.Profiler.Native/FrameworkThreadInfo.cpp

@@ -28,13 +28,11 @@ HANDLE FrameworkThreadInfo::GetOsThreadHandle() const
 std::string FrameworkThreadInfo::GetProfileThreadId()
 {
     std::stringstream buffer;
-    buffer << "<0> [#" << _osThreadId << "]";
+    buffer << _osThreadId;
     return buffer.str();
 }
 
 std::string FrameworkThreadInfo::GetProfileThreadName()
 {
-    std::stringstream buffer;
-    buffer << "Managed thread (name unknown) [#" << _osThreadId << "]";
-    return buffer.str();
+    return std::string("");
 }

profiler/src/ProfilerEngine/Datadog.Profiler.Native/ManagedCodeCache.h

@@ -27,7 +27,7 @@
 // Represents a single contiguous code range
 struct CodeRange {
     UINT_PTR startAddress;
-    UINT_PTR endAddress;  // Exclusive
+    UINT_PTR endAddress;  // Inclusive
     FunctionID functionId;
 
     // For binary search
@@ -37,14 +37,14 @@ struct CodeRange {
 
     // Check if IP is within this range
     bool contains(UINT_PTR ip) const {
-        return ip >= startAddress && ip < endAddress;
+        return ip >= startAddress && ip <= endAddress;
     }
 };
 
 
 struct ModuleCodeRange {
     UINT_PTR startAddress;
-    UINT_PTR endAddress;
+    UINT_PTR endAddress; // Inclusive
     bool isRemoved = false;
     // For binary search
     bool operator<(const ModuleCodeRange& other) const {
@@ -53,7 +53,7 @@ struct ModuleCodeRange {
 
     // Check if IP is within this range
     bool contains(std::uintptr_t ip) const {
-        return ip >= startAddress && ip < endAddress;
+        return ip >= startAddress && ip <= endAddress;
     }
 };