Skip to content

fix(deps): update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.13.0-alpha #1736

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 11 commits into from
Feb 20, 2025
Merged

fix(deps): update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.13.0-alpha #1736

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
49f1b62
fix(deps): update dependency io.opentelemetry.instrumentation:opentel…
renovate[bot] Feb 16, 2025
803d855
Update container.image.tag to container.image.tags
trask Feb 17, 2025
81b30f3
update
trask Feb 17, 2025
17c5166
update events
trask Feb 17, 2025
e08788a
Merge remote-tracking branch 'upstream/main' into renovate/otelinstru…
trask Feb 19, 2025
0b86e41
Disable JmxConnectionTest for now
trask Feb 19, 2025
4d93ca3
relax timeout from 1s to 10s before failure.
breedx-splk Feb 20, 2025
6d1931b
Merge branch 'main' into renovate/otelinstrumentationversion
breedx-splk Feb 20, 2025
5f57a2b
merge main and fix
breedx-splk Feb 20, 2025
0e2f217
Update jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/…
trask Feb 20, 2025
08522ad
retry for 10 seconds
trask Feb 20, 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
3 changes: 1 addition & 2 deletions aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,8 @@ static void parseResponse(
DockerImage parsedImage = DockerImage.parse(value);
if (parsedImage != null) {
attrBuilders.put(CONTAINER_IMAGE_NAME, parsedImage.getRepository());
// TODO: CONTAINER_IMAGE_TAG has been replaced with CONTAINER_IMAGE_TAGS
attrBuilders.put(
io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG,
io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_IMAGE_TAGS,
Comment on lines -197 to +196
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srprash @wangzlei the previously deprecated io.opentelemetry.semconv.ResourceAttributes was removed in the latest semconv (RC) artifact, and the deprecated attributes in io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes don't go back far enough to still include the deprecated container.image.tag, so I went ahead and updated it to container.image.tags

parsedImage.getTag());
}
break;
Expand Down
2 changes: 2 additions & 0 deletions aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ private IncubatingAttributes() {}
public static final AttributeKey<String> CLOUD_REGION = AttributeKey.stringKey("cloud.region");
public static final AttributeKey<String> CLOUD_RESOURCE_ID =
AttributeKey.stringKey("cloud.resource_id");
public static final AttributeKey<List<String>> CONTAINER_IMAGE_TAGS =
AttributeKey.stringArrayKey("container.image.tags");

public static final class CloudPlatformIncubatingValues {
public static final String AWS_EC2 = "aws_ec2";
Expand Down
21 changes: 8 additions & 13 deletions aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_IMAGE_NAME;
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_IMAGE_TAGS;
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_NAME;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.entry;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -52,8 +54,6 @@ class EcsResourceTest {

@Mock private SimpleHttpClient mockHttpClient;

// Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
@SuppressWarnings("deprecation")
@Test
void testCreateAttributesV3() throws IOException {
Map<String, String> mockSysEnv = new HashMap<>();
Expand All @@ -78,7 +78,7 @@ void testCreateAttributesV3() throws IOException {
entry(CONTAINER_NAME, "ecs-nginx-5-nginx-curl-ccccb9f49db0dfe0d901"),
entry(CONTAINER_ID, "43481a6ce4842eec8fe72fc28500c6b52edcc0917f105b83379f88cac1ff3946"),
entry(CONTAINER_IMAGE_NAME, "nrdlngr/nginx-curl"),
entry(io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG, "latest"),
entry(CONTAINER_IMAGE_TAGS, singletonList("latest")),
entry(AWS_ECS_CLUSTER_ARN, "arn:aws:ecs:us-east-2:012345678910:cluster/default"),
entry(
AttributeKey.stringKey("aws.ecs.container.image.id"),
Expand All @@ -90,8 +90,6 @@ void testCreateAttributesV3() throws IOException {
entry(AWS_ECS_TASK_REVISION, "5"));
}

// Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
@SuppressWarnings("deprecation")
@Test
void testCreateAttributesV4() throws IOException {
Map<String, String> mockSysEnv = new HashMap<>();
Expand Down Expand Up @@ -119,25 +117,22 @@ void testCreateAttributesV4() throws IOException {
entry(CONTAINER_NAME, "ecs-curltest-26-curl-cca48e8dcadd97805600"),
entry(CONTAINER_ID, "ea32192c8553fbff06c9340478a2ff089b2bb5646fb718b4ee206641c9086d66"),
entry(CONTAINER_IMAGE_NAME, "111122223333.dkr.ecr.us-west-2.amazonaws.com/curltest"),
entry(io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG, "latest"),
entry(CONTAINER_IMAGE_TAGS, singletonList("latest")),
entry(
AttributeKey.stringKey("aws.ecs.container.image.id"),
"sha256:d691691e9652791a60114e67b365688d20d19940dde7c4736ea30e660d8d3553"),
entry(AWS_ECS_CLUSTER_ARN, "arn:aws:ecs:us-west-2:111122223333:cluster/default"),
entry(
AWS_ECS_CONTAINER_ARN,
"arn:aws:ecs:us-west-2:111122223333:container/0206b271-b33f-47ab-86c6-a0ba208a70a9"),
entry(AWS_LOG_GROUP_NAMES, Collections.singletonList("/ecs/metadata")),
entry(AWS_LOG_GROUP_NAMES, singletonList("/ecs/metadata")),
entry(
AWS_LOG_GROUP_ARNS,
Collections.singletonList(
"arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata")),
entry(
AWS_LOG_STREAM_NAMES,
Collections.singletonList("ecs/curl/8f03e41243824aea923aca126495f665")),
singletonList("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata")),
entry(AWS_LOG_STREAM_NAMES, singletonList("ecs/curl/8f03e41243824aea923aca126495f665")),
entry(
AWS_LOG_STREAM_ARNS,
Collections.singletonList(
singletonList(
"arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:log-stream:ecs/curl/8f03e41243824aea923aca126495f665")),
entry(
AWS_ECS_TASK_ARN,
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
`java-platform`
}

val otelInstrumentationVersion = "2.12.0-alpha"
val otelInstrumentationVersion = "2.13.0-alpha"
val semconvVersion = "1.30.0-rc.1"

javaPlatform {
Expand Down
Loading