atlanhq
diff --git a/‎.github/actions/workflow-setup/action.yaml
Lines changed: 1 addition & 1 deletion b/‎.github/actions/workflow-setup/action.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/e2e-integration-tests.yaml
Lines changed: 71 additions & 0 deletions b/‎.github/workflows/e2e-integration-tests.yaml
Lines changed: 71 additions & 0 deletions
diff --git a/‎.github/workflows/e2e-tests.yaml
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/e2e-tests.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/release.yaml
Lines changed: 8 additions & 4 deletions b/‎.github/workflows/release.yaml
Lines changed: 8 additions & 4 deletions
diff --git a/‎.github/workflows/scale-tests.yaml
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/scale-tests.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/tests.yaml
Lines changed: 23 additions & 1 deletion b/‎.github/workflows/tests.yaml
Lines changed: 23 additions & 1 deletion
diff --git a/‎.github/workflows/trivy-container.yaml
Lines changed: 2 additions & 0 deletions b/‎.github/workflows/trivy-container.yaml
Lines changed: 2 additions & 0 deletions
diff --git a/‎application_sdk/common/logger_adaptors.py
Lines changed: 37 additions & 7 deletions b/‎application_sdk/common/logger_adaptors.py
Lines changed: 37 additions & 7 deletions
@@ -13,7 +13,7 @@ runs:
     - name: Install Dapr CLI
       shell: bash
       run: |
-        wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
+        wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.14.1
         dapr init --runtime-version 1.13.6 --slim
 
     # Install Temporal
 
@@ -0,0 +1,71 @@
+name: E2E Integration Tests
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types:
+      - opened
+      - synchronize
+    branches:
+      - main
+      - develop
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        repo_name: ["atlan-postgres-app"] # List of repositories to run the tests
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      - name: Run E2E Integrations Tests
+        uses: codex-/return-dispatch@v2
+        id: return_dispatch
+        with:
+          token: "${{ secrets.ORG_PAT_GITHUB }}"
+          ref: "refs/heads/develop"
+          repo: ${{ matrix.repo_name }}
+          owner: "atlanhq"
+          workflow: "e2e-integration-test.yaml"
+          workflow_timeout_seconds: 120
+          workflow_job_steps_retry_seconds: 10
+          distinct_id: "${{ github.event.after }}"
+
+      - name: Get the run ID and run URL
+        run: |
+          echo ${{steps.return_dispatch.outputs.run_id}}
+          echo ${{steps.return_dispatch.outputs.run_url}}
+
+      - name: Check Workflow Status
+        run: |
+          repo_owner="atlanhq"
+          repo_name="${{ matrix.repo_name }}"
+          run_id="${{steps.return_dispatch.outputs.run_id}}"
+
+          echo "Checking status of workflow run $run_id in $repo_name"
+
+          status="in_progress"
+          while [[ "$status" == "in_progress" || "$status" == "queued" ]]; do
+            sleep 10
+            status=$(curl -s -H "Authorization: Bearer ${{ secrets.ORG_PAT_GITHUB }}" \
+              https://api.github.com/repos/$repo_owner/$repo_name/actions/runs/$run_id \
+              | jq -r '.status')
+            conclusion=$(curl -s -H "Authorization: Bearer ${{ secrets.ORG_PAT_GITHUB }}" \
+              https://api.github.com/repos/$repo_owner/$repo_name/actions/runs/$run_id \
+              | jq -r '.conclusion')
+          done
+
+          if [[ "$conclusion" != "success" ]]; then
+            echo "Workflow run $run_id in $repo_name failed with conclusion $conclusion"
+            exit 1
+          else
+            echo "Workflow run $run_id in $repo_name succeeded"
+          fi
@@ -26,7 +26,7 @@ jobs:
     # Install Dapr
     - name: Install Dapr CLI
       run: |
-        wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
+        wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.14.1
         dapr init --runtime-version 1.13.6 --slim
 
     # Install Temporal
 
@@ -39,7 +39,7 @@ on:
 
 jobs:
   tag-and-release:
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && !startsWith(github.event.pull_request.head.ref, 'version-update')
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -82,14 +82,18 @@ jobs:
         run: |
           git config --global user.name 'atlan-ci'
           git config --global user.email '[email protected]'
-          git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY
+
+          git checkout -b version-update-${{ github.ref_name }}
 
           git add pyproject.toml poetry.lock
           git commit -m "chore(release): bump version"
-          git push origin ${{ github.ref_name }}
+
+          git push origin version-update-${{ github.ref_name }} --force
+          gh pr create --base develop --title "chore(release): version bump" --body "Automated PR to increment version"
+          gh pr merge --squash --admin
 
       - name: Create GitHub Release
         env:
           GH_TOKEN: ${{ secrets.ORG_PAT_GITHUB }}
         run: |
-          gh release create "v$(poetry version -s)" --generate-notes
+          gh release create "v$(poetry version -s)" --generate-notes
@@ -62,7 +62,7 @@ jobs:
       # Install Dapr
       - name: Install Dapr CLI
         run: |
-          wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash
+          wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.14.1
           dapr init --runtime-version 1.13.6 --slim
 
       # Install Temporal
 
@@ -16,6 +16,12 @@ on:
     branches:
       - main
       - develop
+
+permissions:
+  pull-requests: write
+  contents: write
+  id-token: write  # Required for AWS credentials
+
 jobs:
   tests:
     runs-on: ubuntu-latest
@@ -26,6 +32,7 @@ jobs:
     permissions:
       pull-requests: write
       contents: write
+      id-token: write  # Required for AWS credentials
 
     steps:
       - uses: actions/checkout@v3
@@ -38,6 +45,16 @@ jobs:
         with:
           python-version: "3.11"
 
+      - name: Setup AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: ap-south-1
+          role-to-assume: arn:aws:iam::733936409301:role/kryptonite-store_FullAccess
+
+      - name: Get branch name
+        run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
+        id: get_branch
+
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
@@ -71,10 +88,15 @@ jobs:
         run: |
           poetry run coverage run -m pytest tests/ --full-trace --hypothesis-show-statistics
           poetry run coverage xml
+          poetry run coverage html
           poetry run coverage report --fail-under=60
 
       - name: Comment Coverage Report on PR
         uses: orgoro/[email protected]
         with:
           coverageFile: coverage.xml
-          token: ${{ secrets.ORG_PAT_GITHUB }}
+          token: ${{ secrets.ORG_PAT_GITHUB }}
+
+      - name: Upload Coverage Report to S3
+        run: |
+          aws s3 sync ./htmlcov s3://kryptonite-store/coverage/application-sdk/${{ steps.get_branch.outputs.branch }} --delete
@@ -50,6 +50,7 @@ jobs:
         uses: aquasecurity/[email protected]
         with:
           image-ref: 'docker-trivy-tag:latest'
+          ignore-unfixed: true
           format: 'table'
           severity: 'CRITICAL,HIGH'
           exit-code: '1' # Fail the workflow if vulnerabilities are found
@@ -64,6 +65,7 @@ jobs:
         if: github.event_name == 'pull_request'
         with:
           image-ref: 'docker-trivy-tag:latest'
+          ignore-unfixed: true
           format: 'sarif'
           output: 'trivy-results.sarif'
           severity: 'CRITICAL,HIGH'
 
@@ -18,6 +18,7 @@
 
 SERVICE_NAME: str = os.getenv("OTEL_SERVICE_NAME", "application-sdk")
 SERVICE_VERSION: str = os.getenv("OTEL_SERVICE_VERSION", "0.1.0")
+OTEL_RESOURCE_ATTRIBUTES: str = os.getenv("OTEL_RESOURCE_ATTRIBUTES", "")
 OTEL_EXPORTER_OTLP_ENDPOINT: str = os.getenv(
     "OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317"
 )
@@ -57,11 +58,18 @@ def __init__(self, logger_name: str) -> None:
                 # Get workflow node name for Argo environment
                 workflow_node_name = os.getenv("OTEL_WF_NODE_NAME", "")
 
-                # Base resource attributes
-                resource_attributes = {
-                    "service.name": SERVICE_NAME,
-                    "service.version": SERVICE_VERSION,
-                }
+                # First try to get attributes from OTEL_RESOURCE_ATTRIBUTES
+                resource_attributes = {}
+                if OTEL_RESOURCE_ATTRIBUTES:
+                    resource_attributes = self._parse_otel_resource_attributes(
+                        OTEL_RESOURCE_ATTRIBUTES
+                    )
+
+                # Only add default service attributes if they're not already present
+                if "service.name" not in resource_attributes:
+                    resource_attributes["service.name"] = SERVICE_NAME
+                if "service.version" not in resource_attributes:
+                    resource_attributes["service.version"] = SERVICE_VERSION
 
                 # Add workflow node name if running in Argo
                 if workflow_node_name:
@@ -91,7 +99,25 @@ def __init__(self, logger_name: str) -> None:
             except Exception as e:
                 self.logger.error(f"Failed to setup OTLP logging: {str(e)}")
 
-    def _create_log_record(self, record: Dict[str, Any]) -> LogRecord:
+    def _parse_otel_resource_attributes(self, env_var: str) -> dict[str, str]:
+        try:
+            # Check if the environment variable is not empty
+            if env_var:
+                # Split the string by commas to get individual key-value pairs
+                attributes = env_var.split(",")
+                # Create a dictionary from the key-value pairs
+                return {
+                    item.split("=")[0].strip(): item.split("=")[
+                        1
+                    ].strip()  # Strip spaces around the key and value
+                    for item in attributes
+                    if "=" in item  # Ensure there's an "=" to split
+                }
+        except Exception as e:
+            self.logger.error(f"Failed to parse OTLP resource attributes: {str(e)}")
+        return {}
+
+    def _create_log_record(self, record: dict) -> LogRecord:
         """Create an OpenTelemetry LogRecord."""
         severity_number = SEVERITY_MAPPING.get(
             record["level"].name, SeverityNumber.UNSPECIFIED
@@ -178,8 +204,12 @@ def process(self, msg: Any, kwargs: Dict[str, Any]) -> Tuple[Any, Dict[str, Any]
                         activity_info.schedule_to_close_timeout or 0
                     ),
                     "start_to_close_timeout": str(
-                        activity_info.start_to_close_timeout or 0
+                        activity_info.start_to_close_timeout or None
+                    ),
+                    "schedule_to_start_timeout": str(
+                        activity_info.schedule_to_start_timeout or None
                     ),
+                    "heartbeat_timeout": str(activity_info.heartbeat_timeout or None),
                 }
                 kwargs.update(activity_context)