Merge branch 'main' into kind

Author: Manik2708

.github/actions/verify-metrics-snapshot/action.yaml

@@ -0,0 +1,70 @@
+# Copyright (c) 2023 The Jaeger Authors.
+# SPDX-License-Identifier: Apache-2.0
+
+name: 'Verify Metric Snapshot and Upload Metrics'
+description: 'Upload or cache the metrics data after verification'
+inputs:
+  snapshot:
+    description: 'Path to the metric file'
+    required: true
+  artifact_key:
+    description: 'Artifact key used for uploading and fetching artifacts'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Upload current metrics snapshot
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      with:
+        name: ${{ inputs.artifact_key }}
+        path: ./.metrics/${{ inputs.snapshot }}.txt
+        retention-days: 7
+
+      # The github cache restore successfully restores when cache saved has same key and same path.
+      # Hence to restore release metric with name relese_{metric_name} , the name must be changed to the same.
+    - name: Change file name before caching
+      if: github.ref_name == 'main'
+      shell: bash
+      run: |
+        mv ./.metrics/${{ inputs.snapshot }}.txt ./.metrics/baseline_${{ inputs.snapshot }}.txt
+
+    - name: Cache metrics snapshot on main branch for longer retention
+      if: github.ref_name == 'main'
+      uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57
+      with: 
+        path: ./.metrics/baseline_${{ inputs.snapshot }}.txt
+        key: ${{ inputs.artifact_key }}_${{ github.run_id }}
+            
+    # Use restore keys to match prefix and fetch the latest cache
+    # Here , restore keys is an ordered list of prefixes that need to be matched 
+    - name: Download the cached tagged metrics
+      id: download-release-snapshot
+      if: github.ref_name != 'main'
+      uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57
+      with:
+        path: ./.metrics/baseline_${{ inputs.snapshot }}.txt
+        key: ${{ inputs.artifact_key }}
+        restore-keys: |
+          ${{ inputs.artifact_key }}
+
+    - name: Calculate diff between the snapshots 
+      id: compare-snapshots
+      if: ${{ (github.ref_name != 'main') && (steps.download-release-snapshot.outputs.cache-matched-key != '')  }}
+      shell: bash
+      run: |
+        python3 -m pip install prometheus-client
+        python3 ./scripts/e2e/compare_metrics.py --file1 ./.metrics/${{ inputs.snapshot }}.txt --file2 ./.metrics/baseline_${{ inputs.snapshot }}.txt --output ./.metrics/diff_${{ inputs.snapshot }}.txt
+        if [ $? -eq 1 ]; then
+        echo "🛑 Differences found in metrics"
+        exit 1
+        fi
+
+    - name: Upload the diff artifact
+      if: ${{ (github.ref_name != 'main') && (steps.compare-snapshots.outcome == 'failure') }}
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      with:
+        name: diff_${{ inputs.artifact_key }}
+        path: ./.metrics/diff_${{ inputs.snapshot }}.txt
+        retention-days: 7
+
+    

.github/workflows/ci-e2e-all.yml

@@ -36,7 +36,3 @@ jobs:
   opensearch:
     uses: ./.github/workflows/ci-e2e-opensearch.yml
 
-
-
-
-

.github/workflows/ci-e2e-badger.yaml

@@ -25,7 +25,6 @@ jobs:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
-
     - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
       with:
         go-version: 1.23.x
@@ -41,6 +40,12 @@ jobs:
             ;;
         esac
 
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.version == 'v2'
+      with:
+        snapshot: metrics_snapshot_badger
+        artifact_key: metrics_snapshot_badger_${{ matrix.version }}
+  
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:

.github/workflows/ci-e2e-cassandra.yml

@@ -48,9 +48,17 @@ jobs:
       run: bash scripts/e2e/cassandra.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}
       env:
         SKIP_APPLY_SCHEMA: ${{ matrix.create-schema == 'auto' && true || false }}
+     
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.jaeger-version == 'v2'
+      with:
+        snapshot: metrics_snapshot_cassandra
+        artifact_key: metrics_snapshot_cassandras_${{ matrix.version.major }}_${{ matrix.version.schema }}_${{ matrix.jaeger-version }}_${{ matrix.create-schema }}
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:
         files: cover.out
         flags: cassandra-${{ matrix.version.major }}-${{ matrix.jaeger-version }}-${{ matrix.create-schema }}
+    
+    

.github/workflows/ci-e2e-elasticsearch.yml

@@ -40,11 +40,7 @@ jobs:
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         submodules: true
-
-    - name: Fetch git tags
-      run: |
-        git fetch --prune --unshallow --tags
-
+        
     - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
       with:
         go-version: 1.23.x
@@ -58,6 +54,12 @@ jobs:
     - name: Run ${{ matrix.version.distribution }} integration tests
       id: test-execution
       run: bash scripts/e2e/elasticsearch.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
+      
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.version.jaeger == 'v2'
+      with:
+        snapshot: metrics_snapshot_elasticsearch
+        artifact_key: metrics_snapshot_elasticsearch_${{ matrix.version.major }}_${{ matrix.version.jaeger}}
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov

.github/workflows/ci-e2e-grpc.yml

@@ -41,6 +41,12 @@ jobs:
             ;;
         esac
 
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.version == 'v2'
+      with:
+        snapshot: metrics_snapshot_grpc
+        artifact_key: metrics_snapshot_grpc_${{ matrix.version }}
+
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:

.github/workflows/ci-e2e-kafka.yml

@@ -35,6 +35,12 @@ jobs:
     - name: Run kafka integration tests
       id: test-execution
       run: bash scripts/e2e/kafka.sh -j ${{ matrix.jaeger-version }} -v ${{ matrix.kafka-version }}
+        
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.jaeger-version == 'v2'
+      with:
+        snapshot: metrics_snapshot_kafka
+        artifact_key: metrics_snapshot_kafka_${{ matrix.jaeger-version }}
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov

.github/workflows/ci-e2e-memory.yaml

@@ -21,15 +21,20 @@ jobs:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
     - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
-
+        
     - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
       with:
         go-version: 1.23.x
 
     - name: Run Memory storage integration tests
       run: |
         STORAGE=memory_v2 make jaeger-v2-storage-integration-test
-
+        
+    - uses: ./.github/actions/verify-metrics-snapshot
+      with:
+        snapshot: metrics_snapshot_memory
+        artifact_key: metrics_snapshot_memory
+          
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:

.github/workflows/ci-e2e-opensearch.yml

@@ -38,10 +38,6 @@ jobs:
       with:
         submodules: true
 
-    - name: Fetch git tags
-      run: |
-        git fetch --prune --unshallow --tags
-
     - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
       with:
         go-version: 1.23.x
@@ -52,6 +48,12 @@ jobs:
       id: test-execution
       run: bash scripts/e2e/elasticsearch.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
 
+    - uses: ./.github/actions/verify-metrics-snapshot
+      if: matrix.version.jaeger == 'v2'
+      with:
+        snapshot: metrics_snapshot_opensearch
+        artifact_key: metrics_snapshot_opensearch_${{ matrix.version.major }}
+
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:

.github/workflows/ci-lint-checks.yaml

@@ -117,3 +117,70 @@ jobs:
     - name: Run unit tests for scripts
       run: |
         SHUNIT2=.tools/shunit2 bash scripts/utils/compute-tags.test.sh
+
+  binary-size-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+      with:
+        egress-policy: audit 
+
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      with:
+        submodules: true
+
+    - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
+      with:
+        go-version: 1.23.x
+
+    - name: Setup Node.js version
+      uses: ./.github/actions/setup-node.js
+
+    - name: Build jaeger binary
+      run: make build-jaeger
+
+    - name: Calculate jaeger binary size
+      run: |
+        TOTAL_SIZE=$(du -sb ./cmd/jaeger/jaeger-linux-amd64 | cut -f1)
+        echo "$TOTAL_SIZE" > ./new_jaeger_binary_size.txt
+        echo "Total binary size: $TOTAL_SIZE bytes"
+        
+    - name: Restore previous binary size
+      id: cache-binary-size
+      uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57      #v4.2.0
+      with:
+        path: ./jaeger_binary_size.txt
+        key: jaeger_binary_size
+        restore-keys: |
+          jaeger_binary_size
+
+    - name: Compare jaeger binary sizes
+      if: steps.cache-binary-size.outputs.cache-matched-key != ''
+      run: |
+        OLD_BINARY_SIZE=$(cat ./jaeger_binary_size.txt)
+        NEW_BINARY_SIZE=$(cat ./new_jaeger_binary_size.txt)
+        echo "Previous binary size: $OLD_BINARY_SIZE bytes"
+        echo "New binary size: $NEW_BINARY_SIZE bytes"
+        
+        SIZE_CHANGE=$(( $NEW_BINARY_SIZE - $OLD_BINARY_SIZE ))
+        PERCENTAGE_CHANGE=$(( SIZE_CHANGE * 100 / $OLD_BINARY_SIZE ))
+        echo "Size change: $PERCENTAGE_CHANGE%"
+        if [ $PERCENTAGE_CHANGE -gt 2 ]; then
+          echo "❌ binary size increased by more than 2% ($PERCENTAGE_CHANGE%)"
+          exit 1
+        else
+          echo "✅ binary size change is within acceptable range ($PERCENTAGE_CHANGE%)"
+        fi
+ 
+
+    - name: Remove previous *_binary_*.txt
+      run: |
+        rm -rf ./jaeger_binary_size.txt
+        mv ./new_jaeger_binary_size.txt ./jaeger_binary_size.txt
+      
+    - name: Save new jaeger binary size
+      if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/main') }}
+      uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57     #v4.2.0
+      with:
+        path: ./jaeger_binary_size.txt
+        key: jaeger_binary_size_${{ github.run_id }}