From 2b2b62a2babe4d3b19315100da5e3dd22f95ffed Mon Sep 17 00:00:00 2001 From: svrnm Date: Mon, 5 Sep 2022 17:49:19 +0200 Subject: [PATCH 1/9] feat: bring back browser extension Signed-off-by: svrnm --- .github/component_owners.yml | 2 + .../.eslintrc.js | 0 .../.gitignore | 0 .../CHANGELOG.md | 0 .../LICENSE | 0 .../README.md | 27 ++++++---- .../images/console.png | Bin .../images/extensionCard.png | Bin .../images/inject-opentelemetry.gif | Bin .../images/options.png | Bin .../images/popup.png | Bin .../package.json | 49 +++++++++-------- .../server/default.conf | 25 +++++++++ .../server/docker-compose.yml | 23 ++++++++ .../server/otel-collector-config.yaml | 31 +++++++++++ .../ProgrammaticContentScriptInjector.ts | 0 .../src/background/index.ts | 0 .../contentScript/InstrumentationInjector.ts | 0 .../src/contentScript/index.ts | 0 .../src/icons/otel-logo.png | Bin .../src/instrumentation/WebInstrumentation.ts | 50 +++++++++++++----- .../src/instrumentation/index.ts | 6 ++- .../src/manifest.json5 | 7 ++- .../src/template.html | 0 .../src/types.ts | 12 +++-- .../src/ui/App.tsx | 12 ++--- .../src/ui/ExporterOption.tsx | 4 +- .../src/ui/OpenOptionsPage.tsx | 0 .../src/ui/PermissionAlert.tsx | 0 .../src/ui/PermissionManager.tsx | 0 .../src/ui/SaveButton.tsx | 0 .../src/ui/index.tsx | 0 .../src/ui/styles.ts | 0 .../src/utils/manifest-loader.ts | 0 .../src/utils/storage.ts | 2 +- .../test/background.test.ts | 0 .../test/contentScript.test.ts | 0 .../test/instrumentation.test.ts | 11 ++-- .../test/utils.ts | 0 .../tsconfig.json | 0 .../webpack.config.ts | 1 + release-please-config.json | 1 + 42 files changed, 197 insertions(+), 66 deletions(-) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/.eslintrc.js (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/.gitignore (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/CHANGELOG.md (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/LICENSE (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/README.md (71%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/images/console.png (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/images/extensionCard.png (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/images/inject-opentelemetry.gif (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/images/options.png (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/images/popup.png (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/package.json (69%) create mode 100644 packages/opentelemetry-browser-extension-autoinjection/server/default.conf create mode 100644 packages/opentelemetry-browser-extension-autoinjection/server/docker-compose.yml create mode 100644 packages/opentelemetry-browser-extension-autoinjection/server/otel-collector-config.yaml rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/background/ProgrammaticContentScriptInjector.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/background/index.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/contentScript/InstrumentationInjector.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/contentScript/index.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/icons/otel-logo.png (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/instrumentation/WebInstrumentation.ts (69%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/instrumentation/index.ts (94%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/manifest.json5 (77%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/template.html (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/types.ts (92%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/App.tsx (95%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx (95%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/OpenOptionsPage.tsx (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/PermissionAlert.tsx (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/PermissionManager.tsx (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/SaveButton.tsx (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/index.tsx (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/ui/styles.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/utils/manifest-loader.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/src/utils/storage.ts (96%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/test/background.test.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/test/contentScript.test.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/test/instrumentation.test.ts (89%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/test/utils.ts (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/tsconfig.json (100%) rename {archive => packages}/opentelemetry-browser-extension-autoinjection/webpack.config.ts (99%) diff --git a/.github/component_owners.yml b/.github/component_owners.yml index c73c5dc8ff..ac51d0c4d9 100644 --- a/.github/component_owners.yml +++ b/.github/component_owners.yml @@ -11,6 +11,8 @@ components: - obecny metapackages/auto-instrumentations-web: - obecny + 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 71% rename from archive/opentelemetry-browser-extension-autoinjection/README.md rename to packages/opentelemetry-browser-extension-autoinjection/README.md index 5235741193..7bae5b5d4c 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+`. @@ -13,9 +8,9 @@ Compatible with OpenTelemetry JS API and SDK `1.0+`. ## Supported Environments -* Google Chrome (with [Manifest Version 3](https://developer.chrome.com/docs/extensions/mv3/intro/) support) -* Chromium (with Manifest Version 2) -* Firefox (*unstable*, with Manifest Version 2) +- Google Chrome (with [Manifest Version 3](https://developer.chrome.com/docs/extensions/mv3/intro/) support) +- Chromium (with Manifest Version 2) +- Firefox (_unstable_, with Manifest Version 2) ## Installation @@ -32,9 +27,9 @@ npm run build This will create a so-called unpacked extension into the `build/` folder you now can load into your browser: -* Open a new browser window and go to chrome://extensions -* Turn on "Developer Mode" -* Click on "Load unpacked" and select the `build/mv3` (or `build/mv2`) folder, which contains the extension +- Open a new browser window and go to chrome://extensions +- Turn on "Developer Mode" +- Click on "Load unpacked" and select the `build/mv3` (or `build/mv2`) folder, which contains the extension If all goes well you should see the extension listed: @@ -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 69% rename from archive/opentelemetry-browser-extension-autoinjection/package.json rename to packages/opentelemetry-browser-extension-autoinjection/package.json index 7876d7c0fc..e997632096 100644 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/browser-extension-autoinjection", - "version": "0.29.0", + "version": "0.32.0", "description": "A browser extension that injects opentelemetry tracers into any website", "scripts": { "clean": "rimraf build/*", @@ -13,6 +13,7 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "version:update": "node ../../scripts/version-update.js", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "npx webpack --mode=development --watch", "watch:mv2": "npx webpack --mode=development --watch --env MV=2", @@ -26,60 +27,62 @@ "node": ">=8.12.0" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "@opentelemetry/api": "^1.2.0" }, "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@types/chrome": "0.0.154", - "@types/jsdom": "16.2.13", + "@opentelemetry/api": "^1.2.0", + "@types/chrome": "0.0.196", + "@types/jsdom": "16.2.15", "@types/mocha": "8.2.3", "@types/react": "17.0.16", "@types/react-dom": "18.0.2", "@types/sinon": "10.0.2", "@types/sinon-chrome": "2.2.11", - "@typescript-eslint/eslint-plugin": "5.8.1", - "@typescript-eslint/parser": "5.8.1", - "eslint": "8.7.0", + "@typescript-eslint/eslint-plugin": "5.36.1", + "@typescript-eslint/parser": "5.36.1", + "eslint": "8.23.0", "eslint-config-airbnb-base": "15.0.0", "eslint-plugin-header": "3.1.1", - "eslint-plugin-import": "2.25.4", + "eslint-plugin-import": "2.26.0", "eslint-plugin-json5": "0.1.4", "gts": "3.1.0", - "html-webpack-plugin": "5.3.2", + "html-webpack-plugin": "5.5.0", "jimp": "0.16.1", - "jsdom": "15.2.1", + "jsdom": "16.7.0", "mocha": "7.2.0", "null-loader": "4.0.1", "nyc": "15.1.0", - "responsive-loader": "2.3.0", + "responsive-loader": "3.1.1", "rimraf": "3.0.2", + "sharp": "^0.30.7", "sinon": "14.0.0", "sinon-chrome": "3.0.1", "ts-loader": "9.2.5", "ts-mocha": "10.0.0", "typescript": "4.3.5", - "webpack": "5.48.0", - "webpack-cli": "4.7.2", + "webpack": "5.74.0", + "webpack-cli": "4.10.0", "webpack-merge": "5.8.0" }, "dependencies": { - "@material-ui/core": "4.12.3", - "@material-ui/icons": "4.11.2", - "@material-ui/lab": "4.0.0-alpha.60", + "@material-ui/core": "4.12.4", + "@material-ui/icons": "4.11.3", + "@material-ui/lab": "4.0.0-alpha.61", "@opentelemetry/context-zone": "^1.0.0", "@opentelemetry/core": "^1.0.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.29.2", + "@opentelemetry/exporter-trace-otlp-http": "^0.32.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.29.2", - "@opentelemetry/instrumentation-document-load": "^0.29.0", - "@opentelemetry/instrumentation-fetch": "^0.29.2", - "@opentelemetry/instrumentation-xml-http-request": "^0.29.2", + "@opentelemetry/instrumentation": "^0.32.0", + "@opentelemetry/instrumentation-document-load": "^0.30.0", + "@opentelemetry/instrumentation-fetch": "^0.32.0", + "@opentelemetry/instrumentation-user-interaction": "^0.31.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.32.0", "@opentelemetry/resources": "^1.0.0", "@opentelemetry/sdk-trace-base": "^1.0.0", "@opentelemetry/sdk-trace-web": "^1.0.0", "@opentelemetry/semantic-conventions": "^1.0.0", "change-case": "4.1.2", - "json5": "2.2.0", + "json5": "2.2.1", "react": "17.0.2", "react-dom": "17.0.2" }, 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..dcc5e26b22 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 b3771cad45..d265259bc5 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -14,6 +14,7 @@ "detectors/node/opentelemetry-resource-detector-instana": {}, "metapackages/auto-instrumentations-node": {}, "metapackages/auto-instrumentations-web": {}, + "packages/opentelemetry-browser-extension-autoinjection": {}, "packages/opentelemetry-host-metrics": {}, "packages/opentelemetry-id-generator-aws-xray": {}, "packages/opentelemetry-propagation-utils": {}, From 1328baacde276236e0f9999e71b6a755370fc9f7 Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 6 Sep 2022 12:06:56 +0200 Subject: [PATCH 2/9] fix: lint errors with browser extension --- .../opentelemetry-browser-extension-autoinjection/package.json | 2 +- .../src/ui/ExporterOption.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index e997632096..d821d720b8 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -40,7 +40,7 @@ "@types/sinon-chrome": "2.2.11", "@typescript-eslint/eslint-plugin": "5.36.1", "@typescript-eslint/parser": "5.36.1", - "eslint": "8.23.0", + "eslint": "8.7.0", "eslint-config-airbnb-base": "15.0.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-import": "2.26.0", diff --git a/packages/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx b/packages/opentelemetry-browser-extension-autoinjection/src/ui/ExporterOption.tsx index dcc5e26b22..0ab9630f5b 100644 --- a/packages/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.isEnabled) ? ( + {this.props.value !== undefined && this.props.isEnabled ? ( Date: Tue, 6 Sep 2022 15:18:27 +0200 Subject: [PATCH 3/9] fix: reset version of browser extension, add browser extension to release please manifest --- .release-please-manifest.json | 2 +- .../opentelemetry-browser-extension-autoinjection/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 082fd6ba33..54dbbbd2e7 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.1.2","detectors/node/opentelemetry-resource-detector-gcp":"0.27.2","detectors/node/opentelemetry-resource-detector-github":"0.27.0","metapackages/auto-instrumentations-node":"0.32.0","metapackages/auto-instrumentations-web":"0.30.0","packages/opentelemetry-host-metrics":"0.30.0","packages/opentelemetry-id-generator-aws-xray":"1.1.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-fs":"0.5.0","plugins/node/instrumentation-tedious":"0.4.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.30.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.0","plugins/node/opentelemetry-instrumentation-dns":"0.30.0","plugins/node/opentelemetry-instrumentation-express":"0.31.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.30.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.0","plugins/node/opentelemetry-instrumentation-knex":"0.30.0","plugins/node/opentelemetry-instrumentation-koa":"0.32.0","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.0","plugins/node/opentelemetry-instrumentation-mysql":"0.31.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.0","plugins/node/opentelemetry-instrumentation-net":"0.30.0","plugins/node/opentelemetry-instrumentation-pg":"0.31.0","plugins/node/opentelemetry-instrumentation-pino":"0.31.0","plugins/node/opentelemetry-instrumentation-redis":"0.33.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.32.0","plugins/node/opentelemetry-instrumentation-restify":"0.30.0","plugins/node/opentelemetry-instrumentation-router":"0.30.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.0","plugins/web/opentelemetry-instrumentation-document-load":"0.30.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.0","plugins/web/opentelemetry-plugin-react-load":"0.28.0","propagators/opentelemetry-propagator-aws-xray":"1.1.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.0","propagators/opentelemetry-propagator-ot-trace":"0.26.1","plugins/node/opentelemetry-instrumentation-fastify":"0.29.0","packages/opentelemetry-propagation-utils":"0.28.0","plugins/web/opentelemetry-instrumentation-long-task":"0.31.0","detectors/node/opentelemetry-resource-detector-docker":"0.1.2","detectors/node/opentelemetry-resource-detector-instana":"0.3.0"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.1.2","detectors/node/opentelemetry-resource-detector-gcp":"0.27.2","detectors/node/opentelemetry-resource-detector-github":"0.27.0","metapackages/auto-instrumentations-node":"0.32.0","metapackages/auto-instrumentations-web":"0.30.0","packages/opentelemetry-host-metrics":"0.30.0","packages/opentelemetry-id-generator-aws-xray":"1.1.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-fs":"0.5.0","plugins/node/instrumentation-tedious":"0.4.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.30.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.0","plugins/node/opentelemetry-instrumentation-dns":"0.30.0","plugins/node/opentelemetry-instrumentation-express":"0.31.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.30.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.0","plugins/node/opentelemetry-instrumentation-knex":"0.30.0","plugins/node/opentelemetry-instrumentation-koa":"0.32.0","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.0","plugins/node/opentelemetry-instrumentation-mysql":"0.31.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.0","plugins/node/opentelemetry-instrumentation-net":"0.30.0","plugins/node/opentelemetry-instrumentation-pg":"0.31.0","plugins/node/opentelemetry-instrumentation-pino":"0.31.0","plugins/node/opentelemetry-instrumentation-redis":"0.33.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.32.0","plugins/node/opentelemetry-instrumentation-restify":"0.30.0","plugins/node/opentelemetry-instrumentation-router":"0.30.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.0","plugins/web/opentelemetry-instrumentation-document-load":"0.30.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.0","plugins/web/opentelemetry-plugin-react-load":"0.28.0","propagators/opentelemetry-propagator-aws-xray":"1.1.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.0","propagators/opentelemetry-propagator-ot-trace":"0.26.1","plugins/node/opentelemetry-instrumentation-fastify":"0.29.0","packages/opentelemetry-propagation-utils":"0.28.0","plugins/web/opentelemetry-instrumentation-long-task":"0.31.0","detectors/node/opentelemetry-resource-detector-docker":"0.1.2","detectors/node/opentelemetry-resource-detector-instana":"0.3.0","packages/opentelemetry-browser-extension-autoinjection":"0.29.0"} diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index d821d720b8..848eefafc2 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/browser-extension-autoinjection", - "version": "0.32.0", + "version": "0.29.0", "description": "A browser extension that injects opentelemetry tracers into any website", "scripts": { "clean": "rimraf build/*", From ed7f4b1db5dbe12fa095719f28819f3c866e2a3a Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 27 Sep 2022 10:29:11 +0200 Subject: [PATCH 4/9] fix: update release please manifest --- .release-please-manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b9210bc2b9..24ed6497a4 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.1.2","detectors/node/opentelemetry-resource-detector-gcp":"0.27.2","detectors/node/opentelemetry-resource-detector-github":"0.27.0","metapackages/auto-instrumentations-node":"0.32.1","metapackages/auto-instrumentations-web":"0.30.0","packages/opentelemetry-host-metrics":"0.30.0","packages/opentelemetry-id-generator-aws-xray":"1.1.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-fs":"0.5.0","plugins/node/instrumentation-tedious":"0.4.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.30.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.0","plugins/node/opentelemetry-instrumentation-dns":"0.30.0","plugins/node/opentelemetry-instrumentation-express":"0.31.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.31.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.1","plugins/node/opentelemetry-instrumentation-knex":"0.30.0","plugins/node/opentelemetry-instrumentation-koa":"0.32.0","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.0","plugins/node/opentelemetry-instrumentation-mysql":"0.31.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.0","plugins/node/opentelemetry-instrumentation-net":"0.30.1","plugins/node/opentelemetry-instrumentation-pg":"0.31.1","plugins/node/opentelemetry-instrumentation-pino":"0.32.0","plugins/node/opentelemetry-instrumentation-redis":"0.33.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.33.0","plugins/node/opentelemetry-instrumentation-restify":"0.30.0","plugins/node/opentelemetry-instrumentation-router":"0.30.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.0","plugins/web/opentelemetry-instrumentation-document-load":"0.30.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.0","plugins/web/opentelemetry-plugin-react-load":"0.28.0","propagators/opentelemetry-propagator-aws-xray":"1.1.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.0","propagators/opentelemetry-propagator-ot-trace":"0.26.1","plugins/node/opentelemetry-instrumentation-fastify":"0.29.0","packages/opentelemetry-propagation-utils":"0.28.0","plugins/web/opentelemetry-instrumentation-long-task":"0.31.0","detectors/node/opentelemetry-resource-detector-docker":"0.1.2","detectors/node/opentelemetry-resource-detector-instana":"0.3.0","packages/opentelemetry-browser-extension-autoinjection":"0.29.0"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.1.2","detectors/node/opentelemetry-resource-detector-gcp":"0.27.2","detectors/node/opentelemetry-resource-detector-github":"0.27.0","metapackages/auto-instrumentations-node":"0.32.1","metapackages/auto-instrumentations-web":"0.30.0","packages/opentelemetry-host-metrics":"0.30.0","packages/opentelemetry-id-generator-aws-xray":"1.1.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-fs":"0.5.0","plugins/node/instrumentation-tedious":"0.4.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.30.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.0","plugins/node/opentelemetry-instrumentation-dns":"0.30.0","plugins/node/opentelemetry-instrumentation-express":"0.31.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.31.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.1","plugins/node/opentelemetry-instrumentation-knex":"0.30.0","plugins/node/opentelemetry-instrumentation-koa":"0.32.0","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.0","plugins/node/opentelemetry-instrumentation-mongoose":"0.30.0","plugins/node/opentelemetry-instrumentation-mysql":"0.31.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.0","plugins/node/opentelemetry-instrumentation-net":"0.30.1","plugins/node/opentelemetry-instrumentation-pg":"0.31.1","plugins/node/opentelemetry-instrumentation-pino":"0.32.0","plugins/node/opentelemetry-instrumentation-redis":"0.33.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.33.0","plugins/node/opentelemetry-instrumentation-restify":"0.30.0","plugins/node/opentelemetry-instrumentation-router":"0.30.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.0","plugins/web/opentelemetry-instrumentation-document-load":"0.30.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.0","plugins/web/opentelemetry-plugin-react-load":"0.28.0","propagators/opentelemetry-propagator-aws-xray":"1.1.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.0","propagators/opentelemetry-propagator-ot-trace":"0.26.1","plugins/node/opentelemetry-instrumentation-fastify":"0.29.0","packages/opentelemetry-propagation-utils":"0.28.0","plugins/web/opentelemetry-instrumentation-long-task":"0.31.0","detectors/node/opentelemetry-resource-detector-docker":"0.1.2","detectors/node/opentelemetry-resource-detector-instana":"0.3.0"} \ No newline at end of file From 9aa97b187cd2d361352d37d770ce8c18817dc49b Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 9 Nov 2022 08:39:06 +0100 Subject: [PATCH 5/9] fix: merge current release please manifest Signed-off-by: svrnm --- .release-please-manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3abc6fe75f..ec840c24d3 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1,2 @@ -{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.1.2","detectors/node/opentelemetry-resource-detector-container":"0.1.2","detectors/node/opentelemetry-resource-detector-gcp":"0.27.2","detectors/node/opentelemetry-resource-detector-github":"0.27.0","detectors/node/opentelemetry-resource-detector-instana":"0.3.0","metapackages/auto-instrumentations-node":"0.33.1","metapackages/auto-instrumentations-web":"0.30.0","packages/opentelemetry-host-metrics":"0.30.1","packages/opentelemetry-id-generator-aws-xray":"1.1.0","packages/opentelemetry-propagation-utils":"0.29.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-dataloader":"0.2.0","plugins/node/instrumentation-fs":"0.5.0","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/instrumentation-mongoose":"0.31.0","plugins/node/instrumentation-tedious":"0.4.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.30.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.0","plugins/node/opentelemetry-instrumentation-dns":"0.30.0","plugins/node/opentelemetry-instrumentation-express":"0.31.2","plugins/node/opentelemetry-instrumentation-fastify":"0.30.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.31.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.1","plugins/node/opentelemetry-instrumentation-knex":"0.30.0","plugins/node/opentelemetry-instrumentation-koa":"0.32.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.1","plugins/node/opentelemetry-instrumentation-mysql":"0.31.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.0","plugins/node/opentelemetry-instrumentation-net":"0.30.1","plugins/node/opentelemetry-instrumentation-pg":"0.31.1","plugins/node/opentelemetry-instrumentation-pino":"0.32.0","plugins/node/opentelemetry-instrumentation-redis":"0.33.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.33.0","plugins/node/opentelemetry-instrumentation-restify":"0.30.0","plugins/node/opentelemetry-instrumentation-router":"0.30.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.0","plugins/web/opentelemetry-instrumentation-document-load":"0.30.0","plugins/web/opentelemetry-instrumentation-long-task":"0.31.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.0","plugins/web/opentelemetry-plugin-react-load":"0.28.0","propagators/opentelemetry-propagator-aws-xray":"1.1.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.0","propagators/opentelemetry-propagator-ot-trace":"0.26.1"} +{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.2","detectors/node/opentelemetry-resource-detector-aws":"1.2.0","detectors/node/opentelemetry-resource-detector-container":"0.2.0","detectors/node/opentelemetry-resource-detector-gcp":"0.27.3","detectors/node/opentelemetry-resource-detector-github":"0.27.0","detectors/node/opentelemetry-resource-detector-instana":"0.3.0","metapackages/auto-instrumentations-node":"0.34.0","metapackages/auto-instrumentations-web":"0.30.1","packages/opentelemetry-host-metrics":"0.30.1","packages/opentelemetry-id-generator-aws-xray":"1.1.1","packages/opentelemetry-propagation-utils":"0.29.0","packages/opentelemetry-test-utils":"0.32.0","plugins/node/instrumentation-amqplib":"0.31.0","plugins/node/instrumentation-dataloader":"0.2.1","plugins/node/instrumentation-fs":"0.5.1","plugins/node/instrumentation-lru-memoizer":"0.31.0","plugins/node/instrumentation-mongoose":"0.31.1","plugins/node/instrumentation-tedious":"0.4.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.33.1","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.9.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.30.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.31.0","plugins/node/opentelemetry-instrumentation-connect":"0.30.1","plugins/node/opentelemetry-instrumentation-dns":"0.30.1","plugins/node/opentelemetry-instrumentation-express":"0.31.3","plugins/node/opentelemetry-instrumentation-fastify":"0.30.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.30.0","plugins/node/opentelemetry-instrumentation-graphql":"0.32.0","plugins/node/opentelemetry-instrumentation-hapi":"0.30.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.32.2","plugins/node/opentelemetry-instrumentation-knex":"0.30.1","plugins/node/opentelemetry-instrumentation-koa":"0.33.0","plugins/node/opentelemetry-instrumentation-memcached":"0.30.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.32.2","plugins/node/opentelemetry-instrumentation-mysql":"0.31.2","plugins/node/opentelemetry-instrumentation-mysql2":"0.32.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.31.1","plugins/node/opentelemetry-instrumentation-net":"0.30.2","plugins/node/opentelemetry-instrumentation-pg":"0.32.0","plugins/node/opentelemetry-instrumentation-pino":"0.32.1","plugins/node/opentelemetry-instrumentation-redis":"0.33.1","plugins/node/opentelemetry-instrumentation-redis-4":"0.33.1","plugins/node/opentelemetry-instrumentation-restify":"0.30.1","plugins/node/opentelemetry-instrumentation-router":"0.31.0","plugins/node/opentelemetry-instrumentation-winston":"0.30.1","plugins/web/opentelemetry-instrumentation-document-load":"0.30.1","plugins/web/opentelemetry-instrumentation-long-task":"0.31.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.31.1","plugins/web/opentelemetry-plugin-react-load":"0.28.1","propagators/opentelemetry-propagator-aws-xray":"1.1.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.1","propagators/opentelemetry-propagator-ot-trace":"0.26.2"} + From 82e0392f18c6e52c467459aea351abc8bab2705d Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 9 Nov 2022 08:40:38 +0100 Subject: [PATCH 6/9] fix: bring back archived package.json to solve merge conflict (will be removed again) Signed-off-by: svrnm --- .../package.json | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 archive/opentelemetry-browser-extension-autoinjection/package.json diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json new file mode 100644 index 0000000000..6338edc72b --- /dev/null +++ b/archive/opentelemetry-browser-extension-autoinjection/package.json @@ -0,0 +1,87 @@ +{ + "name": "@opentelemetry/browser-extension-autoinjection", + "version": "0.29.0", + "description": "A browser extension that injects opentelemetry tracers into any website", + "scripts": { + "clean": "rimraf build/*", + "compile": "tsc --build tsconfig.json", + "build": "npx webpack --mode=production", + "build:mv2": "npx webpack --mode=production --env MV=2", + "build:mv3": "npx webpack --mode=production --env MV=3", + "lint": "eslint .", + "lint:fix": "eslint . --fix", + "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies", + "prewatch": "npm run precompile", + "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "tdd": "npm run test -- --watch-extensions ts --watch", + "watch": "npx webpack --mode=development --watch", + "watch:mv2": "npx webpack --mode=development --watch --env MV=2", + "watch:mv3": "npx webpack --mode=development --watch --env MV=3" + }, + "private": true, + "keywords": [], + "author": "OpenTelemetry Authors", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "devDependencies": { + "@opentelemetry/api": "^1.0.0", + "@types/chrome": "0.0.154", + "@types/jsdom": "16.2.13", + "@types/mocha": "8.2.3", + "@types/react": "17.0.16", + "@types/react-dom": "18.0.2", + "@types/sinon": "10.0.2", + "@types/sinon-chrome": "2.2.11", + "@typescript-eslint/eslint-plugin": "5.8.1", + "@typescript-eslint/parser": "5.8.1", + "eslint": "8.7.0", + "eslint-config-airbnb-base": "15.0.0", + "eslint-plugin-header": "3.1.1", + "eslint-plugin-import": "2.25.4", + "eslint-plugin-json5": "0.1.4", + "gts": "3.1.0", + "html-webpack-plugin": "5.3.2", + "jimp": "0.16.1", + "jsdom": "15.2.1", + "mocha": "7.2.0", + "null-loader": "4.0.1", + "nyc": "15.1.0", + "responsive-loader": "2.3.0", + "rimraf": "3.0.2", + "sinon": "14.0.0", + "sinon-chrome": "3.0.1", + "ts-loader": "9.2.5", + "ts-mocha": "10.0.0", + "typescript": "4.3.5", + "webpack": "4.46.0", + "webpack-cli": "4.7.2", + "webpack-merge": "5.8.0" + }, + "dependencies": { + "@material-ui/core": "4.12.3", + "@material-ui/icons": "4.11.2", + "@material-ui/lab": "4.0.0-alpha.60", + "@opentelemetry/context-zone": "^1.0.0", + "@opentelemetry/core": "^1.0.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.29.2", + "@opentelemetry/exporter-zipkin": "^1.0.0", + "@opentelemetry/instrumentation": "^0.29.2", + "@opentelemetry/instrumentation-document-load": "^0.29.0", + "@opentelemetry/instrumentation-fetch": "^0.29.2", + "@opentelemetry/instrumentation-xml-http-request": "^0.29.2", + "@opentelemetry/resources": "^1.0.0", + "@opentelemetry/sdk-trace-base": "^1.0.0", + "@opentelemetry/sdk-trace-web": "^1.0.0", + "@opentelemetry/semantic-conventions": "^1.0.0", + "change-case": "4.1.2", + "json5": "2.2.0", + "react": "17.0.2", + "react-dom": "17.0.2" + }, + "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme" +} From c64cbcdfc5c13956d4b782cf8c34d62bc0e2a93b Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 9 Nov 2022 08:41:51 +0100 Subject: [PATCH 7/9] fix: remove archived package.json Signed-off-by: svrnm --- .../package.json | 87 ------------------- 1 file changed, 87 deletions(-) delete mode 100644 archive/opentelemetry-browser-extension-autoinjection/package.json diff --git a/archive/opentelemetry-browser-extension-autoinjection/package.json b/archive/opentelemetry-browser-extension-autoinjection/package.json deleted file mode 100644 index 6338edc72b..0000000000 --- a/archive/opentelemetry-browser-extension-autoinjection/package.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "name": "@opentelemetry/browser-extension-autoinjection", - "version": "0.29.0", - "description": "A browser extension that injects opentelemetry tracers into any website", - "scripts": { - "clean": "rimraf build/*", - "compile": "tsc --build tsconfig.json", - "build": "npx webpack --mode=production", - "build:mv2": "npx webpack --mode=production --env MV=2", - "build:mv3": "npx webpack --mode=production --env MV=3", - "lint": "eslint .", - "lint:fix": "eslint . --fix", - "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies", - "prewatch": "npm run precompile", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "tdd": "npm run test -- --watch-extensions ts --watch", - "watch": "npx webpack --mode=development --watch", - "watch:mv2": "npx webpack --mode=development --watch --env MV=2", - "watch:mv3": "npx webpack --mode=development --watch --env MV=3" - }, - "private": true, - "keywords": [], - "author": "OpenTelemetry Authors", - "license": "Apache-2.0", - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "devDependencies": { - "@opentelemetry/api": "^1.0.0", - "@types/chrome": "0.0.154", - "@types/jsdom": "16.2.13", - "@types/mocha": "8.2.3", - "@types/react": "17.0.16", - "@types/react-dom": "18.0.2", - "@types/sinon": "10.0.2", - "@types/sinon-chrome": "2.2.11", - "@typescript-eslint/eslint-plugin": "5.8.1", - "@typescript-eslint/parser": "5.8.1", - "eslint": "8.7.0", - "eslint-config-airbnb-base": "15.0.0", - "eslint-plugin-header": "3.1.1", - "eslint-plugin-import": "2.25.4", - "eslint-plugin-json5": "0.1.4", - "gts": "3.1.0", - "html-webpack-plugin": "5.3.2", - "jimp": "0.16.1", - "jsdom": "15.2.1", - "mocha": "7.2.0", - "null-loader": "4.0.1", - "nyc": "15.1.0", - "responsive-loader": "2.3.0", - "rimraf": "3.0.2", - "sinon": "14.0.0", - "sinon-chrome": "3.0.1", - "ts-loader": "9.2.5", - "ts-mocha": "10.0.0", - "typescript": "4.3.5", - "webpack": "4.46.0", - "webpack-cli": "4.7.2", - "webpack-merge": "5.8.0" - }, - "dependencies": { - "@material-ui/core": "4.12.3", - "@material-ui/icons": "4.11.2", - "@material-ui/lab": "4.0.0-alpha.60", - "@opentelemetry/context-zone": "^1.0.0", - "@opentelemetry/core": "^1.0.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.29.2", - "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.29.2", - "@opentelemetry/instrumentation-document-load": "^0.29.0", - "@opentelemetry/instrumentation-fetch": "^0.29.2", - "@opentelemetry/instrumentation-xml-http-request": "^0.29.2", - "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/sdk-trace-base": "^1.0.0", - "@opentelemetry/sdk-trace-web": "^1.0.0", - "@opentelemetry/semantic-conventions": "^1.0.0", - "change-case": "4.1.2", - "json5": "2.2.0", - "react": "17.0.2", - "react-dom": "17.0.2" - }, - "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-browser-extension-autoinjection#readme" -} From a0351e5951537a5d8cf250301aae848d53c8c393 Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 3 May 2023 14:15:55 +0200 Subject: [PATCH 8/9] fix: update package.json Signed-off-by: svrnm --- .../package.json | 62 +++++++++---------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/packages/opentelemetry-browser-extension-autoinjection/package.json b/packages/opentelemetry-browser-extension-autoinjection/package.json index 0c6efaad47..6e9a00d732 100644 --- a/packages/opentelemetry-browser-extension-autoinjection/package.json +++ b/packages/opentelemetry-browser-extension-autoinjection/package.json @@ -13,7 +13,6 @@ "precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies", "prewatch": "npm run precompile", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "version:update": "node ../../scripts/version-update.js", "tdd": "npm run test -- --watch-extensions ts --watch", "watch": "npx webpack --mode=development --watch", "watch:mv2": "npx webpack --mode=development --watch --env MV=2", @@ -27,64 +26,61 @@ "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": "^1.2.0" + "@opentelemetry/api": "^1.3.0" }, "devDependencies": { - "@opentelemetry/api": "^1.2.0", - "@types/chrome": "0.0.196", - "@types/jsdom": "16.2.15", + "@opentelemetry/api": "^1.3.0", + "@types/chrome": "0.0.154", + "@types/jsdom": "16.2.13", "@types/mocha": "8.2.3", "@types/react": "17.0.16", "@types/react-dom": "18.0.2", "@types/sinon": "10.0.2", "@types/sinon-chrome": "2.2.11", - "@typescript-eslint/eslint-plugin": "5.36.1", - "@typescript-eslint/parser": "5.36.1", + "@typescript-eslint/eslint-plugin": "5.8.1", + "@typescript-eslint/parser": "5.8.1", "eslint": "8.7.0", "eslint-config-airbnb-base": "15.0.0", "eslint-plugin-header": "3.1.1", - "eslint-plugin-import": "2.26.0", + "eslint-plugin-import": "2.25.4", "eslint-plugin-json5": "0.1.4", - "gts": "3.1.0", - "html-webpack-plugin": "5.5.0", + "html-webpack-plugin": "5.3.2", "jimp": "0.16.1", - "jsdom": "16.7.0", + "jsdom": "15.2.1", "mocha": "7.2.0", "null-loader": "4.0.1", "nyc": "15.1.0", - "responsive-loader": "3.1.1", - "rimraf": "3.0.2", - "sharp": "^0.30.7", - "sinon": "14.0.0", + "responsive-loader": "2.3.0", + "rimraf": "4.2.0", + "sinon": "15.0.1", "sinon-chrome": "3.0.1", "ts-loader": "9.2.5", "ts-mocha": "10.0.0", - "typescript": "4.3.5", - "webpack": "5.74.0", - "webpack-cli": "4.10.0", + "typescript": "4.4.4", + "webpack": "4.46.0", + "webpack-cli": "4.7.2", "webpack-merge": "5.8.0" }, "dependencies": { - "@material-ui/core": "4.12.4", - "@material-ui/icons": "4.11.3", - "@material-ui/lab": "4.0.0-alpha.61", + "@material-ui/core": "4.12.3", + "@material-ui/icons": "4.11.2", + "@material-ui/lab": "4.0.0-alpha.60", "@opentelemetry/context-zone": "^1.0.0", - "@opentelemetry/core": "^1.0.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.32.0", + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.34.0", "@opentelemetry/exporter-zipkin": "^1.0.0", - "@opentelemetry/instrumentation": "^0.32.0", - "@opentelemetry/instrumentation-document-load": "^0.30.0", - "@opentelemetry/instrumentation-fetch": "^0.32.0", - "@opentelemetry/instrumentation-user-interaction": "^0.31.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.32.0", - "@opentelemetry/resources": "^1.0.0", - "@opentelemetry/sdk-trace-base": "^1.0.0", - "@opentelemetry/sdk-trace-web": "^1.0.0", + "@opentelemetry/instrumentation": "^0.35.1", + "@opentelemetry/instrumentation-document-load": "^0.29.0", + "@opentelemetry/instrumentation-fetch": "^0.35.1", + "@opentelemetry/instrumentation-xml-http-request": "^0.35.1", + "@opentelemetry/resources": "^1.8.0", + "@opentelemetry/sdk-trace-base": "^1.8.0", + "@opentelemetry/sdk-trace-web": "^1.8.0", "@opentelemetry/semantic-conventions": "^1.0.0", "change-case": "4.1.2", - "json5": "2.2.1", + "json5": "2.2.0", "react": "17.0.2", "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 From 8006737e620e92cd047b52e7250cae1bce1e88bf Mon Sep 17 00:00:00 2001 From: svrnm Date: Tue, 11 Jun 2024 16:26:18 +0200 Subject: [PATCH 9/9] update component owners and release-please-config Signed-off-by: svrnm --- .github/component_owners.yml | 2 ++ release-please-config.json | 1 + 2 files changed, 3 insertions(+) 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/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": {},