diff --git a/.github/component_owners.yml b/.github/component_owners.yml index 065b03703b..dda5ede26f 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -32,6 +32,8 @@ components: packages/baggage-span-processor: - mikegoldsmith - jamiedanielson + packages/opentelemetry-browser-extension-autoinjection: + - svrnm packages/opentelemetry-host-metrics: - legendecas packages/opentelemetry-id-generator-aws-xray: diff --git a/archive/opentelemetry-browser-extension-autoinjection/.eslintrc.js b/packages/opentelemetry-browser-extension-autoinjection/.eslintrc.js similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/.eslintrc.js rename to packages/opentelemetry-browser-extension-autoinjection/.eslintrc.js diff --git a/archive/opentelemetry-browser-extension-autoinjection/.gitignore b/packages/opentelemetry-browser-extension-autoinjection/.gitignore similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/.gitignore rename to packages/opentelemetry-browser-extension-autoinjection/.gitignore diff --git a/archive/opentelemetry-browser-extension-autoinjection/CHANGELOG.md b/packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/CHANGELOG.md rename to packages/opentelemetry-browser-extension-autoinjection/CHANGELOG.md diff --git a/archive/opentelemetry-browser-extension-autoinjection/LICENSE b/packages/opentelemetry-browser-extension-autoinjection/LICENSE similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/LICENSE rename to packages/opentelemetry-browser-extension-autoinjection/LICENSE diff --git a/archive/opentelemetry-browser-extension-autoinjection/README.md b/packages/opentelemetry-browser-extension-autoinjection/README.md similarity index 79% rename from archive/opentelemetry-browser-extension-autoinjection/README.md rename to packages/opentelemetry-browser-extension-autoinjection/README.md index 4d15bec1ce..34888b5af8 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/README.md +++ b/packages/opentelemetry-browser-extension-autoinjection/README.md @@ -1,10 +1,5 @@ # OpenTelemetry Browser Extension -## :warning: ARCHIVED PROJECT - -> This project has been archived by the maintainers on August 3 2022 because it was causing a failure in the CI and does not have any maintainer. -> Anyone who would like to maintain this project should open a PR to move it back into the lerna project and add themselves to the component owners file. - This browser extension allows you to inject [OpenTelemetry](https://opentelemetry.io/) instrumentation in any web page. It uses the [Web SDK](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-web) and can export data to Zipkin or an OpenTelemetry Collector. Compatible with OpenTelemetry JS API and SDK `1.0+`. @@ -50,6 +45,16 @@ Click on `Save & Reload`, check the developer toolbar to see how spans being are ![This image shows spans being printed into the console of the developer toolbar for opentelemetry.io](./images/console.png) +### Usage with OTLP + +If you'd like to export your telemetry to an OTLP endpoint (i.e. [collector](https://github.com/open-telemetry/opentelemetry-collector)) you might run into issues +with [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/) (CSP) and [Cross-Origin Resource Sharing](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) (CORS). + +To work around CSP you need another browser extension, that allows you to disable CSP for your targeted website. + +To work around CORS you need your OTLP endpoint to provide you with the right headers. To help you with that you find a `docker-compose.yml` in [./server] that +starts a nginx, OTel collector and jaeger instance for you. You can leverage that example to get your own installation up and running. + ## Known Limitations 1. The extension works with [active tab](https://developer.chrome.com/docs/extensions/mv3/manifest/activeTab/) permission, this means that every time you want to use it, you have to click the extension icon at least once for your tab. diff --git a/archive/opentelemetry-browser-extension-autoinjection/images/console.png b/packages/opentelemetry-browser-extension-autoinjection/images/console.png similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/images/console.png rename to packages/opentelemetry-browser-extension-autoinjection/images/console.png diff --git a/archive/opentelemetry-browser-extension-autoinjection/images/extensionCard.png b/packages/opentelemetry-browser-extension-autoinjection/images/extensionCard.png similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/images/extensionCard.png rename to packages/opentelemetry-browser-extension-autoinjection/images/extensionCard.png diff --git a/archive/opentelemetry-browser-extension-autoinjection/images/inject-opentelemetry.gif b/packages/opentelemetry-browser-extension-autoinjection/images/inject-opentelemetry.gif similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/images/inject-opentelemetry.gif rename to packages/opentelemetry-browser-extension-autoinjection/images/inject-opentelemetry.gif diff --git a/archive/opentelemetry-browser-extension-autoinjection/images/options.png b/packages/opentelemetry-browser-extension-autoinjection/images/options.png similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/images/options.png rename to packages/opentelemetry-browser-extension-autoinjection/images/options.png diff --git a/archive/opentelemetry-browser-extension-autoinjection/images/popup.png b/packages/opentelemetry-browser-extension-autoinjection/images/popup.png similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/images/popup.png rename to packages/opentelemetry-browser-extension-autoinjection/images/popup.png diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json similarity index 99% rename from archive/opentelemetry-browser-extension-autoinjection/package.json rename to packages/opentelemetry-browser-extension-autoinjection/package.json index 1efd629ff2..6e9a00d732 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -83,4 +83,4 @@ "react-dom": "17.0.2" }, "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme" -} +} \ No newline at end of file diff --git a/packages/opentelemetry-browser-extension-autoinjection/server/default.conf b/packages/opentelemetry-browser-extension-autoinjection/server/default.conf new file mode 100644 index 0000000000..ebe6a7fabb --- /dev/null +++ b/packages/opentelemetry-browser-extension-autoinjection/server/default.conf @@ -0,0 +1,25 @@ +server { + listen 80 default_server; + server_name _; + location / { + # Take care of preflight requests + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Max-Age' 1728000; + add_header "Access-Control-Allow-Origin" "$http_origin" always; + add_header 'Access-Control-Allow-Headers' 'Accept,Accept-Language,Content-Language,Content-Type,X-Requested-With' always; + add_header 'Access-Control-Allow-Credentials' 'true' always; + add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Length' 0; + return 204; + } + + add_header "Access-Control-Allow-Origin" "$http_origin" always; + add_header 'Access-Control-Allow-Credentials' 'true' always; + add_header 'Access-Control-Allow-Headers' 'Accept,Accept-Language,Content-Language,Content-Type,X-Requested-With' always; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://collector:4318; + } +} \ No newline at end of file diff --git a/packages/opentelemetry-browser-extension-autoinjection/server/docker-compose.yml b/packages/opentelemetry-browser-extension-autoinjection/server/docker-compose.yml new file mode 100644 index 0000000000..1cbc454055 --- /dev/null +++ b/packages/opentelemetry-browser-extension-autoinjection/server/docker-compose.yml @@ -0,0 +1,23 @@ +version: "2" +services: + jaeger: + image: jaegertracing/all-in-one:latest + environment: + - COLLECTOR_OTLP_ENABLED=true + ports: + - "16686:16686" + proxy: + image: nginx:latest + ports: + - "4318:80" + volumes: + - ./default.conf:/etc/nginx/conf.d/default.conf + depends_on: + - collector + collector: + image: otel/opentelemetry-collector:latest + command: ["--config=/etc/otel-collector-config.yaml"] + volumes: + - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml + depends_on: + - jaeger diff --git a/packages/opentelemetry-browser-extension-autoinjection/server/otel-collector-config.yaml b/packages/opentelemetry-browser-extension-autoinjection/server/otel-collector-config.yaml new file mode 100644 index 0000000000..bc357580c0 --- /dev/null +++ b/packages/opentelemetry-browser-extension-autoinjection/server/otel-collector-config.yaml @@ -0,0 +1,31 @@ +receivers: + otlp: + protocols: + http: + include_metadata: true +processors: + resource: + attributes: + - key: browser.user_agent + from_context: User-Agent + action: upsert + attributes: + actions: + - key: http.client_ip + from_context: X-Forwarded-For + action: upsert + +exporters: + otlp: + endpoint: jaeger:4317 + tls: + insecure: true + insecure_skip_verify: true + logging: + +service: + pipelines: + traces: + receivers: [otlp] + processors: [resource,attributes] + exporters: [logging, otlp] diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/background/ProgrammaticContentScriptInjector.ts b/packages/opentelemetry-browser-extension-autoinjection/src/background/ProgrammaticContentScriptInjector.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/background/ProgrammaticContentScriptInjector.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/background/ProgrammaticContentScriptInjector.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/background/index.ts b/packages/opentelemetry-browser-extension-autoinjection/src/background/index.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/background/index.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/background/index.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/contentScript/InstrumentationInjector.ts b/packages/opentelemetry-browser-extension-autoinjection/src/contentScript/InstrumentationInjector.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/contentScript/InstrumentationInjector.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/contentScript/InstrumentationInjector.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/contentScript/index.ts b/packages/opentelemetry-browser-extension-autoinjection/src/contentScript/index.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/contentScript/index.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/contentScript/index.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/icons/otel-logo.png b/packages/opentelemetry-browser-extension-autoinjection/src/icons/otel-logo.png similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/icons/otel-logo.png rename to packages/opentelemetry-browser-extension-autoinjection/src/icons/otel-logo.png diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts b/packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts similarity index 69% rename from archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts index d467460e7d..ec28570307 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts @@ -17,10 +17,11 @@ import { registerInstrumentations } from '@opentelemetry/instrumentation'; import { DocumentLoadInstrumentation } from '@opentelemetry/instrumentation-document-load'; import { FetchInstrumentation } from '@opentelemetry/instrumentation-fetch'; import { XMLHttpRequestInstrumentation } from '@opentelemetry/instrumentation-xml-http-request'; +import { UserInteractionInstrumentation } from '@opentelemetry/instrumentation-user-interaction'; import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'; import { ZoneContextManager } from '@opentelemetry/context-zone'; import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; -import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; +import { OTLPTraceExporter as OTLPHttpTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'; import { BatchSpanProcessor, ConsoleSpanExporter, @@ -37,45 +38,64 @@ export class WebInstrumentation { withZoneContextManager: boolean; provider: WebTracerProvider; exporters: Exporters; + logger: Console; instrumentations: { [InstrumentationType.DOCUMENT_LOAD]: { enabled: boolean }; [InstrumentationType.FETCH]: { enabled: boolean }; [InstrumentationType.XML_HTTP_REQUEST]: { enabled: boolean }; + [InstrumentationType.USER_INTERACTION]: { enabled: boolean }; }; constructor( config: InstrumentationConfiguration, - provider: WebTracerProvider + provider: WebTracerProvider, + logger: Console ) { this.exporters = config.exporters; this.instrumentations = config.instrumentations; this.provider = provider; this.withZoneContextManager = config.withZoneContextManager; + this.logger = logger; } addExporters() { if (this.exporters[ExporterType.CONSOLE].enabled) { + this.logger.info( + '[otel-extension] Logging spans to the console with ConsoleSpanExporter' + ); this.provider.addSpanProcessor( new SimpleSpanProcessor(new ConsoleSpanExporter()) ); } if (this.exporters[ExporterType.ZIPKIN].enabled) { - this.provider.addSpanProcessor( - new BatchSpanProcessor( - new ZipkinExporter({ + const options = this.exporters[ExporterType.ZIPKIN].url + ? { url: this.exporters[ExporterType.ZIPKIN].url, - }) - ) + } + : {}; + this.logger.info( + '[otel-extension] Logging spans to the console with ZipkinExporter(', + options, + ')' + ); + this.provider.addSpanProcessor( + new BatchSpanProcessor(new ZipkinExporter(options)) ); } - if (this.exporters[ExporterType.COLLECTOR_TRACE].enabled) { + if (this.exporters[ExporterType.TRACE_OTLP_HTTP].enabled) { + const options = this.exporters[ExporterType.TRACE_OTLP_HTTP].url + ? { + url: this.exporters[ExporterType.TRACE_OTLP_HTTP].url, + } + : {}; + this.logger.info( + '[otel-extension] Logging spans to the console with OTLPHttpTraceExporter(', + options, + ')' + ); this.provider.addSpanProcessor( - new BatchSpanProcessor( - new OTLPTraceExporter({ - url: this.exporters[ExporterType.COLLECTOR_TRACE].url, - }) - ) + new BatchSpanProcessor(new OTLPHttpTraceExporter(options)) ); } } @@ -95,6 +115,10 @@ export class WebInstrumentation { instrumentations.push(new XMLHttpRequestInstrumentation()); } + if (this.instrumentations[InstrumentationType.USER_INTERACTION].enabled) { + instrumentations.push(new UserInteractionInstrumentation()); + } + registerInstrumentations({ instrumentations, tracerProvider: this.provider, diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts b/packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts similarity index 94% rename from archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts index 2ae22adf05..4e04c54209 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts @@ -43,6 +43,9 @@ new WebInstrumentation( [InstrumentationType.XML_HTTP_REQUEST]: { enabled: true, }, + [InstrumentationType.USER_INTERACTION]: { + enabled: true, + }, }, withZoneContextManager: true, }, @@ -50,5 +53,6 @@ new WebInstrumentation( resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: window.location.hostname, }), - }) + }), + console ).register(); diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/manifest.json5 b/packages/opentelemetry-browser-extension-autoinjection/src/manifest.json5 similarity index 77% rename from archive/opentelemetry-browser-extension-autoinjection/src/manifest.json5 rename to packages/opentelemetry-browser-extension-autoinjection/src/manifest.json5 index 48b89d5249..80647e2706 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/manifest.json5 +++ b/packages/opentelemetry-browser-extension-autoinjection/src/manifest.json5 @@ -15,9 +15,12 @@ "open_in_tab": true, }, "web_accessible_resources": [ - "instrumentation.js" + "instrumentation.js", + "instrumentation.js.map", + "contentScript.js.map", + "js/index.js.map" ], "host_permissions": [ '' ] -} \ No newline at end of file +} diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/template.html b/packages/opentelemetry-browser-extension-autoinjection/src/template.html similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/template.html rename to packages/opentelemetry-browser-extension-autoinjection/src/template.html diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/types.ts b/packages/opentelemetry-browser-extension-autoinjection/src/types.ts similarity index 92% rename from archive/opentelemetry-browser-extension-autoinjection/src/types.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/types.ts index dcd8f1cb01..1dd286a9f1 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/types.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/src/types.ts @@ -25,7 +25,7 @@ export interface Exporters { enabled: boolean; url: string; }; - [ExporterType.COLLECTOR_TRACE]: { + [ExporterType.TRACE_OTLP_HTTP]: { enabled: boolean; url: string; }; @@ -43,6 +43,9 @@ export interface InstrumentationConfiguration { [InstrumentationType.XML_HTTP_REQUEST]: { enabled: boolean; }; + [InstrumentationType.USER_INTERACTION]: { + enabled: boolean; + }; }; withZoneContextManager: boolean; } @@ -81,7 +84,7 @@ export interface ExporterOptionProps { isEnabled: boolean; onToggle: (exporter: ExporterType) => void; onValueChange?: ( - name: ExporterType.ZIPKIN | ExporterType.COLLECTOR_TRACE, + name: ExporterType.ZIPKIN | ExporterType.TRACE_OTLP_HTTP, newValue: string ) => void; exporterPackageUrl: string; @@ -117,13 +120,14 @@ export enum AppType { export enum ExporterType { CONSOLE = 'Console', ZIPKIN = 'Zipkin', - COLLECTOR_TRACE = 'CollectorTrace', + TRACE_OTLP_HTTP = 'OTLP HTTP', } export enum InstrumentationType { DOCUMENT_LOAD = 'DocumentLoad', FETCH = 'Fetch', XML_HTTP_REQUEST = 'XMLHttpRequest', + USER_INTERACTION = 'UserInteraction', } export enum DomElements { @@ -136,7 +140,7 @@ export enum DomAttributes { export enum PlaceholderValues { ZIPKIN_URL = 'http://localhost:9411/api/v2/spans', - COLLECTOR_TRACE_URL = 'http://localhost:4318/v1/trace', + TRACE_OTLP_HTTP_URL = 'http://localhost:4318/v1/traces', } export enum Labels { diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx similarity index 95% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx index 7d214fe73f..4250ce71b3 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx +++ b/packages/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx @@ -80,7 +80,7 @@ export class App extends React.Component { } handleUrlChange( - name: ExporterType.ZIPKIN | ExporterType.COLLECTOR_TRACE, + name: ExporterType.ZIPKIN | ExporterType.TRACE_OTLP_HTTP, value: string ) { this.setState(state => { @@ -244,13 +244,13 @@ export class App extends React.Component { value={exporters[ExporterType.ZIPKIN].url} /> diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx similarity index 95% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx index 9b8543c9fb..0ab9630f5b 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx +++ b/packages/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx @@ -52,7 +52,7 @@ export class ExporterOption extends React.Component { - {this.props.value !== undefined ? ( + {this.props.value !== undefined && this.props.isEnabled ? ( { ? this.props.onValueChange( this.props.for as | ExporterType.ZIPKIN - | ExporterType.COLLECTOR_TRACE, + | ExporterType.TRACE_OTLP_HTTP, event.target.value ) : () => {} diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/OpenOptionsPage.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/OpenOptionsPage.tsx similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/OpenOptionsPage.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/OpenOptionsPage.tsx diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/PermissionAlert.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/PermissionAlert.tsx similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/PermissionAlert.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/PermissionAlert.tsx diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/PermissionManager.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/PermissionManager.tsx similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/PermissionManager.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/PermissionManager.tsx diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/SaveButton.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/SaveButton.tsx similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/SaveButton.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/SaveButton.tsx diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/index.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/index.tsx similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/index.tsx rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/index.tsx diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/ui/styles.ts b/packages/opentelemetry-browser-extension-autoinjection/src/ui/styles.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/ui/styles.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/ui/styles.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/utils/manifest-loader.ts b/packages/opentelemetry-browser-extension-autoinjection/src/utils/manifest-loader.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/src/utils/manifest-loader.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/utils/manifest-loader.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts b/packages/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts similarity index 96% rename from archive/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts rename to packages/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts index 20be513eb5..60ec64b6a7 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts @@ -31,7 +31,7 @@ export function loadFromStorage(): Promise { enabled: false, url: '', }, - [ExporterType.COLLECTOR_TRACE]: { + [ExporterType.TRACE_OTLP_HTTP]: { enabled: false, url: '', }, diff --git a/archive/opentelemetry-browser-extension-autoinjection/test/background.test.ts b/packages/opentelemetry-browser-extension-autoinjection/test/background.test.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/test/background.test.ts rename to packages/opentelemetry-browser-extension-autoinjection/test/background.test.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/test/contentScript.test.ts b/packages/opentelemetry-browser-extension-autoinjection/test/contentScript.test.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/test/contentScript.test.ts rename to packages/opentelemetry-browser-extension-autoinjection/test/contentScript.test.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts b/packages/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts similarity index 89% rename from archive/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts rename to packages/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts index 759d3c2589..49a5210e42 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts @@ -62,9 +62,9 @@ describe('WebInstrumentation', () => { enabled: true, url: PlaceholderValues.ZIPKIN_URL, }, - [ExporterType.COLLECTOR_TRACE]: { + [ExporterType.TRACE_OTLP_HTTP]: { enabled: true, - url: PlaceholderValues.COLLECTOR_TRACE_URL, + url: PlaceholderValues.TRACE_OTLP_HTTP_URL, }, }, instrumentations: { @@ -77,10 +77,15 @@ describe('WebInstrumentation', () => { [InstrumentationType.XML_HTTP_REQUEST]: { enabled: true, }, + [InstrumentationType.USER_INTERACTION]: { + // disabled, throws "ReferenceError: history is not defined" + enabled: false, + }, }, withZoneContextManager: true, }, - provider + provider, + console ); instrumentation.register(); assert.ok(addSpanProcessorSpy.callCount === 3); diff --git a/archive/opentelemetry-browser-extension-autoinjection/test/utils.ts b/packages/opentelemetry-browser-extension-autoinjection/test/utils.ts similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/test/utils.ts rename to packages/opentelemetry-browser-extension-autoinjection/test/utils.ts diff --git a/archive/opentelemetry-browser-extension-autoinjection/tsconfig.json b/packages/opentelemetry-browser-extension-autoinjection/tsconfig.json similarity index 100% rename from archive/opentelemetry-browser-extension-autoinjection/tsconfig.json rename to packages/opentelemetry-browser-extension-autoinjection/tsconfig.json diff --git a/archive/opentelemetry-browser-extension-autoinjection/webpack.config.ts b/packages/opentelemetry-browser-extension-autoinjection/webpack.config.ts similarity index 99% rename from archive/opentelemetry-browser-extension-autoinjection/webpack.config.ts rename to packages/opentelemetry-browser-extension-autoinjection/webpack.config.ts index 53fdc8fa85..f3a7a19501 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/webpack.config.ts +++ b/packages/opentelemetry-browser-extension-autoinjection/webpack.config.ts @@ -25,6 +25,7 @@ import * as HtmlWebpackPlugin from 'html-webpack-plugin'; module.exports = (env: { MV?: string; WEBPACK_BUILD: boolean }) => { // Build the extension for "Manifest Version 2" (Chromium, Firefox & others.) const baseConfig = { + devtool: 'source-map', entry: { background: './src/background/index.ts', contentScript: './src/contentScript/index.ts', diff --git a/release-please-config.json b/release-please-config.json index bb6cacc61c..f569743b8f 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -16,6 +16,7 @@ "metapackages/auto-instrumentations-node": {}, "metapackages/auto-instrumentations-web": {}, "packages/baggage-span-processor": {}, + "packages/opentelemetry-browser-extension-autoinjection": {}, "packages/opentelemetry-host-metrics": {}, "packages/opentelemetry-id-generator-aws-xray": {}, "packages/opentelemetry-propagation-utils": {},