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.

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

chore: pin otel version #563

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/dispatch_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
name: Lookup Version
if: ${{ inputs.version-type == 'current' }}
secrets: inherit
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
with:
task-name: ${{ vars.IMAGE_NAME }}
aws-region: ${{ vars.AWS_REGION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dispatch_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

release:
name: Release
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
secrets: inherit
with:
infra-changed: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/event_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
release:
name: Release
needs: [ paths_filter ]
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
secrets: inherit
with:
infra-changed: ${{ needs.paths_filter.outputs.infra == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sub-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cd-staging:
name: Staging
secrets: inherit
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
with:
deploy-infra: ${{ inputs.deploy-infra }}
deploy-app: ${{ inputs.deploy-app }}
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
needs: [ validate-staging-health, validate-staging-rust ]
if: ${{ inputs.deploy-prod }}
secrets: inherit
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
with:
deploy-infra: ${{ inputs.deploy-infra }}
deploy-app: ${{ inputs.deploy-app }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sub-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
ci:
name: /
secrets: inherit
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].9
uses: WalletConnect/ci_workflows/.github/workflows/[email protected].15
with:
check-infra: ${{ inputs.check-infra }}
check-app: ${{ inputs.check-app }}
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
token: ${{ secrets.RELEASE_PAT }}
token: ${{ secrets.PRIVATE_SUBMODULE_ACCESS_TOKEN }}

- name: Install Rust ${{ vars.RUST_VERSION }}
uses: WalletConnect/actions-rs/[email protected]
Expand Down
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
[submodule "rs-relay"]
path = rs-relay
url = [email protected]:WalletConnect/rs-relay.git
branch = chore/test-irn-cluster
16 changes: 12 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rs-relay
1 change: 1 addition & 0 deletions src/config/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub struct LocalConfiguration {
#[serde(default = "default_postgres_max_connections")]
pub postgres_max_connections: u32,
#[serde(default = "default_redis_url")]
#[allow(unused)] // TODO remove
pub redis_url: String,
#[serde(default = "default_keypair_seed")]
pub keypair_seed: String,
Expand Down
3 changes: 1 addition & 2 deletions src/model/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -644,11 +644,10 @@ impl From<SubscriberWithProjectResult> for SubscriberWithProject {
unread_notification_count: val
.unread_notification_count
.try_into()
.map_err(|e| {
.inspect_err(|e| {
// This error shouldn't happen so not bothering with returning Result here
// But if it does, this is a bug and apply use defensive programming
error!("Error converting unread_notification_count from i64 to u64: {e}");
e
})
.unwrap_or(0),
}
Expand Down
1 change: 1 addition & 0 deletions src/registry/storage/redis/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ impl Redis {
self.read_pool.clone()
}

#[allow(dependency_on_unit_never_type_fallback)] // can't figure out how to fix this right now
async fn set_internal(
&self,
key: &str,
Expand Down
137 changes: 49 additions & 88 deletions terraform/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions terraform/ecs/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ locals {
task_cpu = module.this.stage == "prod" ? var.task_cpu : 256
task_memory = module.this.stage == "prod" ? var.task_memory : 512

otel_port = var.port + 1
otel_cpu = 128
otel_memory = 128
otel_image_tag = "v0.35.1"
otel_port = var.port + 1
otel_cpu = 128
otel_memory = 128

file_descriptor_soft_limit = pow(2, 18)
file_descriptor_hard_limit = local.file_descriptor_soft_limit * 2
Expand Down Expand Up @@ -139,7 +140,7 @@ resource "aws_ecs_task_definition" "app_task" {
# Forward telemetry data to AWS CloudWatch
{
name = "aws-otel-collector",
image = "public.ecr.aws/aws-observability/aws-otel-collector:latest",
image = "public.ecr.aws/aws-observability/aws-otel-collector:${local.otel_image_tag}",
cpu = local.otel_cpu,
memory = local.otel_memory,
essential = true,
Expand Down
Loading