Skip to content

Commit e2abf62

Browse files
committed
Update patch.
1 parent b85f877 commit e2abf62

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

.github/patches/opentelemetry-java-instrumentation.patch

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,10 +1387,10 @@ index 0000000000..e9d2c32262
13871387
+}
13881388
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractLambdaClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractLambdaClientTest.java
13891389
new file mode 100644
1390-
index 0000000000..eb2cca3574
1390+
index 0000000000..f6ab4363bf
13911391
--- /dev/null
13921392
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractLambdaClientTest.java
1393-
@@ -0,0 +1,69 @@
1393+
@@ -0,0 +1,66 @@
13941394
+/*
13951395
+ * Copyright The OpenTelemetry Authors
13961396
+ * SPDX-License-Identifier: Apache-2.0
@@ -1425,8 +1425,8 @@ index 0000000000..eb2cca3574
14251425
+ @ParameterizedTest
14261426
+ @MethodSource("provideArguments")
14271427
+ public void testSendRequestWithMockedResponse(
1428-
+ String operation, Map<String, String> additionalAttributes,
1429-
+ Function<AWSLambda, Object> call) throws Exception {
1428+
+ String operation, Map<String, String> additionalAttributes, Function<AWSLambda, Object> call)
1429+
+ throws Exception {
14301430
+
14311431
+ AWSLambdaClientBuilder clientBuilder = AWSLambdaClientBuilder.standard();
14321432
+
@@ -1449,20 +1449,17 @@ index 0000000000..eb2cca3574
14491449
+ "GetEventSourceMapping",
14501450
+ ImmutableMap.of("aws.lambda.resource_mapping.id", "uuid"),
14511451
+ (Function<AWSLambda, Object>)
1452-
+ c -> c.getEventSourceMapping(
1453-
+ new GetEventSourceMappingRequest().withUUID("uuid"))),
1454-
+
1452+
+ c -> c.getEventSourceMapping(new GetEventSourceMappingRequest().withUUID("uuid"))),
14551453
+ Arguments.of(
14561454
+ "GetFunction",
14571455
+ ImmutableMap.of("aws.lambda.function.name", "functionName"),
14581456
+ (Function<AWSLambda, Object>)
1459-
+ c -> c.getFunction(
1460-
+ new GetFunctionRequest().withFunctionName("functionName"))));
1457+
+ c -> c.getFunction(new GetFunctionRequest().withFunctionName("functionName"))));
14611458
+ }
14621459
+}
14631460
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java
14641461
new file mode 100644
1465-
index 0000000000..733da3d453
1462+
index 0000000000..f3fa5ad08c
14661463
--- /dev/null
14671464
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java
14681465
@@ -0,0 +1,58 @@
@@ -1476,15 +1473,16 @@ index 0000000000..733da3d453
14761473
+import com.amazonaws.services.secretsmanager.AWSSecretsManager;
14771474
+import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
14781475
+import com.amazonaws.services.secretsmanager.model.CreateSecretRequest;
1476+
+import com.google.common.collect.ImmutableMap;
14791477
+import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
14801478
+import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
14811479
+import io.opentelemetry.testing.internal.armeria.common.MediaType;
1482-
+import com.google.common.collect.ImmutableMap;
14831480
+import org.junit.jupiter.api.Test;
14841481
+
14851482
+public abstract class AbstractSecretsManagerClientTest extends AbstractBaseAwsClientTest {
14861483
+
1487-
+ public abstract AWSSecretsManagerClientBuilder configureClient(AWSSecretsManagerClientBuilder client);
1484+
+ public abstract AWSSecretsManagerClientBuilder configureClient(
1485+
+ AWSSecretsManagerClientBuilder client);
14881486
+
14891487
+ @Override
14901488
+ protected boolean hasRequestId() {
@@ -1508,10 +1506,9 @@ index 0000000000..733da3d453
15081506
+ + "}";
15091507
+ server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
15101508
+
1511-
+ Object response = client.createSecret(
1512-
+ new CreateSecretRequest()
1513-
+ .withName("secretName")
1514-
+ .withSecretString("secretValue"));
1509+
+ Object response =
1510+
+ client.createSecret(
1511+
+ new CreateSecretRequest().withName("secretName").withSecretString("secretValue"));
15151512
+
15161513
+ assertRequestWithMockedResponse(
15171514
+ response,
@@ -1613,10 +1610,10 @@ index 4a728f645c..4499e550e0 100644
16131610
}
16141611
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractStepFunctionsClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractStepFunctionsClientTest.java
16151612
new file mode 100644
1616-
index 0000000000..2536bc538d
1613+
index 0000000000..24a1f148ee
16171614
--- /dev/null
16181615
+++ b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractStepFunctionsClientTest.java
1619-
@@ -0,0 +1,71 @@
1616+
@@ -0,0 +1,73 @@
16201617
+/*
16211618
+ * Copyright The OpenTelemetry Authors
16221619
+ * SPDX-License-Identifier: Apache-2.0
@@ -1652,8 +1649,10 @@ index 0000000000..2536bc538d
16521649
+ @ParameterizedTest
16531650
+ @MethodSource("provideArguments")
16541651
+ public void testSendRequestWithMockedResponse(
1655-
+ String operation, Map<String, String> additionalAttributes,
1656-
+ Function<AWSStepFunctions, Object> call) throws Exception {
1652+
+ String operation,
1653+
+ Map<String, String> additionalAttributes,
1654+
+ Function<AWSStepFunctions, Object> call)
1655+
+ throws Exception {
16571656
+
16581657
+ AWSStepFunctionsClientBuilder clientBuilder = AWSStepFunctionsClientBuilder.standard();
16591658
+

0 commit comments

Comments
 (0)