Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Test][AutoMerge][Main] Merging staged change(s) to main #159

Closed
wants to merge 110 commits into from
Closed

[Test][AutoMerge][Main] Merging staged change(s) to main #159

wants to merge 110 commits into from

Conversation

MSNev
Copy link
Collaborator

@MSNev MSNev commented Aug 11, 2023

staging @ 44bcf14...

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 67 conflicts to select the master repo version

Summary of changes by file state
DD (Deleted <=> Deleted): 24
UA (Updated <=> Added): 3
AU (Added <=> Updated): 1
AA (Added <=> Added): 39

  • (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js - Removed from both
  • (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js - Unmerged, added by them => checkout theirs
  • (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts - Unmerged, added by them => checkout theirs
  • (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/eslint.config.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-core/.eslintrc.js - Removed from both
    ...truncated...
    Identifying and fixing merge issues from staged repos

Nico385412 and others added 30 commits June 21, 2023 14:16
@Nico385412
fix(exporter-logs-otlp-http): set useHex to true (#3875)
5dc0f69
@pichlermarc
feat(otlp-exporters): bump otlp proto to 0.20.0 (#3932)
19fb033
@raphael-theriault-swi @haddasbronfman
feat: add sqlcommenter comment to mysql2 queries (#1523)
856c252 
* chore: extract sql commenting logic to common package

* feat(instrumentation-mysql2): sqlcommenter support

* fix(instrumentation-mysql2): properly assign commented sql

* chore(instrumentation-mysql2): test sqlcommenter

* chore(instrumentation-mysql2): update readme with new option

* chore: revert workflows autoformat

* chore(sql-common): specify api devDep

* chore: update release-please manifests

* chore(sql-common): fix copy pasted readme

* fix(instrumentation-mysql2): proper test cleanup logic

* fix(instrumentation-mysql2): proper test config handling

---------

Co-authored-by: Haddas Bronfman <[email protected]>
@pichlermarc
fix(otlp-proto-exporter-base): add missing type import (#3937)
9977de7
@pichlermarc
fix(ci): use npx to run lerna (#1546)
4514522
@renovate-bot
chore(deps): update dependency semver to v7.5.3 (#3942)
655e373
@martinkuba
chore: Update component owners for the Document Load web instrumentat…
32fde65 
…ion (#1550)
@renovate-bot
chore(deps): update dependency nightwatch to v3 (#3950)
a30952c
@pichlermarc
fix(exporter-logs-otlp-http): update tsconfigs (#3936)
4dc8416
@llc1123 @haddasbronfman
fix(example-opencensus-shim): avoid OpenCensus auto instrumentations …
15ede47 
…(#3951)

* fix(example-opencensus-shim): avoid opencensus instrumentations being auto imported

* chore: changelog

---------

Co-authored-by: Haddas Bronfman <[email protected]>
@pichlermarc
fix(selenium-tests): restore tests to functional state (#3923)
10c3e93
@MSNev @pichlermarc
feat(minification): Add importHelpers and tslib as a dependency (#1545)
65f612e 
Co-authored-by: Marc Pichler <[email protected]>
@davidweterings @haddasbronfman
feat(aws-ecs): add cloud resource attributes for fargate (#1543)
de17f77 
chore: fix typo in test description

Noticed ECS on Fargate is missing some cloud resource attributes.
Comparing similar implementations like the Go ECS detector (https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/5fff1040a2844d4d435359b8108202317762593d/processor/resourcedetectionprocessor/internal/aws/ecs/ecs.go#L69);
they determine these missing values based on the metadata. This implements them in a similar fashion.

Co-authored-by: Haddas Bronfman <[email protected]>
@carolabadeer @haddasbronfman @pichlermarc
feat(opentelemetry-instrumentation-aws-sdk): add missing spec-defined…
f7c4324 
… DynamoDB attributes (#1524)

* feat(opentelemetry-instrumentation-aws-sdk): add missing spec-defined DynamoDB attributes

* feat(opentelemetry-instrumentation-aws-sdk): add checks for input attributes and additional unit tests

* feat(opentelemetry-instrumentation-aws-sdk): run lint on dynamoDB unit tests

---------

Co-authored-by: Haddas Bronfman <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
@chigia001 @Flarna
fix(connect): Skip update HTTP's span name and update RpcMetadata's r…
8499b16 
…oute instead (#1534)

Co-authored-by: Gerhard Stöbich <[email protected]>
@pkanal @pichlermarc
feat(opentelemetry-instrumentation-document-load): Add access to perf…
7c7294c 
…ormance resource timing object for custom attributes (#1529)

* feat(opentelemetry-instrumentation-document-load): Add access to performance resource timing object for custom attributes

* update docs

* fix lint

* Apply suggestions from code review

Co-authored-by: Marc Pichler <[email protected]>

---------

Co-authored-by: Marc Pichler <[email protected]>
@dyladan @Flarna
feat(lambda): add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environ…
8777cbd 
…ment variable (#1227)

* feat(lambda): add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environment option

* Lint

* feat: copy object to prevent modification

* test: add coverage

* chore: lint

* Fix build

---------

Co-authored-by: Gerhard Stöbich <[email protected]>
@aabmass @pichlermarc
fix(sdk-metrics): preserve startTime for cumulative ExponentialHistog…
e2e291c 
…rams (#3934)

Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
chore(deps): update lerna monorepo to v7.1.1 (#3956)
b3d57bb
@aodysseos @pichlermarc
fix(http-intrumentation): prevent request socket null from throwing u…
bb8a4f7 
…ncaught error (#3858)

Co-authored-by: Marc Pichler <[email protected]>
@martinkuba @pichlermarc
LowMemory metrics temporality preference (#3915)
070b685 
Co-authored-by: Marc Pichler <[email protected]>
@JacksonWeber
Update the Prometheus Exporter to by Default not Append Timestamp (#3…
1ce8a89 
…961)
@renovate-bot
fix(deps): update dependency import-in-the-middle to v1.4.1 (#3962)
de5cd0f
@pichlermarc @Flarna
docs(otlp-exporters): update docs to reflect OTLP 0.20.0 is used (#3938)
c51c9eb 
Co-authored-by: Gerhard Stöbich <[email protected]>
@GuillaumeDeconinck @haddasbronfman @pichlermarc
feat(mongodb): support v5 (#1451)
05c4e9e 
* feat(mongodb): add support for v5

* refactor(mongodb): avoid duplicating code for v4 & v5

* fix: lint

* refactor(mongodb): use range for mongodb version check

* chore(mongodb): make test commands consistent

* refactor(mongodb): adapt code based on main's changes

* chore: revert mongodb bump in devDependencies

* refactor: adapt code based on comments

* chore: re-use old order for tests suites

* refactor: simply metrics tests

* test: fix DB name in v5 tests

* chore: revert MongoDB to 3.6.11 in package.json

* test: fix compilation issue due to different signatures (v3 vs v5)

* fix: lint

---------

Co-authored-by: Haddas Bronfman <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
@llc1123
chore(instrumentation-grpc): cleanup remnants of grpc-native support …
dccd906 
…(#3886)
@Abinet18 @t2t2 @pichlermarc
fix: add secureConnectionStart to https only (#3879)
ea160d9 
Co-authored-by: t2t2 <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
@pichlermarc
fix(instrumentation-fastify): fix fastify typescript compilation issu…
784a422 
…e (#1556)
@renovate-bot
chore(deps): update all patch versions to v7.22.6 (#3965)
a675ae8
@pichlermarc
docs: document merge reqiurements (#1553)
a18b074 
* docs: document merge reqiurements

* docs: remove redundant wording

* docs: remove redundant wording

* docs: lint
haddasbronfman and others added 27 commits August 2, 2023 09:29
@haddasbronfman @renovate-bot
chore: update patch dependencies (#1595)
db50d00 
* fix(deps): update all patch versions

* fix(hapi): fix hapi test with new @types

* fix(hapi): lint

---------

Co-authored-by: Mend Renovate <[email protected]>
@chigia001 @haddasbronfman
chore: bump typescripts to 4.4.4 to fix compile issue with @types/koa…
a53f643 
… (#1616)

Co-authored-by: Haddas Bronfman <[email protected]>
@NurimOnsemiro @renovate-bot
@haddasbronfman @blumamir
fix(fastify): readme option table format (#1619)
3d6c7be 
Co-authored-by: Mend Renovate <[email protected]>
Co-authored-by: Haddas Bronfman <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
@renovate-bot
chore(deps): update all patch versions (#3997)
b4cda7a
@renovate-bot @blumamir
chore(deps): update dependency rimraf to v5 (#1608)
2a0d543 
Co-authored-by: Amir Blum <[email protected]>
@renovate-bot @blumamir
chore(deps): update dependency mongoose to v6.11.3 [security] (#1601)
4dc98d3 
Co-authored-by: Amir Blum <[email protected]>
@dyladan @pichlermarc
fix: Revert "feat(minification): Add importHelpers and tslib as a dep…
e5bca5f 
…endency (#1545)" (#1611)

Co-authored-by: Marc Pichler <[email protected]>
@blumamir
chore(deps): update dependency @types/semver to v7.5.0 (#1621)
5d204b4
@haddasbronfman
fix(renovate): change renovate patch schedule (#1603)
e242645
@HPaulson @pichlermarc
docs(resources): Fixes detectResources deprecated typos (#4003)
5fd656b 
Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
chore(deps): update dependency prettier to v2.8.8 (#1622)
154b30b
@pichlermarc @chalin
docs(README): clarify browser support (#4037)
3732256 
Co-authored-by: Patrice Chalin <[email protected]>
@krosenk729 @pichlermarc
fix(parseKeyPairsIntoRecord): allow equals in baggage value #3974 (#3…
a421318 
…975)

Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
chore(deps): update all patch versions (#4043)
ffe641c
@pichlermarc
chore: prepare release 1.15.2/0.41.2 (#4036)
48fb158
@aabmass @dashpole
feat(sdk-metrics): implement MetricProducer specification (#4007)
d3436bf 
Co-authored-by: David Ashpole <[email protected]>
@chigia001 @haddasbronfman
chore: fix issue with nyc crashing (#1605)
a1243ee 
* chore: fix issue with nyc crashing

* chore: revert hoist change, make @babel/core nohoist

* chore: update @babel/core to test Garbage Collector issue

* chore: bump typescripts to 4.4.4 in some package

* Revert "chore: bump typescripts to 4.4.4 in some package"

This reverts commit 5bf1bfbe433bf614787c0ccca79a40aa644c86b3.

* Revert "Revert "chore: bump typescripts to 4.4.4 in some package""

This reverts commit 2877b7e500b629216a66f4b9300e82e3d452ab4f.

* Fix cancelled issue

---------

Co-authored-by: Haddas Bronfman <[email protected]>
@blumamir @pichlermarc
chore: update blumamir employee name in the README (#4052)
902229a 
Co-authored-by: Marc Pichler <[email protected]>
@renovate-bot
chore(deps): update all patch versions (#1604)
e3d7f60
@carolabadeer @blumamir
fix(aws-sdk-instrumentation): Patch new smithy client and middleware …
3f2bfe8 
…packages (#1626)

Co-authored-by: Amir Blum <[email protected]>
@nachogiljaldo @pichlermarc @blumamir
fix(knex): nested queries result in wrong span names (#1537)
f4df836 
* fix(knex): nested queries result in wrong span names.

* Cleanup assertions.

---------

Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
@jarlefosen @blumamir @haddasbronfman
fix(redis-4): omit credentials from db.connection_string span attribu…
ccf1efe 
…te (#1562)

* fix(redis-4): omit credentials from db.connection_string span attribute

* Reconstruct non-sensitive db.connection_string using built-in URL.href

* style(redis-4): Fix code style according to community standards

* fix(redis-4): Log error on connection string sanitization failure

---------

Co-authored-by: Amir Blum <[email protected]>
Co-authored-by: Haddas Bronfman <[email protected]>
@renovate-bot
fix(deps): update otel core experimental to v0.41.2 (#1628)
4f11245
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [902229a...](open-telemetry/opentele…
dd51d74 
…metry-js@902229a)

  - commit 902229a
  - Author: Amir Blum <[email protected]>
  - Date:   Thu Aug 10 12:23:28 2023 +0300
  -     chore: update blumamir employee name in the README (#4052)
  - ...
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [4f11245...](open-telemetry/…
88db0fd 
…opentelemetry-js-contrib@4f11245)

  - commit 4f11245
  - Author: Mend Renovate <[email protected]>
  - Date:   Thu Aug 10 14:57:58 2023 +0200
  -     fix(deps): update otel core experimental to v0.41.2 (#1628)
  - ...
@MSNev
Merge pull request open-telemetry#152 from opentelemetrybot/opentelem…
44bcf14 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@MSNev
[AutoMerge] staging @ [44bcf14...](open-telemetry@44bcf14)
bf18236 
### 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/
@MSNev
[AutoMerge] Merge Staged changes to main
d0590ae 
### Auto resolving 67 conflicts to select the master repo version
Summary of changes by file state
DD (Deleted <=> Deleted): 24
UA (Updated <=> Added): 3
AU (Added <=> Updated): 1
AA (Added <=> Added): 39

 - (DD) auto-merge/contrib/metapackages/auto-instrumentations-web/.eslintrc.js - Removed from both
 - (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts - Unmerged, added by them => checkout theirs
 - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/eslint.config.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-logs-otlp-proto/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-http/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http/src/OTLPMetricExporterOptions.ts - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/src/platform/index.ts - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-core/.eslintrc.js - Removed from both
...truncated...
Identifying and fixing merge issues from staged repos
@MSNev MSNev closed this Aug 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do-not-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.