@@ -65,7 +65,7 @@ Where `Result` is the equivalent of error channel in the language of choice (e.g
65
65
66
66
#### Entity Merging and Resource
67
67
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 .
69
69
70
70
We provide a simple algorithm for this behavior :
71
71
@@ -341,7 +341,6 @@ The following outcome would occur:
341
341
- This matches existing behavior/expectations today for AWS, GCP, etc. on what ` host.id ` would mean.
342
342
- Users would be able to configure which host wins, by swapping the priority order of "default" vs. cloud-specific detection.
343
343
344
-
345
344
### SDK and Collector - Simple coordination
346
345
347
346
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:
527
526
- host.type
528
527
- (optional) gcp.gce.instance.hostname
529
528
- (optional) gcp.gce.instance.name
530
- - AWS
529
+ - AWS
531
530
- [ ec2] ( https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/resourcedetectionprocessor/internal/aws/ec2/metadata.yaml )
532
531
- cloud.provider
533
532
- cloud.platform
@@ -674,7 +673,7 @@ Ideally, we'd like a solution where:
674
673
- process.owner
675
674
- [ builtin] ( https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/resource/builtin.go )
676
675
- service.instance.id
677
- - service.name
676
+ - service.name
678
677
- [ OTEL operator] ( https://github.com/open-telemetry/opentelemetry-operator/blob/a1e8f927909b81eb368c0483940e0b90d7fdb057/pkg/instrumentation/sdk_test.go#L752 ) injected ENV variables
679
678
- service.instance.id
680
679
- service.name
@@ -684,7 +683,6 @@ Ideally, we'd like a solution where:
684
683
- k8s.node.name
685
684
- k8s.container.name
686
685
687
-
688
686
### Implications
689
687
690
688
Some initial thoughts on implications:
@@ -718,7 +716,6 @@ The OTEL operator for k8s provides the following via ENV variables:
718
716
- ` k8s.container.* `
719
717
- ` service.* `
720
718
721
-
722
719
### What could this mean for chosing entities that belong on resource?
723
720
724
721
Let's look at an example of a container running in kubernetes, specifically EKS.
0 commit comments