Merge remote-tracking branch 'origin/main' into chore/a11y-storybook-form-component

Author: phlipsterit

.github/workflows/app-backend-codeql.yml

@@ -65,7 +65,7 @@ jobs:
           config-file: ${{ steps.codeql-config.outputs.config-file }}
 
       - name: Build solution
-        run: dotnet build solutions/Src.sln -v m
+        run: dotnet build solutions/Src.slnx -v m
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@5c8a8a642e79153f5d047b10ec1cba1d1cc65699 # v3

.github/workflows/app-backend-tests.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Build backend
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-          dotnet build solutions/All.sln -v m
+          dotnet build solutions/All.slnx -v m
 
       - name: Download built frontend
         if: matrix.os.id == 'ubuntu-latest'
@@ -69,19 +69,19 @@ jobs:
         if: matrix.os.id != 'ubuntu-latest'
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-          dotnet test solutions/All.sln -v m --no-restore --no-build --filter "Category!=Integration"
+          dotnet test solutions/All.slnx -v m --no-restore --no-build --filter "Category!=Integration"
       - name: Test (main tests)
         if: matrix.os.id == 'ubuntu-latest'
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-          dotnet test solutions/All.sln -v m --no-restore --no-build --filter "Category!=Integration"
+          dotnet test solutions/All.slnx -v m --no-restore --no-build --filter "Category!=Integration"
       - name: Setup studioctl
         if: matrix.os.id == 'ubuntu-latest'
         uses: ./.github/actions/setup-studioctl
       - name: Test (integration tests)
         if: matrix.os.id == 'ubuntu-latest'
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-          dotnet test solutions/All.sln --no-restore --no-build --logger "console;verbosity=detailed" --filter "Category=Integration"
+          dotnet test solutions/All.slnx --no-restore --no-build --logger "console;verbosity=detailed" --filter "Category=Integration"
         env:
           SKIP_FRONTEND_BUILD: true

.github/workflows/app-codelists-codeql.yml

@@ -60,8 +60,13 @@ jobs:
         queries: ${{ steps.codeql-config.outputs.queries }}
         config-file: ${{ steps.codeql-config.outputs.config-file }}
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
+      with:
+        global-json-file: src/App/codelists/global.json
+
     - name: Build solution
-      run: dotnet build solutions/Src.sln -v m
+      run: dotnet build solutions/Src.slnx -v m
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@5c8a8a642e79153f5d047b10ec1cba1d1cc65699 # v3

.github/workflows/app-codelists-tests.yml

@@ -37,15 +37,15 @@ jobs:
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
         with:
           dotnet-version: |
-            8.0.x
+            10.0.x
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Build
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-           dotnet build Altinn.Codelists.sln -v m
+           dotnet build Altinn.Codelists.slnx -v m
       - name: Test
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-           dotnet test Altinn.Codelists.sln -v m
+           dotnet test Altinn.Codelists.slnx -v m

.github/workflows/app-fileanalyzers-codeql.yml

@@ -60,8 +60,13 @@ jobs:
         queries: ${{ steps.codeql-config.outputs.queries }}
         config-file: ${{ steps.codeql-config.outputs.config-file }}
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
+      with:
+        global-json-file: src/App/fileanalyzers/global.json
+
     - name: Build solution
-      run: dotnet build solutions/Src.sln -v m
+      run: dotnet build solutions/Src.slnx -v m
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@5c8a8a642e79153f5d047b10ec1cba1d1cc65699 # v3

.github/workflows/app-fileanalyzers-tests.yml

@@ -37,15 +37,15 @@ jobs:
         uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5
         with:
           dotnet-version: |
-            8.0.x
+            10.0.x
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Build
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-           dotnet build Altinn.FileAnalyzers.sln -v m
+           dotnet build Altinn.FileAnalyzers.slnx -v m
       - name: Test
         working-directory: ${{ matrix.os.workingDir }}
         run: |
-           dotnet test Altinn.FileAnalyzers.sln -v m
+           dotnet test Altinn.FileAnalyzers.slnx -v m

infra/observability/base/gateway.yaml

@@ -6,7 +6,7 @@ metadata:
     altinn.studio/otel-collector: otel-gateway
 spec:
   mode: deployment
-  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.144.0
+  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.148.0
   serviceAccount: otel-collector
   upgradeStrategy: automatic
   replicas: 1

infra/observability/base/router.yaml

@@ -6,7 +6,7 @@ metadata:
     altinn.studio/otel-collector: otel-router
 spec:
   mode: deployment
-  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.144.0
+  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.148.0
   serviceAccount: otel-collector
   upgradeStrategy: automatic
   replicas: 1
@@ -42,7 +42,7 @@ spec:
           resource_attributes:
             k8s.cluster.name:
               enabled: true
-      k8sattributes:
+      k8s_attributes:
         auth_type: 'serviceAccount'
         wait_for_metadata: true
         wait_for_metadata_timeout: 10s

infra/observability/runtime/overlay/patches/router-config.yaml

@@ -32,12 +32,12 @@ spec:
       pipelines:
         traces:
           receivers: [otlp]
-          processors: [resourcedetection/aks, k8sattributes, resource/environment, transform/drop, batch]
+          processors: [resourcedetection/aks, k8s_attributes, resource/environment, transform/drop, batch]
           exporters: [loadbalancing/traces]
         metrics:
           receivers: [otlp]
           exporters: [nop]
         logs:
           receivers: [otlp]
-          processors: [filter/logs, resourcedetection/aks, k8sattributes, resource/environment, transform/drop, batch]
+          processors: [filter/logs, resourcedetection/aks, k8s_attributes, resource/environment, transform/drop, batch]
           exporters: [loadbalancing/logs]

infra/observability/studio/overlay/patches/router-config.yaml

@@ -32,12 +32,12 @@ spec:
       pipelines:
         traces:
           receivers: [otlp]
-          processors: [resourcedetection/aks, k8sattributes, resource/environment, transform/drop, batch]
+          processors: [resourcedetection/aks, k8s_attributes, resource/environment, transform/drop, batch]
           exporters: [loadbalancing/traces]
         metrics:
           receivers: [otlp]
           exporters: [nop]
         logs:
           receivers: [otlp]
-          processors: [filter/logs, resourcedetection/aks, k8sattributes, resource/environment, transform/drop, batch]
+          processors: [filter/logs, resourcedetection/aks, k8s_attributes, resource/environment, transform/drop, batch]
           exporters: [loadbalancing/logs]