firebase-functions 3.24.0 → 4.0.0-rc.0

package/lib/v2/providers/alerts/crashlytics.js

@@ -22,19 +22,20 @@
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOptsAndApp = exports.onOperation = exports.onNewAnrIssuePublished = exports.onVelocityAlertPublished = exports.onStabilityDigestPublished = exports.onRegressionAlertPublished = exports.onNewNonfatalIssuePublished = exports.onNewFatalIssuePublished = exports.newAnrIssueAlert = exports.velocityAlert = exports.stabilityDigestAlert = exports.regressionAlert = exports.newNonfatalIssueAlert = exports.newFatalIssueAlert = void 0;
+const trace_1 = require("../../trace");
 const alerts_1 = require("./alerts");
 /** @internal */
-exports.newFatalIssueAlert = 'crashlytics.newFatalIssue';
+exports.newFatalIssueAlert = "crashlytics.newFatalIssue";
 /** @internal */
-exports.newNonfatalIssueAlert = 'crashlytics.newNonfatalIssue';
+exports.newNonfatalIssueAlert = "crashlytics.newNonfatalIssue";
 /** @internal */
-exports.regressionAlert = 'crashlytics.regression';
+exports.regressionAlert = "crashlytics.regression";
 /** @internal */
-exports.stabilityDigestAlert = 'crashlytics.stabilityDigest';
+exports.stabilityDigestAlert = "crashlytics.stabilityDigest";
 /** @internal */
-exports.velocityAlert = 'crashlytics.velocity';
+exports.velocityAlert = "crashlytics.velocity";
 /** @internal */
-exports.newAnrIssueAlert = 'crashlytics.newAnrIssue';
+exports.newAnrIssueAlert = "crashlytics.newAnrIssue";
 /**
  * Declares a function that can handle a new fatal issue published to Crashlytics.
  * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function.
@@ -97,13 +98,13 @@ function onNewAnrIssuePublished(appIdOrOptsOrHandler, handler) {
 exports.onNewAnrIssuePublished = onNewAnrIssuePublished;
 /** @internal */
 function onOperation(alertType, appIdOrOptsOrHandler, handler) {
-    if (typeof appIdOrOptsOrHandler === 'function') {
+    if (typeof appIdOrOptsOrHandler === "function") {
         handler = appIdOrOptsOrHandler;
         appIdOrOptsOrHandler = {};
     }
     const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler);
     const func = (raw) => {
-        return handler((0, alerts_1.convertAlertAndApp)(raw));
+        return (0, trace_1.wrapTraceContext)(handler((0, alerts_1.convertAlertAndApp)(raw)));
     };
     func.run = handler;
     func.__endpoint = (0, alerts_1.getEndpointAnnotation)(opts, alertType, appId);
@@ -117,7 +118,7 @@ exports.onOperation = onOperation;
 function getOptsAndApp(appIdOrOpts) {
     let opts;
     let appId;
-    if (typeof appIdOrOpts === 'string') {
+    if (typeof appIdOrOpts === "string") {
         opts = {};
         appId = appIdOrOpts;
     }

package/lib/v2/providers/alerts/index.d.ts

@@ -4,9 +4,9 @@
  * notify users via Firebase Alerts.
  * @packageDocumentation
  */
-import * as appDistribution from './appDistribution';
-import * as billing from './billing';
-import * as crashlytics from './crashlytics';
-import * as performance from './performance';
+import * as appDistribution from "./appDistribution";
+import * as billing from "./billing";
+import * as crashlytics from "./crashlytics";
+import * as performance from "./performance";
 export { appDistribution, billing, crashlytics, performance };
-export * from './alerts';
+export * from "./alerts";

package/lib/v2/providers/alerts/performance.d.ts

@@ -2,24 +2,35 @@
  * Cloud functions to handle Firebase Performance Monitoring events from Firebase Alerts.
  * @packageDocumentation
  */
-import { CloudEvent, CloudFunction } from '../../core';
-import { EventHandlerOptions } from '../../options';
-import { FirebaseAlertData } from './alerts';
+import { CloudEvent, CloudFunction } from "../../core";
+import { EventHandlerOptions } from "../../options";
+import { FirebaseAlertData } from "./alerts";
 /**
  * The internal payload object for a performance threshold alert.
  * Payload is wrapped inside a {@link FirebaseAlertData} object.
  */
 export interface ThresholdAlertPayload {
+    /** Name of the trace or network request this alert is for (e.g. my_custom_trace, firebase.com/api/123) */
     eventName: string;
+    /** The resource type this alert is for (i.e. trace, network request, screen rendering, etc.) */
     eventType: string;
+    /** The metric type this alert is for (i.e. success rate, response time, duration, etc.) */
     metricType: string;
+    /** The number of events checked for this alert condition */
     numSamples: number;
+    /** The threshold value of the alert condition without units (e.g. "75", "2.1") */
     thresholdValue: number;
+    /** The unit for the alert threshold (e.g. "percent", "seconds") */
     thresholdUnit: string;
+    /** The percentile of the alert condition, can be 0 if percentile is not applicable to the alert condition and omitted; range: [1, 100] */
     conditionPercentile?: number;
+    /** The app version this alert was triggered for, can be omitted if the alert is for a network request (because the alert was checked against data from all versions of app) or a web app (where the app is versionless) */
     appVersion?: string;
+    /** The value that violated the alert condition (e.g. "76.5", "3") */
     violationValue: number;
+    /** The unit for the violation value (e.g. "percent", "seconds") */
     violationUnit: string;
+    /** The link to Fireconsole to investigate more into this alert */
     investigateUri: string;
 }
 /**
@@ -36,6 +47,7 @@ export interface PerformanceEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
  * Configuration for app distribution functions.
  */
 export interface PerformanceOptions extends EventHandlerOptions {
+    /** Scope the function to trigger on a specific application. */
     appId?: string;
 }
 /**

package/lib/v2/providers/alerts/performance.js

@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPayload = exports.getOptsAndApp = exports.onThresholdAlertPublished = exports.thresholdAlert = void 0;
 const alerts_1 = require("./alerts");
 /** @internal */
-exports.thresholdAlert = 'performance.threshold';
+exports.thresholdAlert = "performance.threshold";
 /**
  * Declares a function that can handle receiving performance threshold alerts.
  * @param appIdOrOptsOrHandler - A specific application, options, or an event-handling function.
@@ -32,7 +32,7 @@ exports.thresholdAlert = 'performance.threshold';
  * @returns A function that you can export and deploy.
  */
 function onThresholdAlertPublished(appIdOrOptsOrHandler, handler) {
-    if (typeof appIdOrOptsOrHandler === 'function') {
+    if (typeof appIdOrOptsOrHandler === "function") {
         handler = appIdOrOptsOrHandler;
         appIdOrOptsOrHandler = {};
     }
@@ -53,7 +53,7 @@ exports.onThresholdAlertPublished = onThresholdAlertPublished;
  * @internal
  */
 function getOptsAndApp(appIdOrOpts) {
-    if (typeof appIdOrOpts === 'string') {
+    if (typeof appIdOrOpts === "string") {
         return [{}, appIdOrOpts];
     }
     const opts = { ...appIdOrOpts };
@@ -68,12 +68,10 @@ exports.getOptsAndApp = getOptsAndApp;
  */
 function convertPayload(raw) {
     const payload = { ...raw };
-    if (typeof payload.conditionPercentile !== 'undefined' &&
-        payload.conditionPercentile === 0) {
+    if (typeof payload.conditionPercentile !== "undefined" && payload.conditionPercentile === 0) {
         delete payload.conditionPercentile;
     }
-    if (typeof payload.appVersion !== 'undefined' &&
-        payload.appVersion.length === 0) {
+    if (typeof payload.appVersion !== "undefined" && payload.appVersion.length === 0) {
         delete payload.appVersion;
     }
     return payload;

package/lib/v2/providers/database.d.ts

@@ -1,12 +1,15 @@
-import { Change } from '../../common/change';
-import { DataSnapshot } from '../../common/providers/database';
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { Change } from "../../common/change";
+import { ParamsOf } from "../../common/params";
+import { ResetValue } from "../../common/options";
+import { DataSnapshot } from "../../common/providers/database";
+import { CloudEvent, CloudFunction } from "../core";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 export { DataSnapshot };
 /** @hidden */
 export interface RawRTDBCloudEventData {
-    ['@type']: 'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData';
+    ["@type"]: "type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData";
     data: any;
     delta: any;
 }
@@ -18,7 +21,7 @@ export interface RawRTDBCloudEvent extends CloudEvent<RawRTDBCloudEventData> {
     location: string;
 }
 /** A CloudEvent that contains a DataSnapshot or a Change<DataSnapshot> */
-export interface DatabaseEvent<T> extends CloudEvent<T> {
+export interface DatabaseEvent<T, Params = Record<string, string>> extends CloudEvent<T> {
     /** The domain of the database instance */
     firebaseDatabaseHost: string;
     /** The instance ID portion of the fully qualified resource name */
@@ -31,16 +34,16 @@ export interface DatabaseEvent<T> extends CloudEvent<T> {
      * An object containing the values of the path patterns.
      * Only named capture groups will be populated - {key}, {key=*}, {key=**}
      */
-    params: Record<string, string>;
+    params: Params;
 }
 /** ReferenceOptions extend EventHandlerOptions with provided ref and optional instance  */
-export interface ReferenceOptions extends options.EventHandlerOptions {
+export interface ReferenceOptions<Ref extends string = string> extends options.EventHandlerOptions {
     /**
      * Specify the handler to trigger on a database reference(s).
      * This value can either be a single reference or a pattern.
      * Examples: '/foo/bar', '/foo/{bar}'
      */
-    ref: string;
+    ref: Ref;
     /**
      * Specify the handler to trigger on a database instance(s).
      * If present, this value can either be a single instance or a pattern.
@@ -54,76 +57,76 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @remarks
      * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
      * function depends on the type of function: Event handling functions have a
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    timeoutSeconds?: number | Expression<number> | ResetValue;
     /**
      * Min number of actual instances to be running at a given time.
+     *
+     * @remarks
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    maxInstances?: number | Expression<number> | ResetValue;
     /**
      * Number of requests a function can serve at once.
+     *
+     * @remarks
      * Can only be applied to functions running on Cloud Functions v2.
      * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    concurrency?: number | Expression<number> | ResetValue;
     /**
      * Fractional number of CPUs to allocate to a function.
+     *
+     * @remarks
      * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
      * This is different from the defaults when using the gcloud utility and is different from
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
     /** Whether failed executions should be delivered again. */
-    retry?: boolean | Expression<boolean> | null;
+    retry?: boolean | Expression<boolean> | ResetValue;
 }
 /**
  * Event handler which triggers when data is created, updated, or deleted in Realtime Database.
@@ -131,53 +134,53 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs.
  */
-export declare function onValueWritten(reference: string, handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export declare function onValueWritten<Ref extends string>(ref: Ref, handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is created, updated, or deleted in Realtime Database.
  *
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs.
  */
-export declare function onValueWritten(opts: ReferenceOptions, handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export declare function onValueWritten<Ref extends string>(opts: ReferenceOptions<Ref>, handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is created in Realtime Database.
  *
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database create occurs.
  */
-export declare function onValueCreated(reference: string, handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export declare function onValueCreated<Ref extends string>(ref: Ref, handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is created in Realtime Database.
  *
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database create occurs.
  */
-export declare function onValueCreated(opts: ReferenceOptions, handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export declare function onValueCreated<Ref extends string>(opts: ReferenceOptions<Ref>, handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is updated in Realtime Database.
  *
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database update occurs.
  */
-export declare function onValueUpdated(reference: string, handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export declare function onValueUpdated<Ref extends string>(ref: Ref, handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is updated in Realtime Database.
  *
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database update occurs.
  */
-export declare function onValueUpdated(opts: ReferenceOptions, handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export declare function onValueUpdated<Ref extends string>(opts: ReferenceOptions<Ref>, handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is deleted in Realtime Database.
  *
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database deletion occurs.
  */
-export declare function onValueDeleted(reference: string, handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export declare function onValueDeleted<Ref extends string>(ref: Ref, handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 /**
  * Event handler which triggers when data is deleted in Realtime Database.
  *
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database deletion occurs.
  */
-export declare function onValueDeleted(opts: ReferenceOptions, handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export declare function onValueDeleted<Ref extends string>(opts: ReferenceOptions<Ref>, handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;

package/lib/v2/providers/database.js

@@ -22,21 +22,23 @@
 // SOFTWARE.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOperation = exports.onChangedOperation = exports.makeEndpoint = exports.makeParams = exports.getOpts = exports.onValueDeleted = exports.onValueUpdated = exports.onValueCreated = exports.onValueWritten = exports.deletedEventType = exports.updatedEventType = exports.createdEventType = exports.writtenEventType = exports.DataSnapshot = void 0;
-const apps_1 = require("../../apps");
+const app_1 = require("../../common/app");
 const database_1 = require("../../common/providers/database");
 Object.defineProperty(exports, "DataSnapshot", { enumerable: true, get: function () { return database_1.DataSnapshot; } });
-const path_1 = require("../../utilities/path");
-const path_pattern_1 = require("../../utilities/path-pattern");
-const utils_1 = require("../../utils");
+const path_1 = require("../../common/utilities/path");
+const path_pattern_1 = require("../../common/utilities/path-pattern");
+const utils_1 = require("../../common/utilities/utils");
+const manifest_1 = require("../../runtime/manifest");
+const trace_1 = require("../trace");
 const options = require("../options");
 /** @internal */
-exports.writtenEventType = 'google.firebase.database.ref.v1.written';
+exports.writtenEventType = "google.firebase.database.ref.v1.written";
 /** @internal */
-exports.createdEventType = 'google.firebase.database.ref.v1.created';
+exports.createdEventType = "google.firebase.database.ref.v1.created";
 /** @internal */
-exports.updatedEventType = 'google.firebase.database.ref.v1.updated';
+exports.updatedEventType = "google.firebase.database.ref.v1.updated";
 /** @internal */
-exports.deletedEventType = 'google.firebase.database.ref.v1.deleted';
+exports.deletedEventType = "google.firebase.database.ref.v1.deleted";
 /**
  * Event handler which triggers when data is created, updated, or deleted in Realtime Database.
  *
@@ -80,15 +82,17 @@ function onValueDeleted(referenceOrOpts, handler) {
 exports.onValueDeleted = onValueDeleted;
 /** @internal */
 function getOpts(referenceOrOpts) {
-    let path, instance, opts;
-    if (typeof referenceOrOpts === 'string') {
+    let path;
+    let instance;
+    let opts;
+    if (typeof referenceOrOpts === "string") {
         path = (0, path_1.normalizePath)(referenceOrOpts);
-        instance = '*';
+        instance = "*";
         opts = {};
     }
     else {
         path = (0, path_1.normalizePath)(referenceOrOpts.ref);
-        instance = referenceOrOpts.instance || '*';
+        instance = referenceOrOpts.instance || "*";
         opts = { ...referenceOrOpts };
         delete opts.ref;
         delete opts.instance;
@@ -110,7 +114,7 @@ function makeParams(event, path, instance) {
 exports.makeParams = makeParams;
 /** @hidden */
 function makeDatabaseEvent(event, data, instance, params) {
-    const snapshot = new database_1.DataSnapshot(data, event.ref, (0, apps_1.apps)().admin, instance);
+    const snapshot = new database_1.DataSnapshot(data, event.ref, (0, app_1.getApp)(), instance);
     const databaseEvent = {
         ...event,
         firebaseDatabaseHost: event.firebasedatabasehost,
@@ -122,8 +126,8 @@ function makeDatabaseEvent(event, data, instance, params) {
 }
 /** @hidden */
 function makeChangedDatabaseEvent(event, instance, params) {
-    const before = new database_1.DataSnapshot(event.data.data, event.ref, (0, apps_1.apps)().admin, instance);
-    const after = new database_1.DataSnapshot((0, utils_1.applyChange)(event.data.data, event.data.delta), event.ref, (0, apps_1.apps)().admin, instance);
+    const before = new database_1.DataSnapshot(event.data.data, event.ref, (0, app_1.getApp)(), instance);
+    const after = new database_1.DataSnapshot((0, utils_1.applyChange)(event.data.data, event.data.delta), event.ref, (0, app_1.getApp)(), instance);
     const databaseEvent = {
         ...event,
         firebaseDatabaseHost: event.firebasedatabasehost,
@@ -149,7 +153,8 @@ function makeEndpoint(eventType, opts, path, instance) {
         ? (eventFilterPathPatterns.instance = instance.getValue())
         : (eventFilters.instance = instance.getValue());
     return {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOpts,
         ...specificOpts,
         labels: {
@@ -176,7 +181,7 @@ function onChangedOperation(eventType, referenceOrOpts, handler) {
         const instanceUrl = `https://${event.instance}.${event.firebasedatabasehost}`;
         const params = makeParams(event, pathPattern, instancePattern);
         const databaseEvent = makeChangedDatabaseEvent(event, instanceUrl, params);
-        return handler(databaseEvent);
+        return (0, trace_1.wrapTraceContext)(handler)(databaseEvent);
     };
     func.run = handler;
     func.__endpoint = makeEndpoint(eventType, opts, pathPattern, instancePattern);

package/lib/v2/providers/eventarc.d.ts

@@ -1,6 +1,8 @@
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { ResetValue } from "../../common/options";
+import { CloudEvent, CloudFunction } from "../core";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 /** Options that can be set on an Eventarc trigger. */
 export interface EventarcTriggerOptions extends options.EventHandlerOptions {
     /**
@@ -32,76 +34,76 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions {
     region?: options.SupportedRegion | string;
     /**
      * Amount of memory to allocate to a function.
-     * A value of null restores the defaults of 256MB.
      */
-    memory?: options.MemoryOption | Expression<number> | null;
+    memory?: options.MemoryOption | Expression<number> | ResetValue;
     /**
      * Timeout for the function in sections, possible values are 0 to 540.
      * HTTPS functions can specify a higher timeout.
-     * A value of null restores the default of 60s
+     *
+     * @remarks
      * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
      * function depends on the type of function: Event handling functions have a
      * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
      * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
      * timeout of 1,800s (30 minutes)
      */
-    timeoutSeconds?: number | Expression<number> | null;
+    timeoutSeconds?: number | Expression<number> | ResetValue;
     /**
      * Min number of actual instances to be running at a given time.
+     *
+     * @remarks
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
-     * A value of null restores the default min instances.
      */
-    minInstances?: number | Expression<number> | null;
+    minInstances?: number | Expression<number> | ResetValue;
     /**
      * Max number of instances to be running in parallel.
-     * A value of null restores the default max instances.
      */
-    maxInstances?: number | Expression<number> | null;
+    maxInstances?: number | Expression<number> | ResetValue;
     /**
      * Number of requests a function can serve at once.
+     *
+     * @remarks
      * Can only be applied to functions running on Cloud Functions v2.
      * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
      * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
      * The maximum value for concurrency is 1,000.
      */
-    concurrency?: number | Expression<number> | null;
+    concurrency?: number | Expression<number> | ResetValue;
     /**
      * Fractional number of CPUs to allocate to a function.
+     *
+     * @remarks
      * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
      * This is different from the defaults when using the gcloud utility and is different from
      * the fixed amount assigned in Google Cloud Functions generation 1.
      * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
      * to the value "gcf_gen1"
      */
-    cpu?: number | 'gcf_gen1';
+    cpu?: number | "gcf_gen1";
     /**
      * Connect cloud function to specified VPC connector.
-     * A value of null removes the VPC connector
      */
-    vpcConnector?: string | null;
+    vpcConnector?: string | ResetValue;
     /**
      * Egress settings for VPC connector.
-     * A value of null turns off VPC connector egress settings
      */
-    vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+    vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
     /**
      * Specific service account for the function to run as.
-     * A value of null restores the default service account.
      */
-    serviceAccount?: string | null;
+    serviceAccount?: string | ResetValue;
     /**
      * Ingress settings which control where this function can be called from.
-     * A value of null turns off ingress settings.
      */
-    ingressSettings?: options.IngressSetting | null;
+    ingressSettings?: options.IngressSetting | ResetValue;
     /**
      * User labels to set on the function.
      */
     labels?: Record<string, string>;
-    secrets?: string[];
+    secrets?: (string | SecretParam)[];
     /** Whether failed executions should be delivered again. */
-    retry?: boolean;
+    retry?: boolean | Expression<boolean> | ResetValue;
 }
 /** Handles an Eventarc event published on the default channel.
  * @param eventType - Type of the event to trigger on.

package/lib/v2/providers/eventarc.js

@@ -27,27 +27,30 @@ exports.onCustomEventPublished = void 0;
  * @packageDocumentation
  */
 const encoding_1 = require("../../common/encoding");
+const manifest_1 = require("../../runtime/manifest");
+const trace_1 = require("../trace");
 const options = require("../options");
 function onCustomEventPublished(eventTypeOrOpts, handler) {
     var _a;
     let opts;
-    if (typeof eventTypeOrOpts === 'string') {
+    if (typeof eventTypeOrOpts === "string") {
         opts = {
             eventType: eventTypeOrOpts,
         };
     }
-    else if (typeof eventTypeOrOpts === 'object') {
+    else if (typeof eventTypeOrOpts === "object") {
         opts = eventTypeOrOpts;
     }
     const func = (raw) => {
-        return handler(raw);
+        return (0, trace_1.wrapTraceContext)(handler)(raw);
     };
     func.run = handler;
-    const channel = (_a = opts.channel) !== null && _a !== void 0 ? _a : 'locations/us-central1/channels/firebase';
+    const channel = (_a = opts.channel) !== null && _a !== void 0 ? _a : "locations/us-central1/channels/firebase";
     const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
     const specificOpts = options.optionsToEndpoint(opts);
     const endpoint = {
-        platform: 'gcfv2',
+        ...(0, manifest_1.initV2Endpoint)(options.getGlobalOptions(), opts),
+        platform: "gcfv2",
         ...baseOpts,
         ...specificOpts,
         labels: {
@@ -61,8 +64,8 @@ function onCustomEventPublished(eventTypeOrOpts, handler) {
             channel,
         },
     };
-    (0, encoding_1.convertIfPresent)(endpoint.eventTrigger, opts, 'eventFilters', 'filters');
-    (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, 'retry');
+    (0, encoding_1.convertIfPresent)(endpoint.eventTrigger, opts, "eventFilters", "filters");
+    (0, encoding_1.copyIfPresent)(endpoint.eventTrigger, opts, "retry");
     func.__endpoint = endpoint;
     return func;
 }