Bump version to 0.8.0

Ignacio Bonafonte · Ignacio Bonafonte · commit ec5b819cee09 · 2021-06-01T10:07:20.000+02:00
Remove workspace path correctly from test file path
diff --git a/DatadogSDKTesting.xcodeproj/project.pbxproj b/DatadogSDKTesting.xcodeproj/project.pbxproj
@@ -2162,7 +2162,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = "-weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
@@ -2190,7 +2190,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = "-weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
@@ -2217,7 +2217,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = "-weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
@@ -2246,7 +2246,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = "-weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
@@ -2490,7 +2490,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = " -weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
@@ -2518,7 +2518,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.7.0;
+				MARKETING_VERSION = 0.8.0;
 				OTHER_LDFLAGS = " -weak-lXCTestSwiftSupport";
 				PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.DatadogSDKTesting;
 				PRODUCT_NAME = DatadogSDKTesting;
diff --git a/Sources/DatadogSDKTesting/DDTestObserver.swift b/Sources/DatadogSDKTesting/DDTestObserver.swift
@@ -103,10 +103,10 @@ internal class DDTestObserver: NSObject, XCTestObservation {
         let functionName = testSuite + "." + testName
         if let functionInfo = currentBundleFunctionInfo[functionName] {
             var filePath = functionInfo.file
-            if let srcRoot = tracer.env.sourceRoot,
-               let rootRange = filePath.range(of: srcRoot + "/")
+            if let workspacePath = tracer.env.workspacePath,
+               let workspaceRange = filePath.range(of: workspacePath + "/")
             {
-                filePath.removeSubrange(rootRange)
+                filePath.removeSubrange(workspaceRange)
             }
             testSpan.setAttribute(key: DDTestTags.testSourceFile, value: filePath)
             testSpan.setAttribute(key: DDTestTags.testSourceStartLine, value: functionInfo.startLine)

Original file line number	Diff line number	Diff line change
`@@ -103,10 +103,10 @@ internal class DDTestObserver: NSObject, XCTestObservation {`
`103`	`103`	`let functionName = testSuite + "." + testName`
`104`	`104`	`if let functionInfo = currentBundleFunctionInfo[functionName] {`
`105`	`105`	`var filePath = functionInfo.file`
`106`		`- if let srcRoot = tracer.env.sourceRoot,`
`107`		`- let rootRange = filePath.range(of: srcRoot + "/")`
	`106`	`+ if let workspacePath = tracer.env.workspacePath,`
	`107`	`+ let workspaceRange = filePath.range(of: workspacePath + "/")`
`108`	`108`	`{`
`109`		`- filePath.removeSubrange(rootRange)`
	`109`	`+ filePath.removeSubrange(workspaceRange)`
`110`	`110`	`}`
`111`	`111`	`testSpan.setAttribute(key: DDTestTags.testSourceFile, value: filePath)`
`112`	`112`	`testSpan.setAttribute(key: DDTestTags.testSourceStartLine, value: functionInfo.startLine)`