Skip to content
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.

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

Improve detection of resource attributes on ECS #4574

Merged

Commits on Jul 1, 2022

  1. Improve detection of resource attributes on ECS

    This improves the detection of resource attributes on ECS by fetching ECS metadata from `ECS_CONTAINER_METADATA_URI` or `ECS_CONTAINER_METADATA_URI_V4`.
    
    Previously only `CONTAINER_NAME` and `CONTAINER_ID` id were set.
    
    Now we set:
    
    - CONTAINER_ID
    - CONTAINER_NAME
    - AWS_ECS_CONTAINER_ARN
    - CONTAINER_IMAGE_NAME
    - CONTAINER_IMAGE_TAG
    - aws.ecs.container.image.id
    - AWS_LOG_GROUP_ARNS
    - AWS_LOG_GROUP_NAMES
    - AWS_LOG_STREAM_NAMES
    - AWS_ECS_TASK_ARN
    - AWS_ECS_TASK_FAMILY
    - AWS_ECS_TASK_REVISION
    
    Especially AWS_LOG_GROUP_ARNS is important so that connection of traces to logs works OOTB on X-Ray.
    felixscheinost committed Jul 1, 2022
    Copy the full SHA
    d0363a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. Change „24“ to „26“ in fixtures for consistency

    `CONTAINER_NAME` and `AWS_ECS_TASK_REVISION` should match
    felixscheinost committed Aug 30, 2022
    Copy the full SHA
    9b0b6b4 View commit details
    Browse the repository at this point in the history
  2. Implement a few more attributes, fix ARNs

    This commit adds implementations for the `aws.ecs.launchtype`
    and `aws.logs.stream.arns` attributes, as well as fixing
    the generation of log group ARNs.
    Michele Mancioppi authored and felixscheinost committed Aug 30, 2022
    Copy the full SHA
    57cd334 View commit details
    Browse the repository at this point in the history
  3. EcsResource: Record log group without trailing :*

    Both with and without trailing `:*` are valid formats but there is a bug in the OpenTelementry collector which can’t handle the trailing `:*` (for now) (see open-telemetry/opentelemetry-collector-contrib#13702)
    
    So remove addition of the trailing `:*` for now.
    felixscheinost committed Aug 30, 2022
    Copy the full SHA
    1fc24b4 View commit details
    Browse the repository at this point in the history