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 #145

Closed
wants to merge 76 commits into from
Closed

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

wants to merge 76 commits into from

Conversation

MSNev
Copy link
Collaborator

@MSNev MSNev commented Jul 26, 2023

staging @ 3a875dd...

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 65 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): 37

  • (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
Flarna and others added 28 commits July 12, 2023 12:37
@Flarna @pichlermarc
chore: update renovate.json (#1575)
3139dbf 
Co-authored-by: Marc Pichler <[email protected]>
@pichlermarc
chore(renovate): change strategy for @opentelemetry/api, run experime…
bf25eb1 
…ntal update every weekday (#1578)
@chigia001 @pichlermarc
feat(fastify): Skip update HTTP's span name and update RpcMetadata's …
8d9687d 
…route instead (#1569)

Co-authored-by: Marc Pichler <[email protected]>
@dyladan
chore: release main (#1539)
f81f8a7 
* chore: release main

* chore: release main
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [f81f8a7...](open-telemetry/…
a3a577d 
…opentelemetry-js-contrib@f81f8a7)

  - commit f81f8a7
  - Author: Daniel Dyla <[email protected]>
  - Date:   Wed Jul 12 11:23:46 2023 -0400
  -     chore: release main (#1539)
  - ...
### 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-sql-common/CHANGELOG.md - Unmerged, added by them => checkout theirs
@MSNev
Merge pull request open-telemetry#140 from opentelemetrybot/opentelem…
b92f6de 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js-contrib;
@legendecas
chore: apply update-ts-configs (#3987)
5352cc7
@renovate-bot
chore(deps): update all patch versions (#3984)
65483a4
@haddasbronfman
fix(aws-xray): align aws xray to use contrib-test-utils v0.34.0 (#1582)
1195872
@renovate-bot
chore(deps): update dependency nock to v13.3.2 (#3994)
87f21ef
@raphael-theriault-swi
fix(instrumentation-mysql2): sql-common should be a dependency (#1584)
00f7404
@chigia001 @haddasbronfman @blumamir
chore: upgrade [email protected] and re-enable test in node@18 for resource…
ea86583 
…-detector-alibaba-cloud (#1581)

* chore: upgrade [email protected] and re-enable test in node@18 for resource-detector-alibaba-cloud

* chore: remove --ignore @opentelemetry/resource-detector-alibaba-cloud in tav pipeline

---------

Co-authored-by: Haddas Bronfman <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
@renovate-bot @blumamir
chore(deps): update dependency semver to v7.5.4 (#1577)
6150def 
Co-authored-by: Amir Blum <[email protected]>
@chigia001 @haddasbronfman
chore(restify): update restify version to 11.1.0 and re-enable unit t…
432d89e 
…est in node@18 (#1576)

* chore(restify): upgrade restify to 9.1.0

* chore(restify): upgrade restify to 10.0.0 && re-enable node@18 test

* chore(restify): upgrade restify to 11.1.0

* chore(restify): re-enable test in tav

* chore(restify): update tav with corrent node.js version range check

* chore(restify): fix missing newline

* chore(restify): update tav to version 9.1.0 instead of 9.0.0

* chore: upgrade document and tav for restify

* chore: pin restify version

---------

Co-authored-by: Haddas Bronfman <[email protected]>
@renovate-bot @haddasbronfman
chore(deps): update dependency @types/node to v18.16.19 (#1585)
b77c282 
Co-authored-by: Haddas Bronfman <[email protected]>
@blumamir @haddasbronfman
chore(deps): update dependency nock to v13.3.2 (#1592)
b5fc0c4 
* chore(deps): update dependency nock to v13.3.2

* chore: lint

---------

Co-authored-by: Haddas Bronfman <[email protected]>
@Ugzuzg @blumamir
feat(cucumber): add instrumentation for @cucumber/cucumber (#1252)
82267ab 
* feat(cucumber): add instrumentation for @cucumber/cucumber

* fix(cucumber): rename plugin directory

* chore(cucumber): add to release-please-config

* chore(cucumber): add Ugzuzg to component_owners

* fix(cucumber): add @opentelemetry/semantic-conventions to dependencies

* fix(cucumber): only instrument ^8

* fix(cucumber): use bound diag logger

* fix(cucumber): add tags as string[] to attributes

* fix(cucumber): extract attribute names into enum

* fix(cucumber): recordException as string for step statuses

* docs(auto-instrumentation-node): add cucumber instrumentation to readme

* fix(cucumber): remove unnecessary isEnabled checks

* fix(cucumber): get rid of @cucumber/cucumber imports in compiled files

* fix(cucumber): remove newline character from span name

* fix(cucumber): set step status as an attribute

* chore(cucumber): update homepage path

Co-authored-by: Amir Blum <[email protected]>

* fix(cucumber): get status enum from cucumber module

* fix(cucumber): mention why isEnabled is needed

* chore(cucumber): add package to release-please-manifset

* feat: wrap runAttempt

* fix: match versions in package.json and auto

* feat: instrument cucumber@9

* fix: wrap typeof in parens

---------

Co-authored-by: Amir Blum <[email protected]>
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [87f21ef...](open-telemetry/opentele…
c9a348b 
…metry-js@87f21ef)

  - commit 87f21ef
  - Author: Mend Renovate <[email protected]>
  - Date:   Fri Jul 14 12:49:00 2023 +0200
  -     chore(deps): update dependency nock to v13.3.2 (#3994)
  - ...
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [82267ab...](open-telemetry/…
0c148b9 
…opentelemetry-js-contrib@82267ab)

  - commit 82267ab
  - Author: Jaryk <[email protected]>
  - Date:   Tue Jul 18 17:51:53 2023 +0200
  -     feat(cucumber): add instrumentation for @cucumber/cucumber (#1252)
  - ...
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
0a6608b 
Processing otel-js
 - (*F) /plugins - Removing extra folder plugins
Processing otel-js-contrib
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintrc.js - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/.tav.yml - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/LICENSE - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/README.md - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/package.json - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/index.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/instrumentation.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/src/types.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/.gitignore - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/cucumber.test.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/step_definitions/steps.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/test/features/support/world.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/instrumentation-cucumber/tsconfig.json - Re-Copying master file
@MSNev
Merge pull request open-telemetry#142 from opentelemetrybot/opentelem…
96451c9 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@dyladan
Revert tslib #3914 (#4011)
0f20b2a 
* Revert "feat(minification): Add noEmitHelpers, importHelpers and tslib as a dependency (#3914)"

This reverts commit 74393ac.

* Changelog

* Update CHANGELOG.md
@dyladan
chore: prepare release 1.15.1/0.41.1 (#4016)
9f71800
@MSNev
fix: Add otel-api as dev dep for sandbox tests (#4020)
2b20565 
* fix: Add otel-api as dev dep for sandbox tests

* fix changelog formatting
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [2b20565...](open-telemetry/opentele…
301cf94 
…metry-js@2b20565)

  - commit 2b20565
  - Author: Nev <[email protected]>
  - Date:   Wed Jul 26 09:43:54 2023 -0700
  -     fix: Add otel-api as dev dep for sandbox tests (#4020)
  - ...
@MSNev
Merge pull request open-telemetry#144 from opentelemetrybot/opentelem…
3a875dd 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js;
@MSNev
[AutoMerge] staging @ [3a875dd...](open-telemetry@3a875dd)
10f6f95 
### 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
c69f3e3 
### Auto resolving 65 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): 37

 - (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 Jul 26, 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.