From 6e0c79746e8aa7a9bd3c586ca21338c3b8502083 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Fri, 17 Jul 2026 15:01:47 +0200 Subject: [PATCH 1/6] docs: rename EDOT display strings for 9.5 product rebrand MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - edot-collector display → "Elastic Agent" (same binary, OTel mode) - edot-cf/edot-cf-aws/azure/gcp display → "Elastic Cloud Forwarder" - edot-sdk/ios/android/dotnet/java/node/browser/php/python display → "Elastic OTel {Lang} SDK" - terraform-google-edot-cf display → "Terraform Google Elastic Cloud Forwarder" - ApplicabilityMappings: update badge short names and tooltip long names - ProductDescriptions: update HTML product blurbs - search.yml: add "elastic opentelemetry"/"elastic otel" synonyms and backward-compat entries for "edot collector" and "edot sdk" searches Machine product IDs (edot-collector, edot-sdk, etc.) are unchanged so all existing applies_to frontmatter remains valid. Co-Authored-By: Claude Sonnet 4.6 --- config/products.yml | 30 +++++++++---------- config/search.yml | 4 ++- .../Myst/Components/ApplicabilityMappings.cs | 26 ++++++++-------- .../Myst/Components/ProductDescriptions.cs | 22 +++++++------- .../ConfigurationFileReleaseNotesTests.cs | 2 +- 5 files changed, 43 insertions(+), 41 deletions(-) diff --git a/config/products.yml b/config/products.yml index 31a7fe4bc4..a6f8463a70 100644 --- a/config/products.yml +++ b/config/products.yml @@ -60,7 +60,7 @@ products: display: 'Elastic Cloud Terraform Provider' versioning: 'cloud-terraform' terraform-google-edot-cf: - display: 'Terraform Google EDOT CF' + display: 'Terraform Google Elastic Cloud Forwarder' versioning: 'terraform-google-edot-cf' curator: display: 'Elasticsearch Curator' @@ -94,44 +94,44 @@ products: ecs-logging-ruby: display: 'ECS Logging Ruby' edot-cf: - display: 'EDOT Cloud Forwarder' + display: 'Elastic Cloud Forwarder' versioning: 'stack' edot-sdk: - display: 'Elastic Distribution of OpenTelemetry SDK' + display: 'Elastic OTel SDK' versioning: 'all' edot-collector: - display: 'Elastic Distribution of OpenTelemetry Collector' + display: 'Elastic Agent' versioning: 'stack' edot-ios: - display: 'Elastic Distribution of OpenTelemetry iOS' + display: 'Elastic OTel iOS SDK' repository: 'apm-agent-ios' edot-android: - display: 'Elastic Distribution of OpenTelemetry Android' + display: 'Elastic OTel Android SDK' repository: 'apm-agent-android' edot-dotnet: - display: 'Elastic Distribution of OpenTelemetry .NET' + display: 'Elastic OTel .NET SDK' repository: 'elastic-otel-dotnet' edot-java: - display: 'Elastic Distribution of OpenTelemetry Java' + display: 'Elastic OTel Java SDK' repository: 'elastic-otel-java' edot-node: - display: 'Elastic Distribution of OpenTelemetry Node' + display: 'Elastic OTel Node.js SDK' repository: 'elastic-otel-node' edot-browser: - display: 'Elastic Distribution of OpenTelemetry Browser (RUM)' + display: 'Elastic OTel Browser SDK (RUM)' repository: 'elastic-otel-rum-js' edot-php: - display: 'Elastic Distribution of OpenTelemetry PHP' + display: 'Elastic OTel PHP SDK' repository: 'elastic-otel-php' edot-python: - display: 'Elastic Distribution of OpenTelemetry Python' + display: 'Elastic OTel Python SDK' repository: 'elastic-otel-python' edot-cf-aws: - display: 'EDOT Cloud Forwarder for AWS' + display: 'Elastic Cloud Forwarder for AWS' edot-cf-azure: - display: 'EDOT Cloud Forwarder for Azure' + display: 'Elastic Cloud Forwarder for Azure' edot-cf-gcp: - display: 'EDOT Cloud Forwarder for GCP' + display: 'Elastic Cloud Forwarder for GCP' eland: display: 'Eland' versioning: 'stack' diff --git a/config/search.yml b/config/search.yml index b85f8c3c04..e4e10dcc98 100644 --- a/config/search.yml +++ b/config/search.yml @@ -55,7 +55,9 @@ synonyms: - [ "ech", "elastic cloud hosted", "ess" ] - [ "eck", "elastic cloud on kubernetes" ] - [ "ecs", "elastic common schema" ] - - [ "edot", "elastic distribution of opentelemetry" ] + - [ "edot", "elastic distribution of opentelemetry", "elastic opentelemetry", "elastic otel" ] + - [ "edot collector", "edot-collector", "elastic distribution of opentelemetry collector" ] + - [ "edot sdk", "edot sdks", "elastic otel sdk", "elastic otel sdks" ] - [ "edr", "endpoint detection response" ] - [ "eis", "elastic inference service" ] - [ "eks", "elastic kubernetes service" ] diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs index d20e291c41..796f271667 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs @@ -29,19 +29,19 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning public static readonly ApplicabilityDefinition Ecctl = new("ECCTL", "Elastic Cloud Control", VersioningSystemId.Ecctl); public static readonly ApplicabilityDefinition Curator = new("Curator", "Curator", VersioningSystemId.Curator); - // EDOT Products - public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); - public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); - public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic Distribution of OpenTelemetry Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); - public static readonly ApplicabilityDefinition EdotCfGcp = new("EDOT CF GCP", "Elastic Distribution of OpenTelemetry Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); - public static readonly ApplicabilityDefinition EdotCollector = new("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector); - public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); - public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); - public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava); - public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode); - public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser); - public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp); - public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython); + // Elastic OTel Products + public static readonly ApplicabilityDefinition EdotAndroid = new("Elastic OTel Android", "Elastic OTel Android SDK", VersioningSystemId.EdotAndroid); + public static readonly ApplicabilityDefinition EdotCfAws = new("Elastic CF AWS", "Elastic Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); + public static readonly ApplicabilityDefinition EdotCfAzure = new("Elastic CF Azure", "Elastic Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); + public static readonly ApplicabilityDefinition EdotCfGcp = new("Elastic CF GCP", "Elastic Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); + public static readonly ApplicabilityDefinition EdotCollector = new("Elastic Agent", "Elastic Agent", VersioningSystemId.EdotCollector); + public static readonly ApplicabilityDefinition EdotDotnet = new("Elastic OTel .NET", "Elastic OTel .NET SDK", VersioningSystemId.EdotDotnet); + public static readonly ApplicabilityDefinition EdotIos = new("Elastic OTel iOS", "Elastic OTel iOS SDK", VersioningSystemId.EdotIos); + public static readonly ApplicabilityDefinition EdotJava = new("Elastic OTel Java", "Elastic OTel Java SDK", VersioningSystemId.EdotJava); + public static readonly ApplicabilityDefinition EdotNode = new("Elastic OTel Node.js", "Elastic OTel Node.js SDK", VersioningSystemId.EdotNode); + public static readonly ApplicabilityDefinition EdotBrowser = new("Elastic OTel Browser", "Elastic OTel Browser SDK (RUM)", VersioningSystemId.EdotBrowser); + public static readonly ApplicabilityDefinition EdotPhp = new("Elastic OTel PHP", "Elastic OTel PHP SDK", VersioningSystemId.EdotPhp); + public static readonly ApplicabilityDefinition EdotPython = new("Elastic OTel Python", "Elastic OTel Python SDK", VersioningSystemId.EdotPython); // APM Agents public static readonly ApplicabilityDefinition ApmAgentAndroid = new("APM Agent Android", "Application Performance Monitoring Agent for Android", VersioningSystemId.ApmAgentAndroid); diff --git a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs index bee9e8a7c8..d9df173b24 100644 --- a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs +++ b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs @@ -141,54 +141,54 @@ bool IncludeVersionNote IncludeVersionNote: true ), - // EDOT Products + // Elastic OTel Products [VersioningSystemId.EdotCollector] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Collector retrieves traces, metrics, and logs from your infrastructure and applications, and forwards them to Elastic Observability.", + Description: "Elastic Agent can run in OpenTelemetry mode to retrieve traces, metrics, and logs from your infrastructure and applications, and forward them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotIos] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) iOS SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel iOS SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotAndroid] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Android SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel Android SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotDotnet] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) .NET SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel .NET SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotJava] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Java SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel Java SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotNode] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Node.js SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel Node.js SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotBrowser] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Browser SDK (RUM) collects performance metrics, traces, and logs from web applications in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel Browser SDK (RUM) collects performance metrics, traces, and logs from web applications in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotPhp] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) PHP SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel PHP SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotPython] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Python SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic OTel Python SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotCfAws] = new ProductInfo( - Description: "The Elastic Distribution of OpenTelemetry (EDOT) Cloud Forwarder allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.", + Description: "The Elastic Cloud Forwarder allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), diff --git a/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs b/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs index bb289aa76a..d43d1f53a2 100644 --- a/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs +++ b/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs @@ -131,7 +131,7 @@ private static ProductsConfiguration CreateProductsConfiguration() var products = new Dictionary { ["elasticsearch"] = new() { Id = "elasticsearch", DisplayName = "Elasticsearch", Features = ProductFeatures.All }, - ["edot-java"] = new() { Id = "edot-java", DisplayName = "EDOT Java", Features = ProductFeatures.All }, + ["edot-java"] = new() { Id = "edot-java", DisplayName = "Elastic OTel Java", Features = ProductFeatures.All }, ["reference-only"] = new() { Id = "reference-only", From 6510dfcae9456b18347195853f06640c00b47ac2 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Fri, 17 Jul 2026 16:10:52 +0200 Subject: [PATCH 2/6] test: update authoring snapshot for renamed EDOT product display names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the `renders EDOT agents planned` snapshot test to match the new badge keys and product descriptions after the 9.5 rebrand: - "EDOT .NET/Java/Python" badge keys → "Elastic OTel .NET/Java/Python" - ProductDescriptions HTML updated to new short-form names Co-Authored-By: Claude Sonnet 4.6 --- tests/authoring/Applicability/ApplicableToComponent.fs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/authoring/Applicability/ApplicableToComponent.fs b/tests/authoring/Applicability/ApplicableToComponent.fs index 1c7dbaa21c..c041bd1bbc 100644 --- a/tests/authoring/Applicability/ApplicableToComponent.fs +++ b/tests/authoring/Applicability/ApplicableToComponent.fs @@ -292,14 +292,14 @@ edot_python: preview 9.2.0 """ [] - let ``renders EDOT agents planned`` () = + let ``renders Elastic OTel agents planned`` () = markdown |> convertsToHtml """

- + - + - +

""" From 1664d3401b0a28847e4656b5f9a3822880501ca0 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Fri, 17 Jul 2026 16:23:48 +0200 Subject: [PATCH 3/6] fix(test): update lifecycle description snapshots to include SDK suffix The lifecycle description is auto-generated from the product long name ("Elastic OTel .NET SDK"), so the snapshot must include "SDK" in the generated text. Co-Authored-By: Claude Sonnet 4.6 --- tests/authoring/Applicability/ApplicableToComponent.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/authoring/Applicability/ApplicableToComponent.fs b/tests/authoring/Applicability/ApplicableToComponent.fs index c041bd1bbc..c5c507400c 100644 --- a/tests/authoring/Applicability/ApplicableToComponent.fs +++ b/tests/authoring/Applicability/ApplicableToComponent.fs @@ -295,11 +295,11 @@ edot_python: preview 9.2.0 let ``renders Elastic OTel agents planned`` () = markdown |> convertsToHtml """

- + - + - +

""" From 122e39c1b102b0dd380fc1411674c47d137350aa Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Tue, 21 Jul 2026 20:44:30 +0200 Subject: [PATCH 4/6] =?UTF-8?q?revert:=20restore=20EDOT=20SDK=20display=20?= =?UTF-8?q?names=20=E2=80=94=20SDK=20rebrand=20descoped=20from=209.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The EDOT SDK product names (EDOT Java, EDOT .NET, etc.) will not change at 9.5 GA. Revert all SDK-related display name, description, badge, and test snapshot changes while keeping the Collector and Cloud Forwarder renames in place. Co-Authored-By: Claude Sonnet 4.6 --- config/products.yml | 18 +++++++++--------- config/search.yml | 1 - .../Myst/Components/ApplicabilityMappings.cs | 16 ++++++++-------- .../Myst/Components/ProductDescriptions.cs | 16 ++++++++-------- .../ConfigurationFileReleaseNotesTests.cs | 2 +- .../Applicability/ApplicableToComponent.fs | 8 ++++---- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/config/products.yml b/config/products.yml index a6f8463a70..c3695423f6 100644 --- a/config/products.yml +++ b/config/products.yml @@ -97,34 +97,34 @@ products: display: 'Elastic Cloud Forwarder' versioning: 'stack' edot-sdk: - display: 'Elastic OTel SDK' + display: 'Elastic Distribution of OpenTelemetry SDK' versioning: 'all' edot-collector: display: 'Elastic Agent' versioning: 'stack' edot-ios: - display: 'Elastic OTel iOS SDK' + display: 'Elastic Distribution of OpenTelemetry iOS' repository: 'apm-agent-ios' edot-android: - display: 'Elastic OTel Android SDK' + display: 'Elastic Distribution of OpenTelemetry Android' repository: 'apm-agent-android' edot-dotnet: - display: 'Elastic OTel .NET SDK' + display: 'Elastic Distribution of OpenTelemetry .NET' repository: 'elastic-otel-dotnet' edot-java: - display: 'Elastic OTel Java SDK' + display: 'Elastic Distribution of OpenTelemetry Java' repository: 'elastic-otel-java' edot-node: - display: 'Elastic OTel Node.js SDK' + display: 'Elastic Distribution of OpenTelemetry Node' repository: 'elastic-otel-node' edot-browser: - display: 'Elastic OTel Browser SDK (RUM)' + display: 'Elastic Distribution of OpenTelemetry Browser (RUM)' repository: 'elastic-otel-rum-js' edot-php: - display: 'Elastic OTel PHP SDK' + display: 'Elastic Distribution of OpenTelemetry PHP' repository: 'elastic-otel-php' edot-python: - display: 'Elastic OTel Python SDK' + display: 'Elastic Distribution of OpenTelemetry Python' repository: 'elastic-otel-python' edot-cf-aws: display: 'Elastic Cloud Forwarder for AWS' diff --git a/config/search.yml b/config/search.yml index e4e10dcc98..3d40ff6732 100644 --- a/config/search.yml +++ b/config/search.yml @@ -57,7 +57,6 @@ synonyms: - [ "ecs", "elastic common schema" ] - [ "edot", "elastic distribution of opentelemetry", "elastic opentelemetry", "elastic otel" ] - [ "edot collector", "edot-collector", "elastic distribution of opentelemetry collector" ] - - [ "edot sdk", "edot sdks", "elastic otel sdk", "elastic otel sdks" ] - [ "edr", "endpoint detection response" ] - [ "eis", "elastic inference service" ] - [ "eks", "elastic kubernetes service" ] diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs index 796f271667..fabe11043f 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs @@ -30,18 +30,18 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning public static readonly ApplicabilityDefinition Curator = new("Curator", "Curator", VersioningSystemId.Curator); // Elastic OTel Products - public static readonly ApplicabilityDefinition EdotAndroid = new("Elastic OTel Android", "Elastic OTel Android SDK", VersioningSystemId.EdotAndroid); + public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); public static readonly ApplicabilityDefinition EdotCfAws = new("Elastic CF AWS", "Elastic Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); public static readonly ApplicabilityDefinition EdotCfAzure = new("Elastic CF Azure", "Elastic Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); public static readonly ApplicabilityDefinition EdotCfGcp = new("Elastic CF GCP", "Elastic Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); public static readonly ApplicabilityDefinition EdotCollector = new("Elastic Agent", "Elastic Agent", VersioningSystemId.EdotCollector); - public static readonly ApplicabilityDefinition EdotDotnet = new("Elastic OTel .NET", "Elastic OTel .NET SDK", VersioningSystemId.EdotDotnet); - public static readonly ApplicabilityDefinition EdotIos = new("Elastic OTel iOS", "Elastic OTel iOS SDK", VersioningSystemId.EdotIos); - public static readonly ApplicabilityDefinition EdotJava = new("Elastic OTel Java", "Elastic OTel Java SDK", VersioningSystemId.EdotJava); - public static readonly ApplicabilityDefinition EdotNode = new("Elastic OTel Node.js", "Elastic OTel Node.js SDK", VersioningSystemId.EdotNode); - public static readonly ApplicabilityDefinition EdotBrowser = new("Elastic OTel Browser", "Elastic OTel Browser SDK (RUM)", VersioningSystemId.EdotBrowser); - public static readonly ApplicabilityDefinition EdotPhp = new("Elastic OTel PHP", "Elastic OTel PHP SDK", VersioningSystemId.EdotPhp); - public static readonly ApplicabilityDefinition EdotPython = new("Elastic OTel Python", "Elastic OTel Python SDK", VersioningSystemId.EdotPython); + public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); + public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); + public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava); + public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode); + public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser); + public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp); + public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython); // APM Agents public static readonly ApplicabilityDefinition ApmAgentAndroid = new("APM Agent Android", "Application Performance Monitoring Agent for Android", VersioningSystemId.ApmAgentAndroid); diff --git a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs index d9df173b24..24e16b35f4 100644 --- a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs +++ b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs @@ -148,42 +148,42 @@ bool IncludeVersionNote IncludeVersionNote: true ), [VersioningSystemId.EdotIos] = new ProductInfo( - Description: "The Elastic OTel iOS SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) iOS SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotAndroid] = new ProductInfo( - Description: "The Elastic OTel Android SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) Android SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotDotnet] = new ProductInfo( - Description: "The Elastic OTel .NET SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) .NET SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotJava] = new ProductInfo( - Description: "The Elastic OTel Java SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) Java SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotNode] = new ProductInfo( - Description: "The Elastic OTel Node.js SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) Node.js SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotBrowser] = new ProductInfo( - Description: "The Elastic OTel Browser SDK (RUM) collects performance metrics, traces, and logs from web applications in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) Browser SDK (RUM) collects performance metrics, traces, and logs from web applications in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotPhp] = new ProductInfo( - Description: "The Elastic OTel PHP SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) PHP SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), [VersioningSystemId.EdotPython] = new ProductInfo( - Description: "The Elastic OTel Python SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", + Description: "The Elastic Distribution of OpenTelemetry (EDOT) Python SDK collects performance metrics, traces, and logs in OpenTelemetry format, and sends them to Elastic Observability.", AdditionalAvailabilityInfo: null, IncludeVersionNote: true ), diff --git a/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs b/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs index d43d1f53a2..bb289aa76a 100644 --- a/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs +++ b/tests/Elastic.Documentation.Configuration.Tests/ConfigurationFileReleaseNotesTests.cs @@ -131,7 +131,7 @@ private static ProductsConfiguration CreateProductsConfiguration() var products = new Dictionary { ["elasticsearch"] = new() { Id = "elasticsearch", DisplayName = "Elasticsearch", Features = ProductFeatures.All }, - ["edot-java"] = new() { Id = "edot-java", DisplayName = "Elastic OTel Java", Features = ProductFeatures.All }, + ["edot-java"] = new() { Id = "edot-java", DisplayName = "EDOT Java", Features = ProductFeatures.All }, ["reference-only"] = new() { Id = "reference-only", diff --git a/tests/authoring/Applicability/ApplicableToComponent.fs b/tests/authoring/Applicability/ApplicableToComponent.fs index c5c507400c..1c7dbaa21c 100644 --- a/tests/authoring/Applicability/ApplicableToComponent.fs +++ b/tests/authoring/Applicability/ApplicableToComponent.fs @@ -292,14 +292,14 @@ edot_python: preview 9.2.0 """ [] - let ``renders Elastic OTel agents planned`` () = + let ``renders EDOT agents planned`` () = markdown |> convertsToHtml """

- + - + - +

""" From 7d2f232b81e9e762b606435c81e1e5d3a6fb5d80 Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Sat, 25 Jul 2026 11:33:30 +0200 Subject: [PATCH 5/6] restore   HTML entities in EDOT SDK display names. Addresses review comment --- .../Myst/Components/ApplicabilityMappings.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs index fabe11043f..22b5188174 100644 --- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs +++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs @@ -30,18 +30,18 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning public static readonly ApplicabilityDefinition Curator = new("Curator", "Curator", VersioningSystemId.Curator); // Elastic OTel Products - public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); + public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid); public static readonly ApplicabilityDefinition EdotCfAws = new("Elastic CF AWS", "Elastic Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws); public static readonly ApplicabilityDefinition EdotCfAzure = new("Elastic CF Azure", "Elastic Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure); public static readonly ApplicabilityDefinition EdotCfGcp = new("Elastic CF GCP", "Elastic Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp); public static readonly ApplicabilityDefinition EdotCollector = new("Elastic Agent", "Elastic Agent", VersioningSystemId.EdotCollector); - public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); - public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); - public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava); - public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode); - public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser); - public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp); - public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython); + public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet); + public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos); + public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava); + public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode); + public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser); + public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp); + public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython); // APM Agents public static readonly ApplicabilityDefinition ApmAgentAndroid = new("APM Agent Android", "Application Performance Monitoring Agent for Android", VersioningSystemId.ApmAgentAndroid); From 7710e542986f256b052acae53693b4d81e5e9c1f Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska Date: Sat, 25 Jul 2026 11:50:39 +0200 Subject: [PATCH 6/6] update stale EDOT brand references in docs and config --- config/navigation.yml | 2 +- config/search.yml | 1 + docs/_snippets/applies_to-key.md | 8 ++++---- docs/configure/site/products.md | 2 +- docs/syntax/frontmatter.md | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/navigation.yml b/config/navigation.yml index e39a84043d..14b502d12d 100644 --- a/config/navigation.yml +++ b/config/navigation.yml @@ -117,7 +117,7 @@ toc: # https://github.com/elastic/apm-agent-android/blob/main/docs/release-notes/toc.yml - toc: apm-agent-android://release-notes path_prefix: release-notes/edot/sdks/android - # EDOT Cloud Forwarder for AWS + # Elastic Cloud Forwarder for AWS # https://github.com/elastic/edot-cloud-forwarder-aws/blob/main/docs/release-notes/toc.yml - toc: edot-cloud-forwarder-aws://release-notes path_prefix: release-notes/edot/cloud-forwarder/aws diff --git a/config/search.yml b/config/search.yml index 3d40ff6732..e59d10340b 100644 --- a/config/search.yml +++ b/config/search.yml @@ -57,6 +57,7 @@ synonyms: - [ "ecs", "elastic common schema" ] - [ "edot", "elastic distribution of opentelemetry", "elastic opentelemetry", "elastic otel" ] - [ "edot collector", "edot-collector", "elastic distribution of opentelemetry collector" ] + - [ "edot cf", "edot cloud forwarder", "elastic distribution of opentelemetry cloud forwarder", "elastic cloud forwarder" ] - [ "edr", "endpoint detection response" ] - [ "eis", "elastic inference service" ] - [ "eks", "elastic kubernetes service" ] diff --git a/docs/_snippets/applies_to-key.md b/docs/_snippets/applies_to-key.md index b9cc4d8c40..202a3e1433 100644 --- a/docs/_snippets/applies_to-key.md +++ b/docs/_snippets/applies_to-key.md @@ -22,10 +22,10 @@ * `curator`: Applies to [Elasticsearch Curator](https://www.elastic.co/docs/reference/elasticsearch/curator) (Curator). * `ecctl`: Applies to [Elastic cloud control](https://www.elastic.co/docs/reference/ecctl) (ECCTL). * `edot_android`: Applies to the [Elastic Distribution of OpenTelemetry Android](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/android/) (EDOT Android). - * `edot_cf_aws`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_cf_azure`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_cf_gcp`: Applies to the [Elastic Distribution of OpenTelemetry Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (EDOT Cloud Forwarder). - * `edot_collector`: Applies to the [Elastic Distribution of OpenTelemetry Collector](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (EDOT Collector). + * `edot_cf_aws`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_cf_azure`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_cf_gcp`: Applies to the [Elastic Cloud Forwarder](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/) (Elastic Cloud Forwarder). + * `edot_collector`: Applies to [Elastic Agent in OpenTelemetry mode](https://www.elastic.co/docs/reference/opentelemetry/edot-collector/) (Elastic Agent). * `edot_dotnet`: Applies to the [Elastic Distribution of OpenTelemetry .NET](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/dotnet/) (EDOT .NET). * `edot_ios`: Applies to the [Elastic Distribution of OpenTelemetry iOS](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/ios/) (EDOT iOS). * `edot_java`: Applies to the [Elastic Distribution of OpenTelemetry Java](https://www.elastic.co/docs/reference/opentelemetry/edot-sdks/java/) (EDOT Java). diff --git a/docs/configure/site/products.md b/docs/configure/site/products.md index ebe3afb044..b4d3a89cf0 100644 --- a/docs/configure/site/products.md +++ b/docs/configure/site/products.md @@ -8,7 +8,7 @@ products: display: 'APM .NET Agent' versioning: 'apm-agent-dotnet' edot-collector: - display: 'Elastic Distribution of OpenTelemetry Collector' + display: 'Elastic Agent' versioning: 'stack' repository: 'elastic-edot-collector' docs-builder: diff --git a/docs/syntax/frontmatter.md b/docs/syntax/frontmatter.md index 944f433834..a024f7b8c5 100644 --- a/docs/syntax/frontmatter.md +++ b/docs/syntax/frontmatter.md @@ -68,9 +68,9 @@ Only products with the `public-reference` feature enabled in [`products.yml`](ht | `cloud-terraform` | Elastic Cloud Terraform | | `ecs` | Elastic Common Schema (ECS) | | `ecs-logging` | ECS Logging | -| `edot-cf` | EDOT Cloud Forwarder | +| `edot-cf` | Elastic Cloud Forwarder | | `edot-sdk` | Elastic Distribution of OpenTelemetry SDK | -| `edot-collector` | Elastic Distribution of OpenTelemetry Collector | +| `edot-collector` | Elastic Agent | | `elastic-agent` | Elastic Agent | | `elastic-serverless-forwarder` | Elastic Serverless Forwarder | | `elastic-stack` | Elastic Stack |