Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgmt, update user-agent #13085

Merged
merged 7 commits into from
Jul 15, 2020
Merged

mgmt, update user-agent #13085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76f0bf3
update user-agent
weidongxu-microsoft Jul 13, 2020
05db46a
fix for toReactorContext issue
weidongxu-microsoft Jul 14, 2020
2e33ff8
copy UserAgentUtil until keyvault data
weidongxu-microsoft Jul 14, 2020
0fd94a5
read version from properties prepared by maven
weidongxu-microsoft Jul 14, 2020
912f1f7
nit
weidongxu-microsoft Jul 14, 2020
48effdd
fix checkstyle
weidongxu-microsoft Jul 14, 2020
74dc2c2
nit
weidongxu-microsoft Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
read version from properties prepared by maven
  • Loading branch information
@weidongxu-microsoft
weidongxu-microsoft committed Jul 14, 2020
commit 0fd94a5426981ea5a61dbb3e8fb4b106c3ffa210
8 changes: 8 additions & 0 deletions sdk/resources/mgmt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<legal>
<![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
<version>${project.version}</version>
</properties>

<developers>
Expand Down Expand Up @@ -88,6 +89,13 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
Comment on lines +91 to +96
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now doing this for version @yungezz


<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
12 changes: 9 additions & 3 deletions ...mgmt/src/main/java/com/azure/resourcemanager/resources/fluentcore/AzureServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.azure.core.management.polling.PollResult;
import com.azure.core.management.serializer.AzureJacksonAdapter;
import com.azure.core.util.Context;
import com.azure.core.util.CoreUtils;
import com.azure.core.util.logging.ClientLogger;
import com.azure.core.util.polling.AsyncPollResponse;
import com.azure.core.util.polling.LongRunningOperationStatus;
Expand Down Expand Up @@ -45,15 +46,17 @@ public abstract class AzureServiceClient {

private final ClientLogger logger = new ClientLogger(getClass());

private static final Map<String, String> PROPERTIES =
CoreUtils.getProperties("azure.properties");

protected AzureServiceClient(HttpPipeline httpPipeline, AzureEnvironment environment) {
((AzureJacksonAdapter) serializerAdapter).serializer().registerModule(DateTimeDeserializer.getModule());
}

private static final String SDK_VERSION = "2.0.0-SNAPSHOT";

private final SerializerAdapter serializerAdapter = new AzureJacksonAdapter();

private String sdkName;
private static String sdkVersion;

/**
* Gets serializer adapter for JSON serialization/de-serialization.
Expand All @@ -73,8 +76,11 @@ public Context getContext() {
if (sdkName == null) {
sdkName = this.getClass().getPackage().getName();
}
if (sdkVersion == null) {
sdkVersion = PROPERTIES.getOrDefault("version", "UnknownVersion");
}
return new Context("Sdk-Name", sdkName)
.addData("Sdk-Version", SDK_VERSION);
.addData("Sdk-Version", sdkVersion);
}

/**
Expand Down
1 change: 1 addition & 0 deletions sdk/resources/mgmt/src/main/resources/azure.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=${project.version}