fix: upgrade otel #334

chris13524 · 2024-05-20T16:08:24Z

Description

There were some dependencies on old versions of OTEL which were making implementation of Histograms a little tricky. Removing these old versions.

This also removes OTEL tracing which I think doesn't even work anyway.

How Has This Been Tested?

Not tested

Due Diligence

Breaking change
Requires a documentation update
Requires a e2e/integration test update

github-actions · 2024-05-20T16:09:25Z

Show Plan


[command]/home/runner/work/_temp/9acc4f07-75d0-480b-8052-92959ba119a5/terraform-bin -chdir=terraform show -no-color /tmp/plan.tfplan

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-04741ebca102662ab",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_service.app_service will be updated in-place
  ~ resource "aws_ecs_service" "app_service" {
        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"
        name                               = "staging-push-service"
        tags                               = {}
      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
        # (15 unchanged attributes hidden)

        # (4 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced
-/+ resource "aws_ecs_task_definition" "app_task_definition" {
      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)
      ~ container_definitions    = (sensitive value) # forces replacement
      ~ id                       = "staging-push" -> (known after apply)
      ~ revision                 = 188 -> (known after apply)
      - tags                     = {} -> null
        # (11 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-tenant-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-015df0c2c450c2046",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

Plan: 1 to add, 3 to change, 1 to destroy.
::debug::Terraform exited with code 0.
::debug::stdout: %0ATerraform used the selected providers to generate the following execution%0Aplan. Resource actions are indicated with the following symbols:%0A  ~ update in-place%0A-/+ destroy and then create replacement%0A%0ATerraform will perform the following actions:%0A%0A  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-04741ebca102662ab",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_service.app_service will be updated in-place%0A  ~ resource "aws_ecs_service" "app_service" {%0A        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"%0A        name                               = "staging-push-service"%0A        tags                               = {}%0A      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A        # (15 unchanged attributes hidden)%0A%0A        # (4 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced%0A-/+ resource "aws_ecs_task_definition" "app_task_definition" {%0A      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)%0A      ~ container_definitions    = (sensitive value) # forces replacement%0A      ~ id                       = "staging-push" -> (known after apply)%0A      ~ revision                 = 188 -> (known after apply)%0A      - tags                     = {} -> null%0A        # (11 unchanged attributes hidden)%0A%0A        # (1 unchanged block hidden)%0A    }%0A%0A  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-tenant-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-015df0c2c450c2046",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0APlan: 1 to add, 3 to change, 1 to destroy.%0A
::debug::stderr: 
::debug::exitcode: 0

Action: pull_request

github-actions · 2024-05-20T16:10:24Z

Show Plan


[command]/home/runner/work/_temp/768ca898-28b4-4e57-802e-47cfd7c1f15f/terraform-bin -chdir=terraform show -no-color /tmp/plan.tfplan

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-04741ebca102662ab",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_service.app_service will be updated in-place
  ~ resource "aws_ecs_service" "app_service" {
        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"
        name                               = "staging-push-service"
        tags                               = {}
      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
        # (15 unchanged attributes hidden)

        # (4 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced
-/+ resource "aws_ecs_task_definition" "app_task_definition" {
      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)
      ~ container_definitions    = (sensitive value) # forces replacement
      ~ id                       = "staging-push" -> (known after apply)
      ~ revision                 = 188 -> (known after apply)
      - tags                     = {} -> null
        # (11 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-tenant-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-015df0c2c450c2046",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

Plan: 1 to add, 3 to change, 1 to destroy.
::debug::Terraform exited with code 0.
::debug::stdout: %0ATerraform used the selected providers to generate the following execution%0Aplan. Resource actions are indicated with the following symbols:%0A  ~ update in-place%0A-/+ destroy and then create replacement%0A%0ATerraform will perform the following actions:%0A%0A  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-04741ebca102662ab",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_service.app_service will be updated in-place%0A  ~ resource "aws_ecs_service" "app_service" {%0A        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"%0A        name                               = "staging-push-service"%0A        tags                               = {}%0A      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A        # (15 unchanged attributes hidden)%0A%0A        # (4 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced%0A-/+ resource "aws_ecs_task_definition" "app_task_definition" {%0A      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)%0A      ~ container_definitions    = (sensitive value) # forces replacement%0A      ~ id                       = "staging-push" -> (known after apply)%0A      ~ revision                 = 188 -> (known after apply)%0A      - tags                     = {} -> null%0A        # (11 unchanged attributes hidden)%0A%0A        # (1 unchanged block hidden)%0A    }%0A%0A  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-tenant-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-015df0c2c450c2046",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0APlan: 1 to add, 3 to change, 1 to destroy.%0A
::debug::stderr: 
::debug::exitcode: 0

Action: pull_request

github-actions · 2024-05-20T16:11:18Z

Show Plan


[command]/home/runner/work/_temp/91345f32-d1bf-4d1f-b05d-36b41b12cb46/terraform-bin -chdir=terraform show -no-color /tmp/plan.tfplan

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-04741ebca102662ab",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_service.app_service will be updated in-place
  ~ resource "aws_ecs_service" "app_service" {
        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"
        name                               = "staging-push-service"
        tags                               = {}
      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
        # (15 unchanged attributes hidden)

        # (4 unchanged blocks hidden)
    }

  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced
-/+ resource "aws_ecs_task_definition" "app_task_definition" {
      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)
      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)
      ~ container_definitions    = (sensitive value) # forces replacement
      ~ id                       = "staging-push" -> (known after apply)
      ~ revision                 = 188 -> (known after apply)
      - tags                     = {} -> null
        # (11 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place
  ~ resource "aws_rds_cluster" "this" {
        id                                  = "staging-push-tenant-database"
        tags                                = {}
      ~ vpc_security_group_ids              = [
          - "sg-015df0c2c450c2046",
            # (1 unchanged element hidden)
        ]
        # (44 unchanged attributes hidden)

        # (2 unchanged blocks hidden)
    }

Plan: 1 to add, 3 to change, 1 to destroy.
::debug::Terraform exited with code 0.
::debug::stdout: %0ATerraform used the selected providers to generate the following execution%0Aplan. Resource actions are indicated with the following symbols:%0A  ~ update in-place%0A-/+ destroy and then create replacement%0A%0ATerraform will perform the following actions:%0A%0A  # module.database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-04741ebca102662ab",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_service.app_service will be updated in-place%0A  ~ resource "aws_ecs_service" "app_service" {%0A        id                                 = "arn:aws:ecs:eu-central-1:898587786287:service/staging-push/staging-push-service"%0A        name                               = "staging-push-service"%0A        tags                               = {}%0A      ~ task_definition                    = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A        # (15 unchanged attributes hidden)%0A%0A        # (4 unchanged blocks hidden)%0A    }%0A%0A  # module.ecs.aws_ecs_task_definition.app_task_definition must be replaced%0A-/+ resource "aws_ecs_task_definition" "app_task_definition" {%0A      ~ arn                      = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push:188" -> (known after apply)%0A      ~ arn_without_revision     = "arn:aws:ecs:eu-central-1:898587786287:task-definition/staging-push" -> (known after apply)%0A      ~ container_definitions    = (sensitive value) # forces replacement%0A      ~ id                       = "staging-push" -> (known after apply)%0A      ~ revision                 = 188 -> (known after apply)%0A      - tags                     = {} -> null%0A        # (11 unchanged attributes hidden)%0A%0A        # (1 unchanged block hidden)%0A    }%0A%0A  # module.tenant_database_cluster.aws_rds_cluster.this[0] will be updated in-place%0A  ~ resource "aws_rds_cluster" "this" {%0A        id                                  = "staging-push-tenant-database"%0A        tags                                = {}%0A      ~ vpc_security_group_ids              = [%0A          - "sg-015df0c2c450c2046",%0A            # (1 unchanged element hidden)%0A        ]%0A        # (44 unchanged attributes hidden)%0A%0A        # (2 unchanged blocks hidden)%0A    }%0A%0APlan: 1 to add, 3 to change, 1 to destroy.%0A
::debug::stderr: 
::debug::exitcode: 0

Action: pull_request

chris13524 · 2024-05-20T16:24:11Z

src/lib.rs

-        .route("/health", get(handlers::health::handler).layer(
-            axum::middleware::from_fn_with_state(state_arc.clone(), rate_limit_middleware),
-        ))
+        .route("/health", get(handlers::health::handler))


Removes rate limits on /health as 1) they aren't needed and 2) they fail to resolve the Forwarded-For header anyway since it's called internally

chris13524 requested review from geekbrother and nopestack May 20, 2024 16:08

chris13524 self-assigned this May 20, 2024

arein added the accepted The issue has been accepted into the project label May 20, 2024

chris13524 temporarily deployed to staging May 20, 2024 16:08 — with GitHub Actions Inactive

fix: upgrade otel

9f25735

chris13524 force-pushed the fix/upgrade-otel branch from 5a1fb44 to 9f25735 Compare May 20, 2024 16:09

geekbrother approved these changes May 20, 2024

View reviewed changes

chris13524 temporarily deployed to staging May 20, 2024 16:09 — with GitHub Actions Inactive

chore: remove unused error variants

ccc7875

chris13524 temporarily deployed to staging May 20, 2024 16:10 — with GitHub Actions Inactive

chris13524 commented May 20, 2024

View reviewed changes

chris13524 merged commit 7086406 into main May 20, 2024
9 checks passed

chris13524 deleted the fix/upgrade-otel branch May 20, 2024 17:58

chris13524 mentioned this pull request May 20, 2024

fix: Postgres query metrics #335

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: upgrade otel #334

fix: upgrade otel #334

chris13524 commented May 20, 2024 •

edited

Loading

github-actions bot commented May 20, 2024

github-actions bot commented May 20, 2024

github-actions bot commented May 20, 2024

chris13524 May 20, 2024

fix: upgrade otel #334

fix: upgrade otel #334

Conversation

chris13524 commented May 20, 2024 • edited Loading

Description

How Has This Been Tested?

Due Diligence

github-actions bot commented May 20, 2024

github-actions bot commented May 20, 2024

github-actions bot commented May 20, 2024

chris13524 May 20, 2024

Choose a reason for hiding this comment

chris13524 commented May 20, 2024 •

edited

Loading