Skip to content

Commit ef58268

Browse files
committed
Fix deprecation warning
1 parent 9ea2938 commit ef58268

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/DockerHelperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.contrib.aws.resource;
77

8+
import static java.nio.charset.StandardCharsets.UTF_8;
89
import static org.assertj.core.api.Assertions.assertThat;
910

10-
import com.google.common.base.Charsets;
1111
import com.google.common.io.Files;
1212
import java.io.File;
1313
import java.io.IOException;
@@ -26,7 +26,7 @@ void testCgroupFileMissing() {
2626
void testContainerIdMissing(@TempDir File tempFolder) throws IOException {
2727
File file = new File(tempFolder, "no_container_id");
2828
String content = "13:pids:/\n" + "12:hugetlb:/\n" + "11:net_prio:/";
29-
Files.write(content.getBytes(Charsets.UTF_8), file);
29+
Files.write(content.getBytes(UTF_8), file);
3030

3131
DockerHelper dockerHelper = new DockerHelper(file.getPath());
3232
assertThat(dockerHelper.getContainerId()).isEmpty();
@@ -37,7 +37,7 @@ void testGetContainerId(@TempDir File tempFolder) throws IOException {
3737
File file = new File(tempFolder, "cgroup");
3838
String expected = "386a1920640799b5bf5a39bd94e489e5159a88677d96ca822ce7c433ff350163";
3939
String content = "dummy\n11:devices:/ecs/bbc36dd0-5ee0-4007-ba96-c590e0b278d2/" + expected;
40-
Files.write(content.getBytes(Charsets.UTF_8), file);
40+
Files.write(content.getBytes(UTF_8), file);
4141

4242
DockerHelper dockerHelper = new DockerHelper(file.getPath());
4343
assertThat(dockerHelper.getContainerId()).isEqualTo(expected);

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EksResourceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
1414
import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
1515
import static io.opentelemetry.semconv.incubating.K8sIncubatingAttributes.K8S_CLUSTER_NAME;
16+
import static java.nio.charset.StandardCharsets.UTF_8;
1617
import static org.assertj.core.api.Assertions.entry;
1718
import static org.mockito.ArgumentMatchers.any;
1819
import static org.mockito.Mockito.when;
1920

20-
import com.google.common.base.Charsets;
2121
import com.google.common.io.Files;
2222
import io.opentelemetry.api.common.Attributes;
2323
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -44,10 +44,10 @@ public class EksResourceTest {
4444
void testEks(@TempDir File tempFolder) throws IOException {
4545
File mockK8sTokenFile = new File(tempFolder, "k8sToken");
4646
String token = "token123";
47-
Files.write(token.getBytes(Charsets.UTF_8), mockK8sTokenFile);
47+
Files.write(token.getBytes(UTF_8), mockK8sTokenFile);
4848
File mockK8sKeystoreFile = new File(tempFolder, "k8sCert");
4949
String truststore = "truststore123";
50-
Files.write(truststore.getBytes(Charsets.UTF_8), mockK8sKeystoreFile);
50+
Files.write(truststore.getBytes(UTF_8), mockK8sKeystoreFile);
5151

5252
when(httpClient.fetchString(any(), Mockito.eq(K8S_SVC_URL + AUTH_CONFIGMAP_PATH), any(), any()))
5353
.thenReturn("not empty");

0 commit comments

Comments
 (0)