Skip to content

Add EDOT CF as product and fix EDOT labels #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2025
Merged

Add EDOT CF as product and fix EDOT labels #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Elastic.Documentation.Configuration/Versions/Version.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ public enum VersioningSystemId
[Display(Name = "edot_php")]
EdotPhp,
[Display(Name = "edot_python")]
EdotPython
EdotPython,
[Display(Name = "edot_cf_aws")]
EdotCfAws
}

[YamlSerializable]
Expand Down
4 changes: 4 additions & 0 deletions src/Elastic.Documentation.Configuration/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,7 @@ versioning_systems:
edot_python:
base: 1.0
current: 1.3.0
edot_cf_aws:
base: 0.1
current: 0.1.6

20 changes: 13 additions & 7 deletions src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,43 +183,49 @@

if (pa.EdotIos is not null)
{
@RenderProduct("EDOT iOS", "Elastic Distributions of OpenTelemetry for iOS", VersioningSystemId.EdotIos, pa.EdotIos)
@RenderProduct("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos, pa.EdotIos)
;
}

if (pa.EdotAndroid is not null)
{
@RenderProduct("EDOT Android", "Elastic Distributions of OpenTelemetry for Android", VersioningSystemId.EdotAndroid, pa.EdotAndroid)
@RenderProduct("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid, pa.EdotAndroid)
;
}

if (pa.EdotDotnet is not null)
{
@RenderProduct("EDOT .NET", " Elastic Distributions of OpenTelemetry for .NET", VersioningSystemId.EdotDotnet, pa.EdotDotnet)
@RenderProduct("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet, pa.EdotDotnet)
;
}

if (pa.EdotJava is not null)
{
@RenderProduct("EDOT Java", "Elastic Distributions of OpenTelemetry for Java", VersioningSystemId.EdotJava, pa.EdotJava)
@RenderProduct("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava, pa.EdotJava)
;
}

if (pa.EdotNode is not null)
{
@RenderProduct("EDOT Node.js", "Elastic Distributions of OpenTelemetry for Node.js", VersioningSystemId.EdotNode, pa.EdotNode)
@RenderProduct("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode, pa.EdotNode)
;
}

if (pa.EdotPhp is not null)
{
@RenderProduct("EDOT PHP", "Elastic Distributions of OpenTelemetry for PHP", VersioningSystemId.ApmAgentPhp, pa.EdotPhp)
@RenderProduct("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.ApmAgentPhp, pa.EdotPhp)
;
}

if (pa.EdotPython is not null)
{
@RenderProduct("EDOT Python", "Elastic Distributions of OpenTelemetry for Python", VersioningSystemId.EdotPython, pa.EdotPython)
@RenderProduct("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython, pa.EdotPython)
;
}

if (pa.EdotCfAws is not null)
{
@RenderProduct("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws, pa.EdotCfAws)
;
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/Elastic.Markdown/Myst/FrontMatter/ApplicableTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ public record ProductApplicability

[YamlMember(Alias = "edot_python")]
public AppliesCollection? EdotPython { get; set; }

[YamlMember(Alias = "edot_cf_aws")]
public AppliesCollection? EdotCfAws { get; set; }
}

public class ApplicableToConverter : IYamlTypeConverter
Expand All @@ -185,7 +188,7 @@ public class ApplicableToConverter : IYamlTypeConverter
"elasticsearch", "observability", "security",
"ecctl", "curator",
"apm_agent_android","apm_agent_dotnet", "apm_agent_go", "apm_agent_ios", "apm_agent_java", "apm_agent_node", "apm_agent_php", "apm_agent_python", "apm_agent_ruby", "apm_agent_rum",
"edot_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python"
"edot_ios", "edot_android", "edot_dotnet", "edot_java", "edot_node", "edot_php", "edot_python", "edot_cf_aws"
];

public bool Accepts(Type type) => type == typeof(ApplicableTo);
Expand Down Expand Up @@ -393,7 +396,8 @@ private static bool TryGetProductApplicability(Dictionary<object, object?> dicti
{ "edot_java", a => productAvailability.EdotJava = a },
{ "edot_node", a => productAvailability.EdotNode = a },
{ "edot_php", a => productAvailability.EdotPhp = a },
{ "edot_python", a => productAvailability.EdotPython = a }
{ "edot_python", a => productAvailability.EdotPython = a },
{ "edot_cf_aws", a => productAvailability.EdotCfAws = a }
};

foreach (var (key, action) in mapping)
Expand Down
Loading