Skip to content

Migrate C# telemetry generator to .NET AWSDK v4 #1082

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

Merged
merged 7 commits into from
Sep 17, 2025
Merged

Migrate C# telemetry generator to .NET AWSDK v4 #1082

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbd4968
Migrate C# telemetry generator to use .NET AWSSDK v4
shruti0085 Sep 12, 2025
0d3caac
Add new testServiceModels folder to match updated generator params
shruti0085 Sep 12, 2025
c834f7f
Use a partial config file to address the missing DetermineServiceEndp…
shruti0085 Sep 12, 2025
5fc72ac
create testservicemodel file as part of script
shruti0085 Sep 13, 2025
a4864d5
minor fix
shruti0085 Sep 13, 2025
9783685
Bump SDK to latest version
shruti0085 Sep 16, 2025
05d6d1a
Bump dotnet tag to latest
shruti0085 Sep 16, 2025
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
Binary file added TestServiceModels/.gitkeep
View file
Open in desktop
Copy link
Contributor

@awschristou awschristou Sep 12, 2025

Choose a reason for hiding this comment

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

What is this?

Copy link
Contributor Author

@shruti0085 shruti0085 Sep 12, 2025

Choose a reason for hiding this comment

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

added it to the description. Its required by the updated sdk generator to be present in the directory structure

Copy link
Contributor Author

@shruti0085 shruti0085 Sep 13, 2025

Choose a reason for hiding this comment

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

Removed it and made it part of the script

Binary file not shown.
7,962 changes: 5,610 additions & 2,352 deletions telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/Generated/GeneratedCode.cs
View file
Open in desktop
Copy link
Contributor

@awschristou awschristou Sep 12, 2025

Choose a reason for hiding this comment

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

Just calling out that this file naturally has a large diff because it isn't updated each time the telemetry definition json file is updated. This file isn't changed as a result of Shruti's change, nor am I concerned about it.

Copy link
Contributor Author

@shruti0085 shruti0085 Sep 12, 2025

Choose a reason for hiding this comment

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

Yes, the generator is auto generated

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion telemetry/csharp/AwsToolkit.Telemetry.SDK/AwsToolkit.Telemetry.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<AssemblyOriginatorKeyFile>..\toolkit-telemetry.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.13.1" />
<PackageReference Include="AWSSDK.Core" Version="4.0.0.18" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion telemetry/csharp/AwsToolkit.Telemetry.SDK/AwsToolkit.Telemetry.SDK.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<tags>AWS AWSToolkit</tags>
<dependencies>
<group targetFramework="net472">
<dependency id="AWSSDK.Core" version="3.7.13.1" />
<dependency id="AWSSDK.Core" version="4.0.0.18" />
</group>
</dependencies>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion telemetry/csharp/TelemetryClient.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<BuildRoot Condition="'$(BuildRoot)' == ''">$(MSBuildThisFileDirectory)</BuildRoot>

<BuildTemp>$(BuildRoot)buildtemp\</BuildTemp>
<DotNetSdkTag>3.7.354.0</DotNetSdkTag>
<DotNetSdkTag>4.0.65.0</DotNetSdkTag>
<DotNetSdkClone>$(BuildTemp)dotnetsdk\</DotNetSdkClone>
<SdkGeneratorRoot>$(DotNetSdkClone)generator\</SdkGeneratorRoot>
<SdkGenerator>$(SdkGeneratorRoot)ServiceClientGenerator\bin\Release\ServiceClientGenerator.exe</SdkGenerator>
Expand Down
4 changes: 2 additions & 2 deletions telemetry/csharp/client-generator-inputs/sdk-versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"file-description": "This file is used by the SDK Client Generator. See telemetry/csharp/README.md for details",
"ProductVersion": "3.3.716.0",
"CoreVersion": "3.3.106.2",
"ProductVersion": "4.0.65.0",
"CoreVersion": "4.0.0.18",
"DefaultToPreview": false,
"ServiceVersions": {
"ToolkitTelemetry": {
Expand Down
9 changes: 7 additions & 2 deletions telemetry/csharp/client-generator-inputs/telemetry-2017-07-25.customizations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{
"file-description": "This file is used by the SDK Client Generator. See telemetry/csharp/README.md for details"
}
"file-description": "This file is used by the SDK Client Generator. See telemetry/csharp/README.md for details",
"customizations": {
"AmazonToolkitTelemetryConfig": {
"customCode": "public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(Amazon.Runtime.Internal.ServiceOperationEndpointParameters parameters) { return base.DetermineServiceOperationEndpoint(parameters); }"
}
}
}
Loading