[AutoMerge][Main] Merging staged change(s) to main #222
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
redis@4.6.9 was a bad release that accidentally broken v14 support. This updates the versions test to skip that release, and also reduces the number of versions tested from 27 to 8 by selecting just the current latest minor releases. Also, drop the pretest config that (a) was never used because of the wrong indentation and (b) is no longer valid since the move to npm workspaces. Refs: #1860
The beforeEach() hook was not awaited, so afterEach() could run before it completed, resulting in a client.disconnect() that rejects, and a mocha hook that calls done() twice. Refs: #1860 Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
This tests just the latest in each minor version. Refs: #1860 Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* chore: prepare release 1.19.0/0.46.0 * fix(changelog): move entry
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v0.21.4...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…(security) (#1868) * chore: bump system info version to address arbitrary command injection vulnerability in systeminformation Signed-off-by: yyomba <yyomba@salesforce.com> * chore: sync package-lock.json --------- Signed-off-by: yyomba <yyomba@salesforce.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* fix: remove unnecessary base64 encoding for span contexts * chore: add changelog --------- Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
* fix(instrumentation): use caret on import-in-the-middle * fix: add chanelog entry --------- Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
we may want information but still never stale it so set exempt label first for early return. any-of-label is comma-separated allowlist. remove instr-request and bug to avoid needing to remove labels. Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
This is as a workaround for ESM testing failing with v18.19.0 due to node's off-thread ESM loading and import-in-the-middle's limitation with reexports. Refs: open-telemetry/opentelemetry-js-contrib#1872
* fix(deps): update opentelemetry-js monorepo * fix(deps): update otel core experimental to ^0.46.0 * fix: re-generate package-lock.json * fix: test with updated import-in-the-middle hook * fix: use type-compatible versions of rxjs * fix(mongodb-example): remove unneeded useUnifiedTopology parameter * fix: remove iitm 1.7.2 again, use otel hook (iitm 1.7.1) --------- Co-authored-by: Mend Renovate <bot@renovateapp.com>
* added maintainer for the react plugin * Update .github/component_owners.yml --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
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>
…tor (#2057) Update README of Azure Resource Detector to clarify the source of the data and also remove values from the table that were not actually being set. Add Semantic conventions to README Refs: #2055 Refs: #2025 Signed-off-by: maryliag <marylia.gutierrez@grafana.com> Co-authored-by: Jamie Danielson <jamieedanielson@gmail.com> Co-authored-by: Trent Mick <trentm@gmail.com>
Update README of GitHub Resource Detector to clarify the source of the data. Refs: #2055 Signed-off-by: maryliag <marylia.gutierrez@grafana.com>
* refactor(instr-mongodb): use exported strings for attributes * refactor(instr-mongodb): update README --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…(#4605) * feat(sdk-trace-base): log resoruce attributes in ConsoleSpanExporter * fixup! feat(sdk-trace-base): log resoruce attributes in ConsoleSpanExporter
…2085) - set min supported undici to v5.12.0 - 'codecov' npm script was copypasta from core repo - update to same test-all-versions ver as other pkgs in the workspace - update undici to latest (it is a security update) - add label-prs workflow support pkg:instrumentation-undici - reduce number of versions tested with TAV
Now that instrumentation-undici exists, point to it for users that want instrumentation of Node.js' fetch().
This package accidentally got a dep and devDep on api-logs, at different versions. The result was it being pinned at the older version in package-lock. Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
…4612) * fix(otlp-grpc-exporter-base): avoid TypeError on exporter shutdown * chore: update changelog * fix: use gRPC Client type over any * fixup! fix: use gRPC Client type over any * fix: use ts-lint/ts-ignore
* feat(node-sdk): implements `service.instance.id` Implements `service.instance.id` Signed-off-by: maryliag <marylia.gutierrez@grafana.com> * implement service instance id by default with env var use an experimental environment variable to set the default value of `service.instance.id` as default * Update CHANGELOG.md Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * create separate add experimental for browser and node create a function to add experimental default values (currently only service instance id, but others can be added in the future), with the value being set on the node case, but not on the browser case. Signed-off-by: maryliag <marylia.gutierrez@grafana.com> * use resource detector for service instance id use a resource detector for service instance id * remove references to env variables * remove Detector and use DetectorSync remove the Detector and use the DetectorSync instead. Also mark things as experimental. Signed-off-by: maryliag <marylia.gutierrez@grafana.com> * Update packages/opentelemetry-resources/src/platform/node/ServiceInstanceIDDetectorSync.ts Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com> * rename ServiceInstanceIDDetector to ServiceInstanceIDDetectorSync * change ID to Id * renaming something temp so git will pick up the name change it was not picking up the case change on previous commit * update to final name using Id --------- Signed-off-by: maryliag <marylia.gutierrez@grafana.com> Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* fix: Don't use require to load package.json files * update changelog * Move changelog entry --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* feat(sdk-logs): make dropping attribute print message * chore: update changelog * chore(sdk-logs): add comment to explain message logic * Update experimental/CHANGELOG.md --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* moved aws xray propagator from contrib * updated package lock file * updated dev dependencies * added a note about the original location in README * updated changelog * fix: limit package-lock.json changes * removed status section from readme * chore: align versions with current release --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
* refactor(instr-grpc): move to use SEMATTRS * Update experimental/CHANGELOG.md * Update experimental/CHANGELOG.md --------- Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
Signed-off-by: svrnm <neumanns@cisco.com>
Signed-off-by: svrnm <neumanns@cisco.com>
…etrybot/auto-merge-repo-staging [AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
…metry-js@2610122) - commit 2610122 - Author: Severin Neumann <neumanns@cisco.com> - Date: Tue Apr 16 18:01:36 2024 +0200 - fix: revert modifications to Apache license (#4640) - ... ### Auto resolving 2 conflicts to select the master repo version Summary of changes by file state UA (Updated <=> Added): 2 - (UA) auto-merge/js/packages/opentelemetry-resources/src/platform/browser/ServiceInstanceIdDetectorSync.ts - Unmerged, added by them => checkout theirs - (UA) auto-merge/js/packages/opentelemetry-resources/src/platform/node/ServiceInstanceIdDetectorSync.ts - Unmerged, added by them => checkout theirs
…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
…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 @ a354ab4...
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