Merge branch 'main' into feature/product_config

# Conflicts:
#	config/versions.yml
#	src/Elastic.Markdown/HtmlWriter.cs

Author: cotti

.github/actions/bootstrap/action.yml

@@ -24,7 +24,7 @@ runs:
       run: |
         git config --global init.defaultBranch main
 
-    - uses: actions/setup-dotnet@v4
+    - uses: actions/setup-dotnet@v5
       with:
         global-json-file: global.json
 

Directory.Packages.props

@@ -60,7 +60,7 @@
     <PackageVersion Include="Sep" Version="0.11.0" />
     <PackageVersion Include="Slugify.Core" Version="4.0.1" />
     <PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
-    <PackageVersion Include="System.IO.Abstractions" Version="22.0.15" />
+    <PackageVersion Include="System.IO.Abstractions" Version="22.0.16" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
     <PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
     <PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
@@ -87,7 +87,7 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
     <PackageVersion Include="Unquote" Version="7.0.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>

config/navigation.yml

@@ -333,7 +333,23 @@ toc:
       # https://github.com/elastic/opentelemetry/blob/main/docs/reference/toc.yml
       - toc: opentelemetry://reference
         path_prefix: reference/opentelemetry
-        # Children include all EDOT distribution docs.
+        children:
+          - toc: elastic-agent://reference/edot-collector
+            path_prefix: reference/edot-collector
+          - toc: apm-agent-android://reference/edot-android
+            path_prefix: reference/opentelemetry/edot-sdks/android
+          - toc: elastic-otel-dotnet://reference/edot-dotnet
+            path_prefix: reference/opentelemetry/edot-sdks/dotnet
+          - toc: apm-agent-ios://reference/edot-ios
+            path_prefix: reference/opentelemetry/edot-sdks/ios
+          - toc: elastic-otel-java://reference/edot-java
+            path_prefix: reference/opentelemetry/edot-sdks/java
+          - toc: elastic-otel-node://reference/edot-node
+            path_prefix: reference/opentelemetry/edot-sdks/node
+          - toc: elastic-otel-php://reference/edot-php
+            path_prefix: reference/opentelemetry/edot-sdks/php
+          - toc: elastic-otel-python://reference/edot-python
+            path_prefix: reference/opentelemetry/edot-sdks/python
 
       # Ingestion tools
       # https://github.com/elastic/docs-content/blob/main/reference/ingestion-tools/toc.yml

config/versions.yml

@@ -41,7 +41,7 @@ versioning_systems:
     current: 1.2.0
   apm_agent_dotnet:
     base: 1.0
-    current: 1.34.0
+    current: 1.34.1
   apm_agent_go:
     base: 2.0
     current: 2.7.1
@@ -91,7 +91,7 @@ versioning_systems:
     current: 1.5.0
   edot_node:
     base: 1.0
-    current: 1.2.0
+    current: 1.3.0
   edot_php:
     base: 1.0
     current: 1.1.1
@@ -100,7 +100,7 @@ versioning_systems:
     current: 1.7.0
   edot_cf_aws:
     base: 0.1
-    current: 0.1.6
+    current: 0.2.0
 
   # Logging
   ecs_logging_dotnet:
@@ -140,4 +140,4 @@ versioning_systems:
 # Other
   cloud_terraform:
     base: 0.11
-    current: 0.11.17
+    current: 0.11.17

src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj

@@ -18,6 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="System.IO.Abstractions" />
     <EmbeddedResource Include="$(SolutionRoot)\config\versions.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\products.yml" />
     <EmbeddedResource Include="$(SolutionRoot)\config\assembler.yml" />