From 27edbd89d743488d7be416c5a7a37a1598710c9f Mon Sep 17 00:00:00 2001 From: Felix Scheinost Date: Tue, 30 Aug 2022 09:55:25 +0200 Subject: [PATCH] EcsResource: Record log group without trailing :* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/13702) So remove addition of the trailing `:*` for now. --- .../opentelemetry/sdk/extension/aws/resource/EcsResource.java | 2 +- .../sdk/extension/aws/resource/EcsResourceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResource.java b/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResource.java index f25c4b8dc61..5016bf9d17f 100644 --- a/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResource.java +++ b/sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResource.java @@ -203,7 +203,7 @@ Optional getLogGroupArn() { } return Optional.of( - "arn:aws:logs:" + region + ":" + account + ":log-group:" + logGroupName + ":*"); + "arn:aws:logs:" + region + ":" + account + ":log-group:" + logGroupName); } Optional getLogStreamArn() { diff --git a/sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceTest.java b/sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceTest.java index 9fd47c7a680..71a03afee1c 100644 --- a/sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceTest.java +++ b/sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceTest.java @@ -104,7 +104,7 @@ void testCreateAttributesV4() throws IOException { entry( ResourceAttributes.AWS_LOG_GROUP_ARNS, Collections.singletonList( - "arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:*")), + "arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata")), entry( ResourceAttributes.AWS_LOG_STREAM_NAMES, Collections.singletonList("ecs/curl/8f03e41243824aea923aca126495f665")),