update - remove

Author: xlisachan

libs/payments/cart/src/lib/cart.service.spec.ts

@@ -131,7 +131,6 @@ import {
   CommonMetricsFactory,
   MockPaymentsGleanConfigProvider,
   MockPaymentsGleanFactory,
-  MockPaymentsGleanClientFactory,
   PaymentsGleanManager,
   PaymentsGleanService,
 } from '@fxa/payments/metrics';
@@ -217,7 +216,6 @@ describe('CartService', () => {
         MockLocationConfigProvider,
         MockNotifierSnsConfigProvider,
         MockPaymentsGleanFactory,
-        MockPaymentsGleanClientFactory,
         MockPaymentsGleanConfigProvider,
         MockPaypalClientConfigProvider,
         MockProfileClientConfigProvider,

libs/payments/cart/src/lib/checkout.service.spec.ts

@@ -126,7 +126,6 @@ import {
   CommonMetricsFactory,
   MockPaymentsGleanConfigProvider,
   MockPaymentsGleanFactory,
-  MockPaymentsGleanClientFactory,
   PaymentsGleanManager,
   PaymentsGleanService,
 } from '@fxa/payments/metrics';
@@ -197,7 +196,6 @@ describe('CheckoutService', () => {
         MockCurrencyConfigProvider,
         MockFirestoreProvider,
         MockPaymentsGleanFactory,
-        MockPaymentsGleanClientFactory,
         MockLocationConfigProvider,
         MockNimbusManagerConfigProvider,
         MockNimbusClientConfigProvider,

libs/payments/events/src/lib/emitter.service.spec.ts

@@ -40,7 +40,6 @@ import {
   GenericGleanSubManageEventFactory,
   MockPaymentsGleanConfigProvider,
   MockPaymentsGleanFactory,
-  MockPaymentsGleanClientFactory,
   PaymentsGleanManager,
   PaymentsGleanService,
 } from '@fxa/payments/metrics';
@@ -126,7 +125,6 @@ describe('PaymentsEmitterService', () => {
         MockPaymentsGleanConfigProvider,
         MockAccountDatabaseNestFactory,
         MockPaymentsGleanFactory,
-        MockPaymentsGleanClientFactory,
         MockStrapiClientConfigProvider,
         MockStripeConfigProvider,
         MockFirestoreProvider,

libs/payments/events/src/lib/emitter.service.ts

@@ -14,9 +14,6 @@ import { LocationStatus } from '@fxa/payments/eligibility';
 import {
   CheckoutEvents,
   CheckoutPaymentEvents,
-  GleanInterstitialOfferEvent,
-  GleanPageViewEvent,
-  GleanRetentionFlowEvent,
   PaymentsEmitterEvents,
   SP3RolloutEvent,
   SubscriptionEndedEvents,
@@ -70,18 +67,6 @@ export class PaymentsEmitterService {
       'genericGleanSubManageEvent',
       this.handleGenericSubManageGleanEvent.bind(this)
     );
-    this.emitter.on(
-      'gleanPageView',
-      this.handleGleanPageView.bind(this)
-    );
-    this.emitter.on(
-      'gleanRetentionFlow',
-      this.handleGleanRetentionFlow.bind(this)
-    );
-    this.emitter.on(
-      'gleanInterstitialOffer',
-      this.handleGleanInterstitialOffer.bind(this)
-    );
   }
 
   getEmitter(): Emittery<PaymentsEmitterEvents> {
@@ -276,29 +261,6 @@ export class PaymentsEmitterService {
     await this.paymentsGleanService.recordGenericSubManageEvent(eventData);
   }
 
-  async handleGleanPageView(eventData: GleanPageViewEvent) {
-    const { pageMetrics, ...subManageArgs } = eventData;
-    await this.paymentsGleanService.recordPageView(subManageArgs, pageMetrics);
-  }
-
-  async handleGleanRetentionFlow(eventData: GleanRetentionFlowEvent) {
-    const { retentionFlowMetrics, ...subManageArgs } = eventData;
-    await this.paymentsGleanService.recordRetentionFlow(
-      subManageArgs,
-      retentionFlowMetrics
-    );
-  }
-
-  async handleGleanInterstitialOffer(
-    eventData: GleanInterstitialOfferEvent
-  ) {
-    const { interstitialOfferMetrics, ...subManageArgs } = eventData;
-    await this.paymentsGleanService.recordInterstitialOffer(
-      subManageArgs,
-      interstitialOfferMetrics
-    );
-  }
-
   async handleCheckoutFail(eventData: CheckoutPaymentEvents) {
     const additionalData = await retrieveAdditionalMetricsData(
       this.productConfigurationManager,

libs/payments/events/src/lib/emitter.types.ts

@@ -8,9 +8,6 @@ import {
   CmsMetricsData,
   CommonMetrics,
   type GenericGleanSubManageEvent,
-  type PageMetricsData,
-  type RetentionFlowEventMetricsData,
-  type SubManageMetricsArgs,
 } from '@fxa/payments/metrics';
 import { LocationStatus } from '@fxa/payments/eligibility';
 import { TaxChangeAllowedStatus } from '@fxa/payments/cart';
@@ -72,18 +69,6 @@ export type GenericGleanEvent = {
   commonMetrics: CommonMetrics;
 };
 
-export type GleanPageViewEvent = SubManageMetricsArgs & {
-  pageMetrics: PageMetricsData;
-};
-
-export type GleanRetentionFlowEvent = SubManageMetricsArgs & {
-  retentionFlowMetrics: RetentionFlowEventMetricsData;
-};
-
-export type GleanInterstitialOfferEvent = SubManageMetricsArgs & {
-  interstitialOfferMetrics: RetentionFlowEventMetricsData;
-};
-
 export type PaymentsEmitterEvents = {
   checkoutView: CheckoutEvents;
   checkoutEngage: CheckoutEvents;
@@ -92,9 +77,6 @@ export type PaymentsEmitterEvents = {
   checkoutFail: CheckoutPaymentEvents;
   genericGleanEvent: GenericGleanEvent;
   genericGleanSubManageEvent: GenericGleanSubManageEvent;
-  gleanPageView: GleanPageViewEvent;
-  gleanRetentionFlow: GleanRetentionFlowEvent;
-  gleanInterstitialOffer: GleanInterstitialOfferEvent;
   subscriptionEnded: SubscriptionEndedEvents;
   sp3Rollout: SP3RolloutEvent;
   locationView: LocationStatus | TaxChangeAllowedStatus;

libs/payments/metrics/src/client.ts

@@ -3,6 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 export * from './lib/glean/glean-client.manager';
-export * from './lib/glean/glean-client.provider';
 export * from './lib/glean/glean.config';
 export * from './lib/glean/glean.types';

libs/payments/metrics/src/lib/glean/glean-client.provider.ts

@@ -11,10 +11,7 @@ import {
   SubscriptionCancellationDataFactory,
 } from './glean.factory';
 import { PaymentsGleanProvider } from './glean.types';
-import {
-  MockPaymentsGleanFactory,
-  MockPaymentsGleanClientFactory,
-} from './glean.test-provider';
+import { MockPaymentsGleanFactory } from './glean.test-provider';
 import {
   MockPaymentsGleanConfigProvider,
   PaymentsGleanConfig,
@@ -42,7 +39,6 @@ describe('PaymentsGleanManager', () => {
     const moduleRef = await Test.createTestingModule({
       providers: [
         MockPaymentsGleanFactory,
-        MockPaymentsGleanClientFactory,
         PaymentsGleanManager,
         MockPaymentsGleanConfigProvider,
       ],
@@ -222,7 +218,6 @@ describe('PaymentsGleanManager', () => {
         const moduleRef = await Test.createTestingModule({
           providers: [
             MockPaymentsGleanFactory,
-            MockPaymentsGleanClientFactory,
             PaymentsGleanManager,
             MockPaymentsGleanConfigProvider,
             {