From 93648792b14301264c7fdbb4ea343b9092a0d7ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 27 Feb 2025 20:21:47 +0000 Subject: [PATCH] Switch to management.opentelemetry.resource-attributes in tests See gh-44468 --- ...ricsContainerConnectionDetailsFactoryIntegrationTests.java | 4 ++-- ...ricsContainerConnectionDetailsFactoryIntegrationTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index fed9b1ed06..f510959e92 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Eddú Meléndez */ @SpringJUnitConfig -@TestPropertySource(properties = { "management.otlp.metrics.export.resource-attributes.service.name=test", +@TestPropertySource(properties = { "management.opentelemetry.resource-attributes.service.name=test", "management.otlp.metrics.export.step=1s" }) @Testcontainers(disabledWithoutDocker = true) class GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index 50b558711e..4bbaa91cf6 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.matchesPattern; * @author Jonatan Ivanov */ @SpringJUnitConfig -@TestPropertySource(properties = { "management.otlp.metrics.export.resource-attributes.service.name=test", +@TestPropertySource(properties = { "management.opentelemetry.resource-attributes.service.name=test", "management.otlp.metrics.export.step=1s" }) @Testcontainers(disabledWithoutDocker = true) class OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests {