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

CI for otel-swift branch #1648

Closed
wants to merge 7 commits into from
Closed

CI for otel-swift branch #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7afc93a
Make ClientRuntime dependency to use otel-swift branch for the OTel t…
Jul 25, 2024
bcac123
Merge branch 'main' into otel-swift
Jul 26, 2024
72e241f
update codegen on otel-swift
dayaffe Aug 14, 2024
918bc08
remove self from serviceName
dayaffe Aug 14, 2024
ffe332a
merge 'main' into otel-swift
dayaffe Aug 20, 2024
cad06ea
Merge branch 'main' into otel-swift
dayaffe Aug 27, 2024
c6f6780
Merge branch 'main' into otel-swift
jbelkins Sep 5, 2024
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
8 changes: 2 additions & 6 deletions AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,9 @@ func addClientRuntimeDependency(_ version: Version) {
package.dependencies += [
.package(path: "../smithy-swift")
]
case (false, true):
default:
package.dependencies += [
.package(url: smithySwiftURL, branch: "main")
]
case (false, false):
package.dependencies += [
.package(url: smithySwiftURL, exact: version)
.package(url: smithySwiftURL, branch: "otel-swift")
]
}
}
Expand Down
8 changes: 2 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,9 @@ func addClientRuntimeDependency(_ version: Version) {
package.dependencies += [
.package(path: "../smithy-swift")
]
case (false, true):
default:
package.dependencies += [
.package(url: smithySwiftURL, branch: "main")
]
case (false, false):
package.dependencies += [
.package(url: smithySwiftURL, exact: version)
.package(url: smithySwiftURL, branch: "otel-swift")
]
}
}
Expand Down
12 changes: 12 additions & 0 deletions Sources/Services/AWSEC2/Sources/AWSEC2/EC2Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5242,6 +5242,8 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -5308,6 +5310,7 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -10297,6 +10300,8 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -10362,6 +10367,7 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -18473,6 +18479,8 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -18538,6 +18546,7 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -36750,6 +36759,8 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -36828,6 +36839,7 @@ extension EC2Client {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down
12 changes: 12 additions & 0 deletions Sources/Services/AWSGlue/Sources/AWSGlue/GlueClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,8 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -1366,6 +1368,7 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -6881,6 +6884,8 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -7029,6 +7034,7 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -11654,6 +11660,8 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -11799,6 +11807,7 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -12760,6 +12769,8 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -12833,6 +12844,7 @@ extension GlueClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down
3 changes: 3 additions & 0 deletions ...oWebRTCStorage/Sources/AWSKinesisVideoWebRTCStorage/KinesisVideoWebRTCStorageClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ extension KinesisVideoWebRTCStorageClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -343,6 +345,7 @@ extension KinesisVideoWebRTCStorageClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down
6 changes: 6 additions & 0 deletions Sources/Services/AWSLambda/Sources/AWSLambda/LambdaClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2109,6 +2109,8 @@ extension LambdaClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -2179,6 +2181,7 @@ extension LambdaClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -4176,6 +4179,8 @@ extension LambdaClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -4250,6 +4255,7 @@ extension LambdaClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down
12 changes: 12 additions & 0 deletions Sources/Services/AWSResiliencehub/Sources/AWSResiliencehub/ResiliencehubClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,6 +2015,8 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -2089,6 +2091,7 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -3190,6 +3193,8 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -3262,6 +3267,7 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -3780,6 +3786,8 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -3854,6 +3862,7 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -4081,6 +4090,8 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
<<<<<<< HEAD
=======
))
.executeRequest(client)
.build()
Expand Down Expand Up @@ -4156,6 +4167,7 @@ extension ResiliencehubClient {
metricsAttributes: metricsAttributes,
meterScope: serviceName,
tracerScope: serviceName
>>>>>>> main
))
.executeRequest(client)
.build()
Expand Down
Loading