Skip to content

Commit 6a8ce19

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #482 from aws/staging/de1f6da1-4676-494e-881e-88c6a1b527c1
Pull request: release <- staging/de1f6da1-4676-494e-881e-88c6a1b527c1
2 parents 11ffe39 + b119612 commit 6a8ce19

File tree

235 files changed

+1306
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+1306
-502
lines changed

‎.changes/2.5.31.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"date": "2019-04-25",
3+
"version": "2.5.31",
4+
"entries": [
5+
{
6+
"category": "Amazon DynamoDB",
7+
"type": "feature",
8+
"description": "This update allows you to tag Amazon DynamoDB tables when you create them. Tags are labels you can attach to AWS resources to make them easier to manage, search, and filter."
9+
},
10+
{
11+
"category": "Amazon WorkSpaces",
12+
"type": "feature",
13+
"description": "Documentation updates for workspaces"
14+
},
15+
{
16+
"category": "Netty NIO Async Http Client",
17+
"type": "bugfix",
18+
"description": "Add workaround to await channel pools to be closed before shutting down EventLoopGroup to avoid the race condition between `channelPool.close` and `eventLoopGroup.shutdown`. See [#1109](https://github.com/aws/aws-sdk-java-v2/issues/1109)."
19+
},
20+
{
21+
"category": "Amazon GameLift",
22+
"type": "feature",
23+
"description": "This release introduces the new Realtime Servers feature, giving game developers a lightweight yet flexible solution that eliminates the need to build a fully custom game server. The AWS SDK updates provide support for scripts, which are used to configure and customize Realtime Servers."
24+
},
25+
{
26+
"category": "AWS Batch",
27+
"type": "feature",
28+
"description": "Documentation updates for AWS Batch."
29+
},
30+
{
31+
"category": "Amazon Inspector",
32+
"type": "feature",
33+
"description": "AWS Inspector - Improve the ListFindings API response time and decreases the maximum number of agentIDs from 500 to 99."
34+
},
35+
{
36+
"category": "AWS Lambda",
37+
"type": "feature",
38+
"description": "AWS Lambda now supports the GetLayerVersionByArn API."
39+
}
40+
]
41+
}

‎CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
# __2.5.31__ __2019-04-25__
2+
## __AWS Batch__
3+
- ### Features
4+
- Documentation updates for AWS Batch.
5+
6+
## __AWS Lambda__
7+
- ### Features
8+
- AWS Lambda now supports the GetLayerVersionByArn API.
9+
10+
## __Amazon DynamoDB__
11+
- ### Features
12+
- This update allows you to tag Amazon DynamoDB tables when you create them. Tags are labels you can attach to AWS resources to make them easier to manage, search, and filter.
13+
14+
## __Amazon GameLift__
15+
- ### Features
16+
- This release introduces the new Realtime Servers feature, giving game developers a lightweight yet flexible solution that eliminates the need to build a fully custom game server. The AWS SDK updates provide support for scripts, which are used to configure and customize Realtime Servers.
17+
18+
## __Amazon Inspector__
19+
- ### Features
20+
- AWS Inspector - Improve the ListFindings API response time and decreases the maximum number of agentIDs from 500 to 99.
21+
22+
## __Amazon WorkSpaces__
23+
- ### Features
24+
- Documentation updates for workspaces
25+
26+
## __Netty NIO Async Http Client__
27+
- ### Bugfixes
28+
- Add workaround to await channel pools to be closed before shutting down EventLoopGroup to avoid the race condition between `channelPool.close` and `eventLoopGroup.shutdown`. See [#1109](https://github.com/aws/aws-sdk-java-v2/issues/1109).
29+
130
# __2.5.30__ __2019-04-24__
231
## __AWS CloudFormation__
332
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can import the whole SDK into your project (includes all services) as follow
4545
<dependency>
4646
<groupId>software.amazon.awssdk</groupId>
4747
<artifactId>aws-sdk-java</artifactId>
48-
<version>2.5.30</version>
48+
<version>2.5.31</version>
4949
</dependency>
5050
```
5151

@@ -57,12 +57,12 @@ Alternatively you can add dependencies for the specific services you use only:
5757
<dependency>
5858
<groupId>software.amazon.awssdk</groupId>
5959
<artifactId>ec2</artifactId>
60-
<version>2.5.30</version>
60+
<version>2.5.31</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>software.amazon.awssdk</groupId>
6464
<artifactId>s3</artifactId>
65-
<version>2.5.30</version>
65+
<version>2.5.31</version>
6666
</dependency>
6767
```
6868

@@ -76,7 +76,7 @@ To automatically manage module versions (currently all modules have the same ver
7676
<dependency>
7777
<groupId>software.amazon.awssdk</groupId>
7878
<artifactId>bom</artifactId>
79-
<version>2.5.30</version>
79+
<version>2.5.31</version>
8080
<type>pom</type>
8181
<scope>import</scope>
8282
</dependency>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.30</version>
7+
<version>2.5.31</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.30</version>
7+
<version>2.5.31</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.30</version>
24+
<version>2.5.31</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.5.30</version>
10+
<version>2.5.31</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.5.30</version>
9+
<version>2.5.31</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.5.30</version>
25+
<version>2.5.31</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.5.30</version>
24+
<version>2.5.31</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.30</version>
10+
<version>2.5.31</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.30</version>
10+
<version>2.5.31</version>
1111
</parent>
1212

1313
<artifactId>aws-core</artifactId>

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.5.30</version>
24+
<version>2.5.31</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.30</version>
25+
<version>2.5.31</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-ion-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/aws-xml-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/protocols/protocol-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.30</version>
8+
<version>2.5.31</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/regions/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.5.30</version>
25+
<version>2.5.31</version>
2626
</parent>
2727

2828
<artifactId>regions</artifactId>

‎core/sdk-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>core</artifactId>
24-
<version>2.5.30</version>
24+
<version>2.5.31</version>
2525
</parent>
2626
<artifactId>sdk-core</artifactId>
2727
<name>AWS Java SDK :: SDK Core</name>

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/ClientType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
public enum ClientType {
2525

2626
ASYNC("Async"),
27-
SYNC("Sync");
27+
SYNC("Sync"),
28+
UNKNOWN("Unknown");
2829

2930
private final String clientType;
3031

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,11 @@ public ExecutableHttpRequest prepareRequest(HttpExecuteRequest request) {
390390
public void close() {
391391
// Do nothing, this client is managed by the customer.
392392
}
393+
394+
@Override
395+
public String clientName() {
396+
return delegate.clientName();
397+
}
393398
}
394399

395400
/**

‎core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyUserAgentStage.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@
1919
import java.util.stream.Collectors;
2020
import software.amazon.awssdk.annotations.SdkInternalApi;
2121
import software.amazon.awssdk.core.ApiName;
22+
import software.amazon.awssdk.core.ClientType;
2223
import software.amazon.awssdk.core.SdkSystemSetting;
2324
import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
2425
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
26+
import software.amazon.awssdk.core.client.config.SdkClientOption;
2527
import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
2628
import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
2729
import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
2830
import software.amazon.awssdk.core.internal.util.UserAgentUtils;
2931
import software.amazon.awssdk.http.SdkHttpFullRequest;
3032
import software.amazon.awssdk.utils.StringUtils;
33+
import software.amazon.awssdk.utils.http.SdkHttpUtils;
3134

3235
/**
3336
* Apply any custom user agent supplied, otherwise instrument the user agent with info about the SDK and environment.
@@ -37,6 +40,9 @@ public class ApplyUserAgentStage implements MutableRequestToRequestPipeline {
3740
private static final String COMMA = ", ";
3841
private static final String SPACE = " ";
3942

43+
private static final String IO = "io";
44+
private static final String HTTP = "http";
45+
4046
private static final String AWS_EXECUTION_ENV_PREFIX = "exec-env/";
4147

4248
private static final String HEADER_USER_AGENT = "User-Agent";
@@ -70,6 +76,24 @@ private StringBuilder getUserAgent(SdkClientConfiguration config, List<ApiName>
7076
userAgent.append(SPACE).append(AWS_EXECUTION_ENV_PREFIX).append(awsExecutionEnvironment.trim());
7177
}
7278

79+
ClientType clientType = clientConfig.option(SdkClientOption.CLIENT_TYPE);
80+
81+
if (clientType == null) {
82+
clientType = ClientType.UNKNOWN;
83+
}
84+
85+
userAgent.append(SPACE)
86+
.append(IO)
87+
.append("/")
88+
.append(StringUtils.lowerCase(clientType.name()));
89+
90+
String clientName = clientName(clientType);
91+
92+
userAgent.append(SPACE)
93+
.append(HTTP)
94+
.append("/")
95+
.append(SdkHttpUtils.urlEncode(clientName));
96+
7397
if (!requestApiNames.isEmpty()) {
7498
String requestUserAgent = requestApiNames.stream()
7599
.map(n -> n.name() + "/" + n.version())
@@ -94,4 +118,16 @@ private String addUserAgentSuffix(StringBuilder userAgent, SdkClientConfiguratio
94118

95119
return userAgent.toString();
96120
}
121+
122+
private String clientName(ClientType clientType) {
123+
if (clientType.equals(ClientType.SYNC)) {
124+
return clientConfig.option(SdkClientOption.SYNC_HTTP_CLIENT).clientName();
125+
}
126+
127+
if (clientType.equals(ClientType.ASYNC)) {
128+
return clientConfig.option(SdkClientOption.ASYNC_HTTP_CLIENT).clientName();
129+
}
130+
131+
return ClientType.UNKNOWN.name();
132+
}
97133
}

0 commit comments

Comments
 (0)