[AutoMerge][Main] Merging staged change(s) to main #224
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also, fix error in test-all-versions@6 with not liking socket.io@^3.1.3 being an empty range I also reduced the number of socket.io@4 versions tested (4.4.1 is over 2y old) Co-authored-by: Trent Mick <trentm@gmail.com>
* fix(instrumentation): do not import 'path' in browser runtimes * fix(changelog): clean up and add entry * fix(instrumentation): add missing license header * fix(changelog): formatting * fix(instrumentation): do not throw
…… (#4351) * fix(exporter-logs-otlp-proto): programatic headers take precedence over environment variables * chore: update PR url in changelog * chore: fix deletion of env var * fix(exporter-logs-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-http): programatic headers take precedence over environment variables * fix(exporter-trace-otlp-proto): programatic headers take precedence over environment variable * chore: update CHANGELOG --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…1884) * fix(azure-resource-detector): Ensure that resources aren't classified as app service when they're using functions and both detectors are imported. * Fix lint. * Clean up and unify tests.
* chore: release main * chore: sync package-lock.json --------- Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com>
* ci: automatically map component labels to PRs * feat: ensure labels are applied when dependencies are updated * fix: faulty paths
* Allow configuring pino to log with different keys * Update README and add jsdoc * Still have 2 failing tests * Break tests out * Return test context * Simplify --------- Co-authored-by: Amir Blum <amirgiraffe@gmail.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…metry-js@ae0a3c5) - commit ae0a3c5 - Author: Vladimir Adamić <441333+Vunovati@users.noreply.github.com> - Date: Wed Jan 3 17:42:17 2024 +0100 - fix(exporter-logs-otlp-proto): programatic headers take precedence ov… (#4351) - ... ### Auto resolving 5 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 5 - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/browser/noop-normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/node/normalize.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/opentelemetry-instrumentation/test/browser/noop-normalize.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/experimental/packages/sdk-logs/test/common/export/TestExporterWithDelay.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/packages/opentelemetry-core/src/common/hex-to-binary.ts - Unmerged, added by them => checkout theirs
…opentelemetry-js-contrib@33b31d0) - commit 33b31d0 - Author: drewcorlin1 <82601620+drewcorlin1@users.noreply.github.com> - Date: Sun Jan 7 01:30:28 2024 -0500 - feat: Allow configuring pino to log with different keys (#1867) - ... ### Auto resolving 18 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 9 UD (Updated <=> Deleted): 7 AU (Added <=> Updated): 1 DD (Deleted <=> Deleted): 1 - (UA) auto-merge/contrib/.github/component-label-map.yml - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/.github/workflows/label-prs.yml - Unmerged, added by them => checkout theirs - (UD) auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/README.md - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_client.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/capitalize_server.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/package.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/examples/grpc_dynamic_codegen/tracer.js - Unmerged, deleted by them => remove - (UA) auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/common.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-default-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/fixtures/use-pino-named-import.mjs - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-disabled.test.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino-enabled.test.ts - Unmerged, added by them => checkout theirs - (AU) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Added in ours => checkout ours - (UD) auto-merge/contrib/scripts/parse-lerna-scopes.mjs - Unmerged, deleted by them => remove ...truncated...
Processing otel-js - (*F) /plugins - Removing extra folder plugins Processing otel-js-contrib - (xM) /auto-merge/contrib/examples/grpc-census-prop/protos/defs.proto - Re-Copying master file - (*F) /auto-merge/contrib/examples/grpc_dynamic_codegen - Removing extra folder grpc_dynamic_codegen - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-koa/test/fixtures/use-koa.mjs - Re-Copying master file - (*E) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-pino/test/pino.test.ts - Removing extra file
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…es (#1895) Was introduced in commit `a0003e76fc46afbbee2558a7d21906be7c9cb1d1` but all usages seem to have been removed. By having this in the dependencies, we were getting peer-dep warnings on install as this version of core seems to be outdated. Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
… no propagation fields (#1889) * fix(instrumentation-aws-sdk): make empty context when SQS message has no propagation fields * style: lint fix --------- Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
…client is import (#1851) I wasn't getting any MongoDB info, turned on diag logging and it warned the client was being imported before instrumentation was setup...reordered the imports and started to get spans! Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
* chore: prepare release 1.20.0/0.47.0 * Update experimental/CHANGELOG.md Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> * fix(readme): add entry to compatibility matrix --------- Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com>
…1858) Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
…on span creation (#4417) * fix(sdk-trace-base): ensure attribute value length limit is enforced on span creation * fix(changelog): add changelog entry
* feat(api): add experimental package and SugaredTracer * tests(api/experimental): add tests * fix: packages.json exports * move export into experimental package * add additional tests * fix: do not use catch and finally for compatibility with Node 8 --------- Co-authored-by: Chengzhong Wu <legendecas@gmail.com>
…(#4320) * chore(opentelemetry-context-zone-peer-dep): update deps to support angular 16 closes issue #4245 Signed-off-by: rbrennan <4884521+rodgerbrennan@users.noreply.github.com> * update packages * Revert "update packages" This reverts commit 624df4ea2e3dcd235f0dfd72da66cbf427aaccd2. * chore: sync package-lock.json * chore: sync package-lock.json * chore: sync package-lock.json * Update ZoneContextManager.test to use ES5 UMD bundle * add changelog * remove trailing space from changelog --------- Signed-off-by: rbrennan <4884521+rodgerbrennan@users.noreply.github.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…metry-js@bf8714e) - commit bf8714e - Author: Rodger Brennan <4884521+rodgerbrennan@users.noreply.github.com> - Date: Tue Jan 16 22:45:56 2024 -0500 - chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 (#4320) - ...
…opentelemetry-js-contrib@c8bebc7) - commit c8bebc7 - Author: Marc Pichler <marc.pichler@dynatrace.com> - Date: Wed Jan 17 15:56:30 2024 +0100 - chore(renovate): use full list of experimental packages (#1897) - ... ### Auto resolving 1 conflict to select the master repo version Summary of changes by file state UA (Updated <=> Added): 1 - (UA) auto-merge/contrib/packages/opentelemetry-host-metrics/test/mocks/process.json - Unmerged, added by them => checkout theirs
Processing otel-js - (xM) /auto-merge/js/api/src/experimental/index.ts - Re-Copying master file - (xM) /auto-merge/js/api/src/experimental/trace/SugaredOptions.ts - Re-Copying master file - (xM) /auto-merge/js/api/src/experimental/trace/SugaredTracer.ts - Re-Copying master file - (xM) /auto-merge/js/api/test/common/experimental/trace/SugaredTracer.test.ts - Re-Copying master file - (*F) /api - Removing extra folder api Processing otel-js-contrib
* chore: Update express example package.json since it moved repos This must have moved into contrib a while back * docs: Modify the install command so that the example runs Without this, 'npm install' now depends on directories higher than this one. It does not create a node_modules and then ts-node does not work. Looks like the use of workspaces at the repository root interferes with this example, but this change to the install command gets around that. * chore: Update instrumentation-express example otel packages to the latest * chore: Update all deprecations in tracer.ts Jaeger accepts OTLP now, so the OtlpTraceExporter just works * update package-lock for (hopefully) desired package.json dep updates * sync package-lock.json * sync package-lock.json again (dropping dev:true from '@types/express', why I am not sure) * add setup script and alternative install * sync package-lock.json * bump the express example's dep to the instr-express version in the repo I also had to manually remove this (vestigial?) entry in package-lock.json that was breaking 'npm install'. * signing off on changes Signed-off-by: Jamie Danielson <jamiedanielson@honeycomb.io> --------- Signed-off-by: Jamie Danielson <jamiedanielson@honeycomb.io> Co-authored-by: Trent Mick <trentm@gmail.com> Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> Co-authored-by: Jamie Danielson <jamiedanielson@honeycomb.io>
* fix(core): drop unnecessary assignemnt of HOSTNAME * fix(changelog): add changelog entry * Update CHANGELOG.md * fix(changelog): move entry to internal
Fixes Can not execute the operation on ended Span on express-instrumentation #1887 This checks if the span has ended before attemptuing to mutate it by calling span.recordException(...) and span.setStatus(...) Signed-off-by: San 'rdn' Mônico <san@monico.com.br> Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com>
…opentelemetry-js-contrib@4590c8d) - commit 4590c8d - Author: Severin Neumann <neumanns@cisco.com> - Date: Tue Apr 16 18:05:51 2024 +0200 - fix: revert modifications to Apache license (#2105) - ...
Processing otel-js - (xM) /auto-merge/js/packages/propagator-aws-xray/.eslintignore - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/.eslintrc.js - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/LICENSE - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/README.md - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/karma.conf.js - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/package.json - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/src/AWSXRayPropagator.ts - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/src/index.ts - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/test/AWSXRayPropagator.test.ts - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/test/index-webpack.ts - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/tsconfig.esm.json - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/tsconfig.esnext.json - Re-Copying master file - (xM) /auto-merge/js/packages/propagator-aws-xray/tsconfig.json - Re-Copying master file - (*F) /packages - Removing extra folder packages Processing otel-js-contrib
* feat(sdk-node): add serviceInstanceIDDetector to NodeSDK Follow up from #4608 Adds the resource detector ServiceInstanceIDDetector on the NodeSDK constructor. It only gets added by default on any of those conditions: - the value `serviceinstance` is part of the list `OTEL_NODE_RESOURCE_DETECTORS` - `OTEL_NODE_EXPERIMENTAL_DEFAULT_SERVICE_INSTANCE_ID` is set to `true` * remove OTEL_NODE_EXPERIMENTAL_DEFAULT_SERVICE_INSTANCE_ID Signed-off-by: maryliag <marylia.gutierrez@grafana.com> * update readme on how to use `OTEL_NODE_RESOURCE_DETECTORS` * feedback from review * Update experimental/packages/opentelemetry-sdk-node/README.md Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * feedback from review --------- Signed-off-by: maryliag <marylia.gutierrez@grafana.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* refactor(instrumentation-redis): Use exported semconv strings Part of #2025. * chore(instrumentation-redis): Update package-lock --------- Co-authored-by: Jamie Danielson <jamiedanielson@honeycomb.io> Co-authored-by: Amir Blum <amirgiraffe@gmail.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* refactor(instr-redis-4): use exported strings for attributes * chore(instr-redis-4): update README --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* refactor(instr-restify): use exported strings for attributes * chore(instr-restify): fix lint issues --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
Test all versions (TAV) tests were failing with Node.js 14 and 16 because of subtle behaviour changes in socket end handling in Node.js and undici for a test that tries a bogus request. This restores earlier work-around code mistakenly removed in #2085.
* chore(propagator-aws-xray): removed package (moved to core SDK repository) * updated release-please config files * removed linked xray dependencies --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* refactor(instr-knex): use exported strings for attributes * chore(instr-knex): update semantic conventions --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…mentation registration (#4598) * feat!(instrumentation): remove moudleExports generic type from instrumentation registration * fix: lint * chore: add changelog * fix: core instrumentations * docs: update README with the change * Update experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * Update experimental/packages/opentelemetry-instrumentation/src/platform/node/instrumentation.ts Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * Update CHANGELOG.md Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * chore: lint * revert: sdk-logs in tsconfig * chore: lint markdown * Apply suggestions from code review Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> * Update experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleFile.ts Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> * Update experimental/packages/opentelemetry-instrumentation/src/instrumentationNodeModuleDefinition.ts Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> * fix: remove unrelevant eslint ignore --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com>
* refactor(@opentelemetry/instrumentation): add patch and unpatch diag log messages * chore: CHANGELOG * fix: exclude version in core packages --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…og sending (#2016) * Allow log level to be configured for log sending * Support other winston levels * Updating tests, transport callback update
- Update @opentelemetry/semantic-conventions to ^1.22 - Replace SemanticAttributes.* with exported strings SEMATTRS_* - Update README with new semantic convention package version and key Refs: #2025
A key column was added to several READMEs, but it was decided to not have them anymore. So this commit removes the column from the doc that were already added.
…metry-js@3ab4f76) - commit 3ab4f76 - Author: Marc Pichler <marc.pichler@dynatrace.com> - Date: Wed Apr 24 15:46:45 2024 +0200 - chore: prepare release 1.24.0/0.51.0 (#4650) - ...
…opentelemetry-js-contrib@0d38081) - commit 0d38081 - Author: Marylia Gutierrez <marylia.gutierrez@grafana.com> - Date: Wed Apr 24 12:30:02 2024 -0400 - docs: remove `key` column on readme (#2132) - ... ### Auto resolving 13 conflicts to select the master repo version Summary of changes by file state UD (Updated <=> Deleted): 13 - (UD) auto-merge/contrib/incubator/opentelemetry-sampler-aws-xray/tsconfig.esm.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/metapackages/auto-instrumentations-node/tsconfig.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/plugins/node/instrumentation-amqplib/LICENSE - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/.eslintrc.js - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/CHANGELOG.md - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/README.md - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/package.json - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/src/AWSXRayPropagator.ts - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/src/index.ts - Unmerged, deleted by them => remove - (UD) auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray/test/AWSXRayPropagator.test.ts - Unmerged, deleted by them => remove
Processing otel-js Processing otel-js-contrib - (xM) /auto-merge/contrib/incubator/opentelemetry-sampler-aws-xray/tsconfig.esm.json - Re-Copying master file - (xM) /auto-merge/contrib/metapackages/auto-instrumentations-node/tsconfig.json - Re-Copying master file - (xM) /auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js - Re-Copying master file - (xM) /auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-amqplib/LICENSE - Re-Copying master file - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Re-Copying master file - (*F) /auto-merge/contrib/propagators/opentelemetry-propagator-aws-xray - Removing extra folder opentelemetry-propagator-aws-xray
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
### Moving package from auto-merge/js/api to pkgs/api/ ### Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/ ### Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/ ### Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/ ### Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/ ### Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/ ### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/ ### Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/ ### Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/ ### Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/ ### Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer ### Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base ### Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/ ### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch ### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/ ### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/ ### Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/ ### Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/ ### Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/ ### Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/ ### Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/
### Auto resolving 219 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 24 DD (Deleted <=> Deleted): 85 DU (Deleted <=> Updated): 2 AA (Added <=> Added): 92 AU (Added <=> Updated): 10 UD (Updated <=> Deleted): 6 - (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/examples/bunyan/app.js - Unmerged, added by them => checkout theirs - (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/LICENSE - Removed from both - (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/karma.conf.js - Removed from both - (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/tsconfig.esm.json - Removed from both - (DU) auto-merge/contrib/packages/winston-transport/.eslintrc.js - Deleted by us => checkout theirs - (UA) auto-merge/contrib/plugins/node/instrumentation-runtime-node/tsconfig.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/plugins/node/instrumentation-undici/tsconfig.json - Unmerged, added by them => checkout theirs - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/LICENSE - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esm.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/tsconfig.json - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/LICENSE - Removed from both - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esm.json - Removed from both - (UA) auto-merge/contrib/plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json - Unmerged, added by them => checkout theirs - (UA) auto-merge/contrib/tsconfig.base.esnext.json - Unmerged, added by them => checkout theirs - (DD) auto-merge/js/api/karma.conf.js - Removed from both ...truncated... Identifying and fixing merge issues from staged repos
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
staging @ 795f3fa...
Moving package from auto-merge/js/api to pkgs/api/
Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/
Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/
Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/
Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/
Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/
Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/
Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/
Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/
Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/
Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/
Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/
Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer
Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base
Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/
Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/
Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/
Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/
Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/
Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch
Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/
Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/
Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/
Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/
Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/
Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/
Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/
Merge Staged changes to main
Auto resolving 219 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 24
DD (Deleted <=> Deleted): 85
DU (Deleted <=> Updated): 2
AA (Added <=> Added): 92
AU (Added <=> Updated): 10
UD (Updated <=> Deleted): 6
...truncated...
Identifying and fixing merge issues from staged repos