Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ec469b4

Browse files
committedAug 29, 2024·
Fix lint issues.
1 parent 0bc047b commit ec469b4

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed
 

‎text/entities/0264-resource-and-entities.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Where `Result` is the equivalent of error channel in the language of choice (e.g
6565

6666
#### Entity Merging and Resource
6767

68-
The most important aspect of this design is how Entities will be merged to construct a Resource.
68+
The most important aspect of this design is how Entities will be merged to construct a Resource.
6969

7070
We provide a simple algorithm for this behavior:
7171

@@ -341,7 +341,6 @@ The following outcome would occur:
341341
- This matches existing behavior/expectations today for AWS, GCP, etc. on what `host.id` would mean.
342342
- Users would be able to configure which host wins, by swapping the priority order of "default" vs. cloud-specific detection.
343343

344-
345344
### SDK and Collector - Simple coordination
346345

347346
Let's consider the interaction of resource, entity in the presence of an SDK
@@ -527,7 +526,7 @@ Ideally, we'd like a solution where:
527526
- host.type
528527
- (optional) gcp.gce.instance.hostname
529528
- (optional) gcp.gce.instance.name
530-
- AWS
529+
- AWS
531530
- [ec2](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/resourcedetectionprocessor/internal/aws/ec2/metadata.yaml)
532531
- cloud.provider
533532
- cloud.platform
@@ -674,7 +673,7 @@ Ideally, we'd like a solution where:
674673
- process.owner
675674
- [builtin](https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/resource/builtin.go)
676675
- service.instance.id
677-
- service.name
676+
- service.name
678677
- [OTEL operator](https://github.com/open-telemetry/opentelemetry-operator/blob/a1e8f927909b81eb368c0483940e0b90d7fdb057/pkg/instrumentation/sdk_test.go#L752) injected ENV variables
679678
- service.instance.id
680679
- service.name
@@ -684,7 +683,6 @@ Ideally, we'd like a solution where:
684683
- k8s.node.name
685684
- k8s.container.name
686685

687-
688686
### Implications
689687

690688
Some initial thoughts on implications:
@@ -718,7 +716,6 @@ The OTEL operator for k8s provides the following via ENV variables:
718716
- `k8s.container.*`
719717
- `service.*`
720718

721-
722719
### What could this mean for chosing entities that belong on resource?
723720

724721
Let's look at an example of a container running in kubernetes, specifically EKS.

0 commit comments

Comments
 (0)
This repository has been archived.