Merge pull request #853 from salesforcecli/sh/enable-pft

shetzel · web-flow · commit 27e111a2c621 · 2026-02-10T16:29:14.000-07:00
fix: enable PDP events via o11y for PFT @W-21229864
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 Apache License Version 2.0
 
-Copyright (c) 2025 Salesforce, Inc.
+Copyright (c) 2026 Salesforce, Inc.
 All rights reserved.
 
                                  Apache License
diff --git a/package.json b/package.json
@@ -4,6 +4,8 @@
   "version": "3.9.5",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
+  "enableO11y": true,
+  "o11yUploadEndpoint": "https://794testsite.my.site.com/byolwr/webruntime/log/metrics",
   "dependencies": {
     "@salesforce/apex-node": "^8.4.2",
     "@salesforce/core": "^8.24.0",
diff --git a/src/commands/apex/get/log.ts b/src/commands/apex/get/log.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/apex/get/test.ts b/src/commands/apex/get/test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/apex/list/log.ts b/src/commands/apex/list/log.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/apex/run.ts b/src/commands/apex/run.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/apex/run/test.ts b/src/commands/apex/run/test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/apex/tail/log.ts b/src/commands/apex/tail/log.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/logic/get/test.ts b/src/commands/logic/get/test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/commands/logic/run/test.ts b/src/commands/logic/run/test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/flags.ts b/src/flags.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/logColorize.ts b/src/logColorize.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/reporters/index.ts b/src/reporters/index.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/reporters/jsonReporter.ts b/src/reporters/jsonReporter.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/reporters/runReporter.ts b/src/reporters/runReporter.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/reporters/testReporter.ts b/src/reporters/testReporter.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/shared/TestGetBase.ts b/src/shared/TestGetBase.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ export class TestGetBase {
       detailedCoverage,
       concise,
       jsonEnabled,
-      isUnifiedLogic
+      isUnifiedLogic,
     } = options;
 
     const testService = new TestService(connection);
@@ -64,7 +64,7 @@ export class TestGetBase {
       'code-coverage': codeCoverage,
       'detailed-coverage': detailedCoverage,
       concise: concise ?? false,
-      isUnifiedLogic
+      isUnifiedLogic,
     };
 
     return testReporter.report(result, reportOptions);
diff --git a/src/shared/TestRunService.ts b/src/shared/TestRunService.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/get/log.test.ts b/test/commands/apex/get/log.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/get/test.nut.ts b/test/commands/apex/get/test.nut.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/get/test.test.ts b/test/commands/apex/get/test.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -208,12 +208,12 @@ describe('apex:test:report', () => {
 
   describe('isUnifiedLogic parameter', () => {
     it('should NOT pass isUnifiedLogic parameter', async () => {
-    testReporterReportStub = sandbox.stub(TestReporter.prototype, 'report');
-    sandbox.stub(TestService.prototype, 'reportAsyncResults').resolves(testRunSimple);
-    testReporterReportStub.resolves({ success: true });
+      testReporterReportStub = sandbox.stub(TestReporter.prototype, 'report');
+      sandbox.stub(TestService.prototype, 'reportAsyncResults').resolves(testRunSimple);
+      testReporterReportStub.resolves({ success: true });
       await Test.run(['--test-run-id', '7071w00003woTsc', '--target-org', 'test@example.com']);
 
-      expect(testReporterReportStub.calledOnce).to.be.true;      
+      expect(testReporterReportStub.calledOnce).to.be.true;
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       expect(testReporterReportStub.getCall(0).args[1].isUnifiedLogic).to.be.undefined;
     });
diff --git a/test/commands/apex/list/log.test.ts b/test/commands/apex/list/log.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/loggingCommands.nut.ts b/test/commands/apex/loggingCommands.nut.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/run.test.ts b/test/commands/apex/run.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/apex/run/test.nut.ts b/test/commands/apex/run/test.nut.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -211,8 +211,8 @@ describe('apex run test', () => {
   });
 
   it('will run specified test suites --class-names', async () => {
-    const result = execCmd('apex:run:test -w 10 --suite-names DreamhouseTestSuite', { ensureExitCode: 0 })
-      .shellOutput.stdout;
+    const result = execCmd('apex:run:test -w 10 --suite-names DreamhouseTestSuite', { ensureExitCode: 0 }).shellOutput
+      .stdout;
     expect(result).to.match(/Tests Ran\s+10/);
     expect(result).to.include('FileUtilitiesTest.');
     expect(result).to.include('TestPropertyController.');
@@ -279,13 +279,13 @@ function addTestSuiteFile(projectDir: string): void {
   if (!fs.existsSync(testSuitesDir)) {
     fs.mkdirSync(testSuitesDir, { recursive: true });
   }
-  
+
   const xmlContent = `<?xml version="1.0" encoding="UTF-8"?>
                       <ApexTestSuite xmlns="http://soap.sforce.com/2006/04/metadata">
                         <testClassName>FileUtilitiesTest</testClassName>
                         <testClassName>GeocodingServiceTest</testClassName>
                         <testClassName>TestPropertyController</testClassName>
                       </ApexTestSuite>`;
-  const filePath = path.join(testSuitesDir, 'DreamhouseTestSuite.testSuite-meta.xml');  
+  const filePath = path.join(testSuitesDir, 'DreamhouseTestSuite.testSuite-meta.xml');
   fs.writeFileSync(filePath, xmlContent, 'utf8');
 }
diff --git a/test/commands/apex/run/test.test.ts b/test/commands/apex/run/test.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -165,22 +165,10 @@ describe('apex:test:run', () => {
       const runTestSynchronousSpy = sandbox
         .stub(TestService.prototype, 'runTestAsynchronous')
         .resolves(runWithCoverage);
-      await Test.run([
-        '--code-coverage',
-        '--result-format',
-        'human',
-        '--test-level',
-        'RunLocalTests',
-      ]);
+      await Test.run(['--code-coverage', '--result-format', 'human', '--test-level', 'RunLocalTests']);
       expect(buildPayloadSpy.calledOnce).to.be.true;
       expect(runTestSynchronousSpy.calledOnce).to.be.true;
-      expect(buildPayloadSpy.firstCall.args).to.deep.equal([
-        'RunLocalTests',
-        undefined,
-        undefined,
-        undefined,
-        'Apex',
-      ]);
+      expect(buildPayloadSpy.firstCall.args).to.deep.equal(['RunLocalTests', undefined, undefined, undefined, 'Apex']);
       expect(runTestSynchronousSpy.firstCall.args[0]).to.deep.equal({
         category: ['Apex'],
         skipCodeCoverage: false,
@@ -198,13 +186,7 @@ describe('apex:test:run', () => {
       await Test.run(['--class-names', 'myApex', '--test-level', 'RunSpecifiedTests']);
       expect(buildPayloadSpy.calledOnce).to.be.true;
       expect(runTestSynchronousSpy.calledOnce).to.be.true;
-      expect(buildPayloadSpy.firstCall.args).to.deep.equal([
-        'RunSpecifiedTests',
-        undefined,
-        'myApex',
-        undefined,
-        '',
-      ]);
+      expect(buildPayloadSpy.firstCall.args).to.deep.equal(['RunSpecifiedTests', undefined, 'myApex', undefined, '']);
       expect(runTestSynchronousSpy.firstCall.args[0]).to.deep.equal({
         skipCodeCoverage: true,
         testLevel: 'RunSpecifiedTests',
@@ -426,27 +408,15 @@ describe('apex:test:run', () => {
       const runTestSynchronousSpy = sandbox
         .stub(TestService.prototype, 'runTestAsynchronous')
         .resolves(runWithCoverage);
-      await Test.run([
-        '--code-coverage',
-        '--result-format',
-        'human',
-        '--test-level',
-        'RunLocalTests',
-      ]);
+      await Test.run(['--code-coverage', '--result-format', 'human', '--test-level', 'RunLocalTests']);
       expect(buildPayloadSpy.calledOnce).to.be.true;
       expect(runTestSynchronousSpy.calledOnce).to.be.true;
-      expect(buildPayloadSpy.firstCall.args).to.deep.equal([
-        'RunLocalTests',
-        undefined,
-        undefined,
-        undefined,
-        'Apex',
-      ]);
+      expect(buildPayloadSpy.firstCall.args).to.deep.equal(['RunLocalTests', undefined, undefined, undefined, 'Apex']);
       expect(runTestSynchronousSpy.firstCall.args[0]).to.deep.equal({
         category: ['Apex'],
         skipCodeCoverage: false,
         suiteNames: undefined,
-        testLevel: 'RunLocalTests'
+        testLevel: 'RunLocalTests',
       });
     });
 
@@ -457,13 +427,7 @@ describe('apex:test:run', () => {
       await Test.run(['--class-names', 'myApex', '--test-level', 'RunSpecifiedTests']);
       expect(buildPayloadSpy.calledOnce).to.be.true;
       expect(runTestSynchronousSpy.calledOnce).to.be.true;
-      expect(buildPayloadSpy.firstCall.args).to.deep.equal([
-        'RunSpecifiedTests',
-        undefined,
-        'myApex',
-        undefined,
-        '',
-      ]);
+      expect(buildPayloadSpy.firstCall.args).to.deep.equal(['RunSpecifiedTests', undefined, 'myApex', undefined, '']);
       expect(runTestSynchronousSpy.firstCall.args[0]).to.deep.equal({
         skipCodeCoverage: true,
         testLevel: 'RunSpecifiedTests',
diff --git a/test/commands/apex/tail/log.test.ts b/test/commands/apex/tail/log.test.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2025, Salesforce, Inc.
+ * Copyright 2026, Salesforce, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/commands/logic/get/test.nut.ts b/test/commands/logic/get/test.nut.ts
diff --git a/test/commands/logic/get/test.test.ts b/test/commands/logic/get/test.test.ts
diff --git a/test/commands/logic/run/test.nut.ts b/test/commands/logic/run/test.nut.ts
diff --git a/test/commands/logic/run/test.test.ts b/test/commands/logic/run/test.test.ts
diff --git a/test/commands/logic/testHelper.ts b/test/commands/logic/testHelper.ts
diff --git a/test/reporters/jsonReporter.test.ts b/test/reporters/jsonReporter.test.ts
diff --git a/test/reporters/testReporter.test.ts b/test/reporters/testReporter.test.ts
diff --git a/test/testData.ts b/test/testData.ts
diff --git a/test/utils.test.ts b/test/utils.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2025, Salesforce, Inc.`
	`2`	`+ * Copyright 2026, Salesforce, Inc.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`