Skip to content

Add EDOT CF GCP #2303

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 2 commits into from
Dec 4, 2025
Merged

Add EDOT CF GCP #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54fe95
Add EDOT CF GCP
theletterf Dec 3, 2025
f9e8646
Update tests
theletterf Dec 3, 2025
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
40 changes: 20 additions & 20 deletions .github/updatecli/updatecli.d/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ sources:
versionfilter:
kind: latest

# latest-edot-cf-gcp-version:
# name: Get latest release version for the edot-cf-gcp
# kind: githubrelease
# transformers:
# - trimprefix: v
# spec:
# owner: elastic
# repository: edot-cloud-forwarder-gcp
# token: '{{ requiredEnv "GITHUB_TOKEN" }}'
# username: '{{ requiredEnv "GITHUB_ACTOR" }}'
# versionfilter:
# kind: latest
latest-edot-cf-gcp-version:
name: Get latest release version for the edot-cf-gcp
kind: githubrelease
transformers:
- trimprefix: v
spec:
owner: elastic
repository: edot-cloud-forwarder-gcp
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
versionfilter:
kind: latest

latest-edot-collector-version:
name: Get latest major release version for the elastic-agent
Expand Down Expand Up @@ -362,14 +362,14 @@ targets:
file: config/versions.yml
key: versioning_systems.edot-cf-azure.current

# update-docs-docset-cf-gcp:
# name: 'Update config/versions.yml edot-cf-gcp {{ source "latest-edot-cf-gcp-version" }}'
# scmid: githubConfig
# sourceid: latest-edot-cf-gcp-version
# kind: yaml
# spec:
# file: config/versions.yml
# key: versioning_systems.edot-cf-gcp.current
update-docs-docset-cf-gcp:
name: 'Update config/versions.yml edot-cf-gcp {{ source "latest-edot-cf-gcp-version" }}'
scmid: githubConfig
sourceid: latest-edot-cf-gcp-version
kind: yaml
spec:
file: config/versions.yml
key: versioning_systems.edot-cf-gcp.current

update-docs-docset-collector:
name: 'Update config/versions.yml edot-collector {{ source "latest-edot-collector-version" }}'
Expand Down
2 changes: 2 additions & 0 deletions config/products.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ products:
display: 'EDOT Cloud Forwarder for AWS'
edot-cf-azure:
display: 'EDOT Cloud Forwarder for Azure'
edot-cf-gcp:
display: 'EDOT Cloud Forwarder for GCP'
eland:
display: 'Eland'
versioning: 'stack'
Expand Down
6 changes: 3 additions & 3 deletions config/versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ versioning_systems:
edot-cf-azure:
base: 0.1
current: 0.6.0
# edot-cf-gcp:
# base: 0.1
# current: 0.1.0
edot-cf-gcp:
base: 0.1
current: 0.1.0

# Logging
ecs-logging-dotnet:
Expand Down
1 change: 1 addition & 0 deletions docs/_snippets/applies_to-key.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* `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_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).
Expand Down
2 changes: 2 additions & 0 deletions src/Elastic.Documentation.Configuration/Versions/VersionConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ public enum VersioningSystemId
EdotCfAws,
[Display(Name = "edot-cf-azure")]
EdotCfAzure,
[Display(Name = "edot-cf-gcp")]
EdotCfGcp,
[Display(Name = "edot-collector")]
EdotCollector,
[Display(Name = "search-ui")]
Expand Down
44 changes: 30 additions & 14 deletions src/Elastic.Documentation.Site/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/Elastic.Documentation/AppliesTo/ApplicableTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ public record ProductApplicability
[YamlMember(Alias = "edot-cf-azure")]
public AppliesCollection? EdotCfAzure { get; set; }

[YamlMember(Alias = "edot-cf-gcp")]
public AppliesCollection? EdotCfGcp { get; set; }

[YamlMember(Alias = "edot-collector")]
public AppliesCollection? EdotCollector { get; set; }

Expand Down Expand Up @@ -343,6 +346,7 @@ void AppendProduct(string name, AppliesCollection? value)
AppendProduct("edot-python", EdotPython);
AppendProduct("edot-cf-aws", EdotCfAws);
AppendProduct("edot-cf-azure", EdotCfAzure);
AppendProduct("edot-cf-gcp", EdotCfGcp);
AppendProduct("edot-collector", EdotCollector);

return sb.ToString();
Expand Down
3 changes: 2 additions & 1 deletion src/Elastic.Documentation/AppliesTo/ApplicableToYamlConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ private static bool TryGetProductApplicability(Dictionary<object, object?> dicti
{ "edot_php", a => productAvailability.EdotPhp = a },
{ "edot_python", a => productAvailability.EdotPython = a },
{ "edot_cf_aws", a => productAvailability.EdotCfAws = a },
{ "edot_cf_azure", a => productAvailability.EdotCfAzure = a }
{ "edot_cf_azure", a => productAvailability.EdotCfAzure = a },
{ "edot_cf_gcp", a => productAvailability.EdotCfGcp = a }
};

foreach (var (key, action) in mapping)
Expand Down
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning
public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Android", VersioningSystemId.EdotAndroid);
public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for AWS", VersioningSystemId.EdotCfAws);
public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;Forwarder for Azure", VersioningSystemId.EdotCfAzure);
public static readonly ApplicabilityDefinition EdotCfGcp = new("EDOT CF GCP", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;Cloud&nbsp;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&nbsp;Distribution of OpenTelemetry&nbsp;.NET", VersioningSystemId.EdotDotnet);
public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic&nbsp;Distribution of OpenTelemetry&nbsp;iOS", VersioningSystemId.EdotIos);
Expand Down
1 change: 1 addition & 0 deletions src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class ApplicableToViewModel
[p => p.EdotAndroid] = ApplicabilityMappings.EdotAndroid,
[p => p.EdotCfAws] = ApplicabilityMappings.EdotCfAws,
[p => p.EdotCfAzure] = ApplicabilityMappings.EdotCfAzure,
[p => p.EdotCfGcp] = ApplicabilityMappings.EdotCfGcp,
[p => p.EdotCollector] = ApplicabilityMappings.EdotCollector,
[p => p.EdotDotnet] = ApplicabilityMappings.EdotDotnet,
[p => p.EdotIos] = ApplicabilityMappings.EdotIos,
Expand Down
2 changes: 1 addition & 1 deletion tests/Elastic.Markdown.Tests/AppliesTo/ProductApplicabilityToStringTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void ProductApplicabilityToStringIncludesAllProperties()
}

// Verify we have the expected number of properties
properties.Should().HaveCount(22, "ProductApplicability should have exactly 22 product properties");
properties.Should().HaveCount(23, "ProductApplicability should have exactly 23 product properties");
}

[Fact]
Expand Down
Loading