Skip to content

Commit 4661278

Browse files
committed
Removing S3 Express featureID
1 parent b8c5da8 commit 4661278

File tree

4 files changed

+1
-193
lines changed

4 files changed

+1
-193
lines changed

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,12 +921,6 @@ private MethodSpec setMetricValuesMethod() {
921921
+ "metrics -> endpoint.attribute($T.METRIC_VALUES).forEach(v -> metrics.addMetric(v)))",
922922
SdkInternalExecutionAttribute.class, AwsEndpointAttribute.class);
923923
b.endControlFlow();
924-
925-
if (endpointRulesSpecUtils.isS3()) {
926-
b.addStatement("$T.addS3ExpressBusinessMetricIfApplicable(executionAttributes)",
927-
ClassName.get("software.amazon.awssdk.services.s3.internal.s3express", "S3ExpressUtils"));
928-
}
929-
930924
return b.build();
931925
}
932926
}

core/sdk-core/src/main/java/software/amazon/awssdk/core/useragent/BusinessMetricFeatureId.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* An enum class representing a short form of identity providers to record in the UA string.
2424
*
25-
* Unimplemented metrics: I,K,M,O,S,U-c
25+
* Unimplemented metrics: I,J,K,M,O,S,U-c
2626
* Unsupported metrics (these will never be added): A,H
2727
*/
2828
@SdkProtectedApi
@@ -36,7 +36,6 @@ public enum BusinessMetricFeatureId {
3636
S3_TRANSFER("G"),
3737
GZIP_REQUEST_COMPRESSION("L"), //TODO(metrics): Not working, compression happens after header
3838
ENDPOINT_OVERRIDE("N"),
39-
S3_EXPRESS_BUCKET("J"),
4039
ACCOUNT_ID_MODE_PREFERRED("P"),
4140
ACCOUNT_ID_MODE_DISABLED("Q"),
4241
ACCOUNT_ID_MODE_REQUIRED("R"),

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3express/S3ExpressUtils.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,4 @@ public static boolean useS3ExpressAuthScheme(ExecutionAttributes executionAttrib
5858
}
5959
return false;
6060
}
61-
62-
/**
63-
* Adds S3 Express business metric if applicable for the current operation.
64-
*/
65-
public static void addS3ExpressBusinessMetricIfApplicable(ExecutionAttributes executionAttributes) {
66-
if (executionAttributes != null && useS3Express(executionAttributes) && useS3ExpressAuthScheme(executionAttributes)) {
67-
executionAttributes.getOptionalAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS)
68-
.ifPresent(businessMetrics ->
69-
businessMetrics.addMetric(BusinessMetricFeatureId.S3_EXPRESS_BUCKET.value()));
70-
}
71-
}
7261
}

services/s3/src/test/java/software/amazon/awssdk/services/s3/s3express/S3ExpressUserAgentTest.java

Lines changed: 0 additions & 174 deletions
This file was deleted.

0 commit comments

Comments
 (0)