Upgrade to Node 24 + start of OpenTelemetry implementation #2507

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

Closed

ludovicm67 wants to merge 33 commits into main from node-24-and-otel

.dockerignore

-Original file line number
+Diff line change
@@ -1,7 +1,11 @@
     .git
+    .github
+    .vscode
+    app/.github
+    app/node_modules
     .next
     *Dockerfile*
     # Ignore node_modules to prevent issues with wrong binaries
     node_modules
     .DS_Store
-    *.log
+    *.log

.github/workflows/base-checks.yml → .github/workflows/base-checks.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,9 +2,11 @@ name: Validate
  
    on:

      push:

        branches: [main]

        branches:

          - main

      pull_request:

        branches: [main]

        branches:

          - main

    jobs:

      base-checks:

    @@ -14,11 +16,11 @@ jobs:
  
          matrix:

            job: [lint, typecheck, test, knip]

        steps:

          - uses: actions/checkout@v4

          - uses: actions/checkout@v6

          - name: Setup node

            uses: actions/setup-node@v4

            uses: actions/setup-node@v6

            with:

              node-version: 22.x

              node-version: "lts/*"

              cache: "yarn"

              cache-dependency-path: "**/yarn.lock"

          - run: yarn install --immutable --prefer-offline

.github/workflows/e2e.yml → .github/workflows/e2e.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,7 @@
  
    name: E2E

    on: [deployment_status]

    on:

      - deployment_status

    jobs:

      e2e:

    @@ -12,13 +13,13 @@ jobs:
  
            shardIndex: [1, 2, 3, 4]

            shardTotal: [4]

        steps:

          - uses: actions/checkout@v4

          - uses: actions/checkout@v6

            with:

              # fetch all commits so we can find the branch

              fetch-depth: 0

          - uses: actions/setup-node@v4

          - uses: actions/setup-node@v6

            with:

              node-version: 22.x

              node-version: "lts/*"

              cache: "yarn"

              cache-dependency-path: "**/yarn.lock"

          - name: Install dependencies

    @@ -35,7 +36,7 @@ jobs:
  
              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

          - name: Upload blob report to GitHub Actions Artifacts

            if: ${{ !cancelled() }}

            uses: actions/upload-artifact@v4

            uses: actions/upload-artifact@v6

            with:

              name: blob-report-${{ matrix.shardIndex }}

              path: blob-report

.github/workflows/gitlab-mirror.yml → .github/workflows/gitlab-mirror.yaml

-Original file line number
+Diff line change
@@ -1,13 +1,15 @@
     name: GitLab Mirror
-    on: [push, delete]
+    on:
+      - push
+      - delete
     jobs:
       to_gitlab:
         runs-on: ubuntu-latest
         steps:
           - name: Checkout
-            uses: actions/checkout@v4
+            uses: actions/checkout@v6
             with:
               fetch-depth: 0
           - name: Logging
@@ Expand Down @@

.github/workflows/manual-load-test.yml → .github/workflows/manual-load-test.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -27,31 +27,28 @@ jobs: @@
         runs-on: ubuntu-latest
         steps:
           - name: Checkout
-            uses: actions/checkout@v4
+            uses: actions/checkout@v6
           - name: Testing GraphQL - Components
             if: always()
             uses: grafana/k6-action@v0.3.1
             with:
               filename: k6/load-tests/graphql/components.js
-              flags:
-                --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
+              flags: --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
                 env.ENABLE_GQL_SERVER_SIDE_CACHE }}
           - name: Testing GraphQL - Observations
             if: always()
             uses: grafana/k6-action@v0.3.1
             with:
               filename: k6/load-tests/graphql/observations.js
-              flags:
-                --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
+              flags: --env ENV=${{ env.ENV }} --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
                 env.ENABLE_GQL_SERVER_SIDE_CACHE }}
           - name: Testing HAR - Edition
             if: always()
             uses: grafana/k6-action@v0.3.1
             with:
               filename: k6/load-tests/har/${{ env.ENV }}/edition.js
-              flags:
-                --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
+              flags: --env ENABLE_GQL_SERVER_SIDE_CACHE=${{
                 env.ENABLE_GQL_SERVER_SIDE_CACHE }}

.github/workflows/performance-tests-pr.yml → .github/workflows/performance-tests-pr.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,10 +2,11 @@
  
    name: GraphQL performance tests (PR)

    on: [deployment_status]

    on:

      - deployment_status

    env:

      SUMMARY: ''

      SUMMARY: ""

    jobs:

      run_tests:

    @@ -14,16 +15,16 @@ jobs:
  
        runs-on: ubuntu-latest

        steps:

          - name: Check out

            uses: actions/checkout@v4

            uses: actions/checkout@v6

          - name: Send an HTTP request to start up the server

            run: |

              curl -s '${{ github.event.deployment_status.target_url }}/api/graphql' -X 'POST' -H 'Content-Type: application/json' -d '{"operationName":"DataCubeObservations","variables":{"locale":"en","sourceType":"sparql","sourceUrl":"https://lindas.admin.ch/query","cubeFilter":{"iri":"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9","filters":{"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/Kanton":{"type":"single","value":"https://ld.admin.ch/canton/1"}}}},"query":"query DataCubeObservations($sourceType: String!, $sourceUrl: DataSourceUrl!, $locale: String!, $cubeFilter: DataCubeObservationFilter!) { dataCubeObservations(sourceType: $sourceType, sourceUrl: $sourceUrl, locale: $locale, cubeFilter: $cubeFilter) }"}' > /dev/null

              curl -s '${{ github.event.deployment_status.target_url }}/api/graphql' -X 'POST' -H 'Content-Type: application/json' -d '{"operationName":"DataCubeObservations","variables":{"locale":"en","sourceType":"sparql","sourceUrl":"https://lindas.cz-aws.net/query","cubeFilter":{"iri":"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9","filters":{"https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/Kanton":{"type":"single","value":"https://ld.admin.ch/canton/1"}}}},"query":"query DataCubeObservations($sourceType: String!, $sourceUrl: DataSourceUrl!, $locale: String!, $cubeFilter: DataCubeObservationFilter!) { dataCubeObservations(sourceType: $sourceType, sourceUrl: $sourceUrl, locale: $locale, cubeFilter: $cubeFilter) }"}' > /dev/null

          - name: Download, unzip and install k6 binary

            run: |

                wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz

                tar -xzf k6-v0.49.0-linux-amd64.tar.gz

                sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6

                export PATH=$PATH:/usr/local/bin

              wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz

              tar -xzf k6-v0.49.0-linux-amd64.tar.gz

              sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6

              export PATH=$PATH:/usr/local/bin

          - name: Run k6 test (iteration 1)

            run: echo "SUMMARY=${{ env.SUMMARY }}$(k6 run --tag testid=DataCubeComponents --env ENV=PR --env ENDPOINT=${{ github.event.deployment_status.target_url }}/api/graphql --env CUBE_IRI=https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9 --env CUBE_LABEL=Photovoltaikanlagen/9 --env CHECK_TIMING=true --env WORKSPACE=${{ github.workspace }} --quiet - <k6/performance-tests/graphql/DataCubeComponents.js)" >> $GITHUB_ENV

          - name: Run k6 test (iteration 2)

.github/workflows/performance-tests.yml → .github/workflows/performance-tests.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,13 +13,13 @@ jobs:
  
        runs-on: ubuntu-latest

        steps:

          - name: Check out

            uses: actions/checkout@v4

            uses: actions/checkout@v6

          - name: Download, unzip and install k6 binary

            run: |

                wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz

                tar -xzf k6-v0.49.0-linux-amd64.tar.gz

                sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6

                export PATH=$PATH:/usr/local/bin

              wget https://github.com/grafana/k6/releases/download/v0.49.0/k6-v0.49.0-linux-amd64.tar.gz

              tar -xzf k6-v0.49.0-linux-amd64.tar.gz

              sudo cp k6-v0.49.0-linux-amd64/k6 /usr/local/bin/k6

              export PATH=$PATH:/usr/local/bin

          - name: Run k6 test (iteration 1)

            run: K6_PROMETHEUS_RW_USERNAME=${{ secrets.K6_PROMETHEUS_RW_USERNAME }} K6_PROMETHEUS_RW_PASSWORD=${{ secrets.K6_PROMETHEUS_RW_PASSWORD }} K6_PROMETHEUS_RW_SERVER_URL=${{ secrets.K6_PROMETHEUS_RW_SERVER_URL }} K6_PROMETHEUS_RW_TREND_STATS=avg k6 run -o experimental-prometheus-rw --tag testid=DataCubeComponents --env ENV=test --env ENDPOINT=https://test.visualize.admin.ch/api/graphql --env CUBE_IRI=https://energy.ld.admin.ch/sfoe/bfe_ogd84_einmalverguetung_fuer_photovoltaikanlagen/9 --env CUBE_LABEL=Photovoltaikanlagen/9 --env CHECK_TIMING=false --env WORKSPACE=${{ github.workspace }} --quiet - <k6/performance-tests/graphql/DataCubeComponents.js

          - name: Run k6 test (iteration 2)

.github/workflows/preload-varnish-cache.yml → .github/workflows/preload-varnish-cache.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,10 +9,10 @@ jobs:
  
      preload-varnish-cache:

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v4

          - uses: actions/setup-node@v4

          - uses: actions/checkout@v6

          - uses: actions/setup-node@v6

            with:

              node-version: 22.x

              node-version: "lts/*"

              cache: "yarn"

              cache-dependency-path: "**/yarn.lock"

          - name: Install dependencies

.gitlab-ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ variables: @@
       DOCKER_HOST: tcp://docker:2375
     lint:
-      image: node:22
+      image: node:24-alpine
       stage: lint
       script:
         - yarn --frozen-lockfile
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to Node 24 + start of OpenTelemetry implementation #2507

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!