Merge branch 'main' into dvernon/MOB-3318_traceparent_header

.github/workflows/ci.yml

@@ -9,35 +9,35 @@ jobs:
     runs-on: macos-12
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
       - name: Full Build
         run: ./fullbuild.sh
       - name: Smoke Test
         run: ./smoketest.sh
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v4.3.1
   xcframework:
     runs-on: macos-12
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
       - name: Print Swift version
         run: swift --version
       - name: Build xcframework
         working-directory: ./SplunkRumWorkspace/SplunkRum
         run: ./build_binaries.sh
       - name: Upload xcframework
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: SplunkOtel.xcframework
           path: ./SplunkRumWorkspace/SplunkRum/xcframeworks/SplunkOtel.xcframework
   saucelabs-prepare:
     runs-on: macOS-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Build for Sauce Labs
@@ -73,9 +73,9 @@ jobs:
         os: ['14', '15', '16']
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
       - name: Run Sauce Labs test cases
@@ -90,8 +90,8 @@ jobs:
   check_links:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4
       - name: Link Checker
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v1.10.0
         with:
           fail: true

.github/workflows/cla.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@v2.3.1
+        uses: contributor-assistant/github-action@v2.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}

Package.swift

@@ -23,6 +23,9 @@ let package = Package(
             ],
             sources: [
                 "SplunkRum",
+            ],
+            resources: [
+                .copy("PrivacyInfo.xcprivacy")
             ]
         )
     ]

PrivacyInfo.xcprivacy

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePerformanceData</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

SplunkOtel.podspec

@@ -31,4 +31,5 @@ DESC
 # Make sure the deployment target matches with Package.swift
   s.ios.deployment_target = '11.0'
   s.source_files = 'SplunkRumWorkspace/SplunkRum/SplunkRum/**/*.swift'
-end
+  s.resource_bundles = {'SplunkRum' => ['PrivacyInfo.xcprivacy']}
+end

SplunkRumWorkspace/SplunkRum/SplunkRum.xcodeproj/project.pbxproj

@@ -140,6 +140,7 @@
 		E2AFDA052847C529000F53BF /* SpanFromDiskExporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2AFDA042847C529000F53BF /* SpanFromDiskExporterTest.swift */; };
 		E2AFDA072847C678000F53BF /* DiskExportCommon.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2AFDA062847C678000F53BF /* DiskExportCommon.swift */; };
 		E2AFDA092847DAC8000F53BF /* DiskExportPipelineTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2AFDA082847DAC8000F53BF /* DiskExportPipelineTest.swift */; };
+		E2E93B8A2BDFD23B007D1EEC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = E2E93B892BDFD23B007D1EEC /* PrivacyInfo.xcprivacy */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -307,6 +308,7 @@
 		E2AFDA042847C529000F53BF /* SpanFromDiskExporterTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpanFromDiskExporterTest.swift; sourceTree = "<group>"; };
 		E2AFDA062847C678000F53BF /* DiskExportCommon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskExportCommon.swift; sourceTree = "<group>"; };
 		E2AFDA082847DAC8000F53BF /* DiskExportPipelineTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiskExportPipelineTest.swift; sourceTree = "<group>"; };
+		E2E93B892BDFD23B007D1EEC /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -342,6 +344,7 @@
 		86260EBA25CDC1DE009F3CB1 = {
 			isa = PBXGroup;
 			children = (
+				E2E93B892BDFD23B007D1EEC /* PrivacyInfo.xcprivacy */,
 				86260EC625CDC1DE009F3CB1 /* SplunkRum */,
 				86260ED125CDC1DE009F3CB1 /* SplunkRumTests */,
 				E2AFD9F128473F7A000F53BF /* SplunkRumDiskExportTests */,
@@ -854,6 +857,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E2E93B8A2BDFD23B007D1EEC /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};