Skip to content

Commit 49d738d

Browse files
renovate[bot]trask
andauthored
fix(deps): update dependency com.google.guava:guava-bom to v33.4.0-jre (#1611)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent be9aee0 commit 49d738d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
1212
import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID;
1313
import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_NAMESPACE;
14+
import static java.nio.charset.StandardCharsets.UTF_8;
1415
import static org.assertj.core.api.Assertions.entry;
1516

16-
import com.google.common.base.Charsets;
1717
import com.google.common.io.Files;
1818
import io.opentelemetry.api.common.Attributes;
1919
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -33,7 +33,7 @@ void testCreateAttributes(@TempDir File tempFolder) throws IOException {
3333
String content =
3434
"{\"noise\": \"noise\", \"deployment_id\":4,\""
3535
+ "version_label\":\"2\",\"environment_name\":\"HttpSubscriber-env\"}";
36-
Files.write(content.getBytes(Charsets.UTF_8), file);
36+
Files.write(content.getBytes(UTF_8), file);
3737
Resource resource = BeanstalkResource.buildResource(file.getPath());
3838
Attributes attributes = resource.getAttributes();
3939
assertThat(attributes)
@@ -59,7 +59,7 @@ void testBadConfigFile(@TempDir File tempFolder) throws IOException {
5959
String content =
6060
"\"deployment_id\":4,\"version_label\":\"2\",\""
6161
+ "environment_name\":\"HttpSubscriber-env\"}";
62-
Files.write(content.getBytes(Charsets.UTF_8), file);
62+
Files.write(content.getBytes(UTF_8), file);
6363
Attributes attributes = BeanstalkResource.buildResource(file.getPath()).getAttributes();
6464
assertThat(attributes).isEmpty();
6565
}

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");

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ val otelInstrumentationVersion = "2.10.0-alpha"
1111

1212
val DEPENDENCY_BOMS = listOf(
1313
"com.fasterxml.jackson:jackson-bom:2.18.2",
14-
"com.google.guava:guava-bom:33.3.1-jre",
14+
"com.google.guava:guava-bom:33.4.0-jre",
1515
"com.linecorp.armeria:armeria-bom:1.31.3",
1616
"org.junit:junit-bom:5.11.4",
1717
"io.grpc:grpc-bom:1.69.0",

0 commit comments

Comments
 (0)