Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"@firebase/app": "0.14.6",
"@opentelemetry/sdk-trace-web": "2.1.0",
"@rollup/plugin-json": "6.1.0",
"@rollup/plugin-replace": "6.0.2",
"@testing-library/dom": "10.4.1",
"@testing-library/react": "16.3.0",
"@types/react": "19.1.13",
Expand Down
56 changes: 43 additions & 13 deletions packages/telemetry/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,30 @@

import json from '@rollup/plugin-json';
import copy from 'rollup-plugin-copy';
import replacePlugin from '@rollup/plugin-replace';
import typescriptPlugin from 'rollup-plugin-typescript2';
import typescript from 'typescript';
import pkg from './package.json';
import { emitModulePackageFile } from '../../scripts/build/rollup_emit_module_package_file';

const deps = Object.keys(
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
);
const deps = [
...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies)),
'./constants/auto-constants',
];

function replaceSource(path) {
return replacePlugin({
'./src/constants/auto-constants': `'${path}'`,
'../constants/auto-constants': `'${path}'`,
delimiters: ["'", "'"],
preventAssignment: true
});
}

const buildPlugins = [typescriptPlugin({ typescript }), json()];
const buildPlugins = [
typescriptPlugin({ typescript }),
json(),
];

const browserBuilds = [
{
Expand All @@ -36,7 +50,7 @@ const browserBuilds = [
format: 'es',
sourcemap: true
},
plugins: buildPlugins,
plugins: [...buildPlugins, replaceSource('./auto-constants.js')],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
},
{
Expand All @@ -46,7 +60,7 @@ const browserBuilds = [
format: 'cjs',
sourcemap: true
},
plugins: buildPlugins,
plugins: [...buildPlugins, replaceSource('./auto-constants.js')],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
}
];
Expand All @@ -59,7 +73,7 @@ const nodeBuilds = [
format: 'cjs',
sourcemap: true
},
plugins: buildPlugins,
plugins: [...buildPlugins, replaceSource('./auto-constants.js')],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
},
{
Expand All @@ -69,7 +83,7 @@ const nodeBuilds = [
format: 'es',
sourcemap: true
},
plugins: [...buildPlugins, emitModulePackageFile()],
plugins: [...buildPlugins, emitModulePackageFile(), replaceSource('../auto-constants.js')],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
}
];
Expand Down Expand Up @@ -100,7 +114,8 @@ const reactBuilds = [
dest: 'dist'
}
]
})
}),
replaceSource('../auto-constants.js')
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
},
Expand All @@ -117,7 +132,8 @@ const reactBuilds = [
typescript,
tsconfig: 'tsconfig.react.json'
}),
json()
json(),
replaceSource('../auto-constants.js')
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
}
Expand Down Expand Up @@ -148,7 +164,8 @@ const angularBuilds = [
dest: 'dist'
}
]
})
}),
replaceSource('../auto-constants.js')
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
},
Expand All @@ -164,15 +181,28 @@ const angularBuilds = [
typescript,
tsconfig: 'tsconfig.angular.json'
}),
json()
json(),
replaceSource('../auto-constants.js')
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
}
];

const autoinitBuild = [
{
input: './src/constants/auto-constants.ts',
output: {
file: './dist/auto-constants.js',
format: 'cjs'
},
plugins: buildPlugins
},
];

export default [
...browserBuilds,
...nodeBuilds,
...reactBuilds,
...angularBuilds
...angularBuilds,
...autoinitBuild
];
8 changes: 2 additions & 6 deletions packages/telemetry/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { Provider } from '@firebase/component';
import { AnyValueMap, SeverityNumber } from '@opentelemetry/api-logs';
import { trace } from '@opentelemetry/api';
import { TelemetryService } from './service';
import { getAppVersion } from './helpers';

declare module '@firebase/component' {
interface NameServiceMapping {
Expand Down Expand Up @@ -93,12 +94,7 @@ export function captureError(
}

// Add app version metadata
let appVersion = 'unset';
// TODO: implement app version fallback logic
if ((telemetry as TelemetryService).options?.appVersion) {
appVersion = (telemetry as TelemetryService).options!.appVersion!;
}
customAttributes['app.version'] = appVersion;
customAttributes['app.version'] = getAppVersion(telemetry);

if (error instanceof Error) {
logger.emit({
Expand Down
1 change: 1 addition & 0 deletions packages/telemetry/src/constants/auto-constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const AUTO_APP_VERSION = '';
12 changes: 12 additions & 0 deletions packages/telemetry/src/helpers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import * as constants from './constants/auto-constants';
import { Telemetry } from './public-types';
import { TelemetryService } from './service';

export function getAppVersion(telemetry: Telemetry): string {
if ((telemetry as TelemetryService).options?.appVersion) {
return (telemetry as TelemetryService).options!.appVersion!;
} else if (constants.AUTO_APP_VERSION) {
return constants.AUTO_APP_VERSION;
}
return 'unset';
}
Loading