Merge remote-tracking branch 'origin/develop' into feature/v3

# Conflicts:
#	dd-sdk-android-core/src/main/kotlin/com/datadog/android/Datadog.kt
#	dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt
#	features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/LogsFeature.kt
#	features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/internal/LogsFeatureTest.kt
#	features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumScope.kt
#	features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScopeTest.kt

Author: satween

.github/workflows/changelog-to-confluence.yaml

@@ -17,15 +17,15 @@ jobs:
             - name: Prepare Only Changelog
               run: |
                   mkdir -p publish_folder
-                  cp CHANGELOG.md publish_folder/
+                  cp CHANGELOG.md publish_folder/android-sdk-changelog.md
                   echo "Publishing only CHANGELOG.md"
 
             - name: Publish Markdown to Confluence
               uses: markdown-confluence/publish-action@7767a0a7f438bb1497ee7ffd7d3d685b81dfe700 # v5
               with:
-                  confluenceBaseUrl: ${{ secrets.CONFLUENCE_BASE_URL }}
+                  confluenceBaseUrl: ${{ secrets.DATADOG_CONFLUENCE_BASE_URL }}
                   confluenceParentId: ${{ secrets.CONFLUENCE_PARENT_ID }}
-                  atlassianUserName: ${{ secrets.ATLASSIAN_USERNAME }}
-                  atlassianApiToken: ${{ secrets.ATLASSIAN_API_TOKEN }}
+                  atlassianUserName: ${{ secrets.CONFLUENCE_ROBOT_RUM_EMAIL }}
+                  atlassianApiToken: ${{ secrets.CONFLUENCE_ROBOT_RUM_API_KEY }}
                   contentRoot: '.'
                   folderToPublish: 'publish_folder'

.gitignore

@@ -29,6 +29,9 @@ config/*
 # Kotlin
 .kotlin/
 
+# dd-sdk-android tools
 gh_token
 sdk_classpath
 detekt_classpath
+**/verification-metadata.xml
+!gradle/verification-metadata.xml