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

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

Closed
wants to merge 284 commits into from
Closed

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

wants to merge 284 commits into from

Conversation

opentelemetrybot
Copy link
Contributor

staging @ a7138c1...

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

Summary of changes by file state
UA (Updated <=> Added): 12
DD (Deleted <=> Deleted): 61
AA (Added <=> Added): 75
UD (Updated <=> Deleted): 4
AU (Added <=> Updated): 5

  • (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs
  • (UA) auto-merge/contrib/plugins/node/instrumentation-runtime-node/src/types.ts - Unmerged, added by them => 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/opentelemetry-instrumentation-redis-4/src/internal-types.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/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/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
  • (DD) auto-merge/js/api/karma.worker.js - Removed from both
  • (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/api/tsconfig.esnext.json - Removed from both
  • (DD) auto-merge/js/api/tsconfig.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esnext.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.json - Removed from both
    ...truncated...
    Identifying and fixing merge issues from staged repos

MSNev and others added 30 commits November 9, 2023 15:43
@MSNev
Merge pull request open-telemetry#203 from opentelemetrybot/opentelem…
2cd0511 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@martinkuba @dyladan @pichlermarc
feat: add esnext target for web instrumentations (#1776)
2698bb1 
Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@Zirak
refactor(auto-instrumentations-node): Name export getResourceDetector…
24ffb3b 
…s (#1792)

Better align with the other exports.

Follow-up to #1772.
@ramesius @blumamir
fix(instrumentation-koa): handle koa routes being of type RegExp (#1754)
e313938 
* chore: replace deprecated SpanAttributes type with Attributes

* fix: handle layer path being a string or regex

* chore: add test for RegExp koa route

* fix: single quote string due to linting

---------

Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@macno @blumamir
chore: cleanup files in package json (#1786)
9b76ffb 
* chore: typo in CONTRIBUTING.md

* chore: cleanup files entries in package.json (#820)

* chore: add missing files entries to package.json (#820)

* chore: remove useless .npmignore (#820)

---------

Co-authored-by: Amir Blum <amirgiraffe@gmail.com>
@renovate-bot
chore(deps): update dependency chromedriver to v119 [security] (#4280)
b41cada
@dyladan
chore: release main (#1742)
607d375
@alingamn @pichlermarc
feat(instrumentation-aws-sdk)!: Capture full ARN for span attribute m…
28ea3b6 
…essaging.destination.name for SNS topics (#1727)

* Capture full ARN for SNS topics in messaging.destination

Problem:
The use of topic names instead of ARNs in `messaging.destination` omits
essential account information, making topic localization cumbersome.

Solution:
Adopt full ARNs as the value for `messaging.destination`, preserving both
topic name and account details, aligning with current SNS ServiceExtension
approach.

Closes #1716

* Add new span attribute instead of modifying the existing attribute

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@renovate-bot @dyladan
chore(deps): update commitlint monorepo to v18 (#1788)
ea73a67 
Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
@renovate-bot
chore(deps): update actions/setup-node action to v4 (#4236)
b0c0ace
@renovate-bot
chore(deps): update grafana/grafana docker tag to v10 (#1674)
eee50d8
@diogotorres97 @dyladan
chore(graphql): update span name to show the resolver name (#1796)
99db4bb 
Co-authored-by: Daniel Dyla <dyladan@users.noreply.github.com>
@satazor @ArtAhmetaj
fix(sdk-trace-base): processor onStart called with a span having empt…
10f6c46 
…y attributes (#4277)

Co-authored-by: artahmetaj <artahmetaj@yahoo.com>
@drewcorlin1 @pichlermarc
Update fetch instrumentation to be runtime agnostic (#4063)
5ed54c8 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@trentm
feat(test-utils): runTestFixture utility for running out-of-process t…
4c8b374 
…ests (#1735)
@pichlermarc @trentm
chore: fix npm release preparation scripts, add .npmrc and release sc…
2c7d5c4 
…ript (#4275)

Co-authored-by: Trent Mick <trentm@gmail.com>
@renovate-bot
chore(deps): update all patch versions (#4255)
4eddf51
@trentm @pichlermarc
chore: use npm workspaces and a package-lock.json (#1771)
c7c7547 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@JacksonWeber @pichlermarc
fix: Export All Azure Resource Detectors (#1800)
7370386 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@renovate-bot
chore(deps): update all patch versions (#1723)
5c1050b
@dyladan
Execute binaries from root node modules (#4302)
51be418
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [51be418...](open-telemetry/opentele…
481f435 
…metry-js@51be418)

  - commit 51be418
  - Author: Daniel Dyla <dyladan@users.noreply.github.com>
  - Date:   Thu Nov 16 15:56:26 2023 -0500
  -     Execute binaries from root node modules (#4302)
  - ...
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [5c1050b...](open-telemetry/…
49980e5 
…opentelemetry-js-contrib@5c1050b)

  - commit 5c1050b
  - Author: Mend Renovate <bot@renovateapp.com>
  - Date:   Thu Nov 16 16:29:56 2023 +0100
  -     chore(deps): update all patch versions (#1723)
  - ...
### Auto resolving 52 conflicts to select the master repo version
Summary of changes by file state
UD (Updated <=> Deleted): 47
UA (Updated <=> Added): 5

 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-github/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-instana/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/metapackages/auto-instrumentations-node/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/packages/opentelemetry-host-metrics/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/.npmignore - Unmerged, deleted by them => remove
 - (UA) auto-merge/contrib/packages/opentelemetry-test-utils/src/test-fixtures.ts - Unmerged, added by them => checkout theirs
 - (UD) auto-merge/contrib/plugins/node/instrumentation-amqplib/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/plugins/node/instrumentation-cucumber/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/plugins/node/instrumentation-dataloader/.npmignore - Unmerged, deleted by them => remove
 - (UD) auto-merge/contrib/plugins/node/instrumentation-fs/.npmignore - Unmerged, deleted by them => remove
...truncated...
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
8712bcb 
Processing otel-js
 - (xM) /auto-merge/js/.npmrc - Re-Copying master file
 - (*E) /.npmrc - Removing extra file
 - (*E) /package-lock.json - Removing extra file
 - (*F) /plugins - Removing extra folder plugins
 - (*E) /tsconfig.base.esnext.json - Removing extra file
Processing otel-js-contrib
 - (xM) /auto-merge/contrib/.npmrc - Re-Copying master file
 - (xM) /auto-merge/contrib/package-lock.json - Re-Copying master file
 - (xM) /auto-merge/contrib/plugins/node/opentelemetry-instrumentation-ioredis/test/fixtures/use-ioredis.mjs - Re-Copying master file
 - (xM) /auto-merge/contrib/tsconfig.base.esnext.json - Re-Copying master file
@MSNev
Merge pull request open-telemetry#205 from opentelemetrybot/opentelem…
9c5bcd5 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@trentm
chore: sync package-lock file to package.json files (#1807)
a034982
@trentm @pichlermarc
chore(instrumentation-mysql2): drop unneed @types/mysql2 dep (#1812)
434cab2 
Types are included in 'mysql2' now (as of some 2.x release).

The github:types/mysql2 dependency is problematic for dependabot version updates.
See: open-telemetry/opentelemetry-js-contrib#1806 (comment)

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@dyladan
Add Trent to approvers (#4311)
079c1f5
@pichlermarc
chore(renovate): require dashboard approval for lerna updates (#4276)
b3a539d
@pichlermarc
fix(ci): use opentelemetrybot to sync package-lock.json on release PR…
fce33b6 
…s (#1817)

* fix(ci): use opentelemetrybot to sync package-lock.json on release PRs

* fix: comment typo

* fix: token is named RELEASE_PR_TOKEN
altinokdarici and others added 29 commits March 1, 2024 12:12
@altinokdarici
Add @opentelemetry/api as peerDependencies in @opentelemetry/resource…
2e9fce4 
…-detector-azure (#1979)
@pichlermarc
fix(instrumentaiton-runtime-node)!: rename exported instrumentation t…
fef1b36 
…o match package name (#1989)

* fix(instrumentaiton-runtime-node): rename exported instrumentation

* fix: lint
@pichlermarc
chore(deps): update deps matching "@opentelemetry/*" (#1978)
edc426b 
* chore(deps): update deps matching "@opentelemetry/*"

    0.48.0 -> 0.49.1 @opentelemetry/api-logs (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/instrumentation (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/instrumentation-fetch (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/instrumentation-grpc (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/instrumentation-http (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/instrumentation-xml-http-request (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/sdk-logs (range-bump)
    0.48.0 -> 0.49.1 @opentelemetry/sdk-node (range-bump)
    0.49.0 -> 0.49.1 @opentelemetry/instrumentation (range-bump)
    0.49.0 -> 0.49.1 @opentelemetry/sdk-node (range-bump)
    1.7.0 -> 1.8.0 @opentelemetry/api
    1.21.0 -> 1.22.0 @opentelemetry/context-async-hooks
    1.21.0 -> 1.22.0 @opentelemetry/context-zone
    1.21.0 -> 1.22.0 @opentelemetry/context-zone-peer-dep
    1.21.0 -> 1.22.0 @opentelemetry/core
    1.21.0 -> 1.22.0 @opentelemetry/exporter-jaeger
    1.21.0 -> 1.22.0 @opentelemetry/propagator-b3
    1.21.0 -> 1.22.0 @opentelemetry/resources
    1.21.0 -> 1.22.0 @opentelemetry/sdk-metrics
    1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-base
    1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-node
    1.21.0 -> 1.22.0 @opentelemetry/sdk-trace-web
    1.21.0 -> 1.22.0 @opentelemetry/semantic-conventions

* fix(test-utils): update SDK_INFO use

* fix: properly type attributes

* fix: lint
@AndrewAKovalenko @pichlermarc
updated zone.js version (#1934)
43fd4eb 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@JamieDanielson
test(instr-express): add test for ESM (#1966)
7106313 
* maint(instr-express): add test for ESM

* dont use router in express test
@trentm @pichlermarc
chore(instr-runtime-node): update some deps to same versions as other…
d2f59e9 
… contrib packages (#1994)

- reduce 'mocha' dep to v7 used by all other packages
- bump /api peer dep to 1.3.0 (the version when api-metrics was merged into api)

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@dyladan
chore: release main (#1935)
fcea8ca
@JacksonWeber
fix: ConsoleMetricExporter Should Not Export Shallowly (#4522)
75bd723 
* fix: (ConsoleMetricExporter): Increase console log depth to get useful information from metrics.

* update: add contribution to changelog.

* Update CHANGELOG.md
@pichlermarc
fix(exporter-*-otlp-grpc)!: lazy load gRPC (#4432)
5a033e5 
* fix(exporter-*-otlp-grpc)!: lazy load gRPC
@renovate-bot
chore(deps): update dependency test-all-versions to v6.1.0 (#1943)
a379758
@pichlermarc
chore(renovate): remove import-in-the-middle from all-patch group (#4…
63d74cd 
…513)
@pichlermarc
fix(instrumentation-graphql): limit support to >=14 <17 (#1971)
ff40cc8
@pichlermarc
fix(instrumentation-mongodb)!: temporarily reduce supported range to …
2d3bb52 
…mongodb <6.4 (#1984)
@pichlermarc
fix(instrumentation-runtime-node): use TestMetricReader, unref timer …
e24797e 
…(#1965)

* fix(instrumentation-perf-hooks): use TestMetricReader, unref timer

* fixup! fix(instrumentation-perf-hooks): use TestMetricReader, unref timer
@trentm @pichlermarc
chore(instr-mongodb): drop obsolete 'pretest' step from TAV run (#1998)
dfb2dff 
Since the move to npm workspaces in #1771 this pretest step is
no longer needed for TAV test runs.

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@renovate-bot @pichlermarc
chore(deps): update codecov/codecov-action action to v4 (#1921)
98f43cd 
Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@JamieDanielson @pichlermarc
fix(instr-express): normalize paths with double slashes (#1995)
65a9553 
* fix(instr-express): normalize paths with double slashes

* remove unnecessary listener count from test

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@trentm @pichlermarc
fix(instr-aws-sdk): ensure that instrumentation does not crash on bog…
fa7e2f5 
…us SQS.sendMessageBatch input (#1999)

* fix(instr-aws-sdk): ensure that instrumentation does not crash on bogus SQS.sendMessageBatch input

Fixes: #1975

* force intentionally bogus sendMessageBatch params to pass type check

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@SimenB @pichlermarc
chore: use @web/test-runner instead of karma (#1816)
19ebbaf 
* chore: use `@web/test-runner` instead of `karma`

* remove karma config file

* prettier

* ts

* more ts

* remove one more dep

* maybe run browser test with node 18

* we need 16

* is json output enough?

* Revert "is json output enough?"

This reverts commit af20f6c3914379777908c9bcce3867187027bd51.

* Revert "Revert "is json output enough?""

This reverts commit 6e3b6fe679557214d4642bb41d4ee847775a46b6.

* Revert "Revert "Revert "is json output enough?"""

This reverts commit 11100a87bf5f3c53105864df5637297247a9b040.

* trigger ci

* chore: sync package-lock.json

* remove two unused deps

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@atsu85 @pichlermarc
feat(auto-instrumentations-node): enabling instrumentations via env (…
0656f37 
…#1953)

* refactor: extract `checkManuallyProvidedInstrumentationNames` method

#1672

* feat: allow enabling  instrumentations selected via environment variable

Closes #1672

---------

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
@pichlermarc
chore: make metapackages be owned by maintainers (#1996)
0574168
@dependabot
chore(deps-dev): bump ip from 1.1.8 to 1.1.9 (#4495)
7fa2c84 
Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9.
- [Commits](indutny/node-ip@v1.1.8...v1.1.9)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pichlermarc
fix(instrumentation-pg): prevent net.peer.port from being NaN (#1982)
3b2090b 
* fix(instrumentation-pg): prevent net.peer.port from being NaN

* fix: lint

* fix: test name

* Update plugins/node/opentelemetry-instrumentation-pg/src/utils.ts
@opentelemetrybot
[AutoMerge] ## Merging otel-js @ [7fa2c84...](open-telemetry/opentele…
d4645f2 
…metry-js@7fa2c84)

  - commit 7fa2c84
  - Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  - Date:   Fri Mar 8 16:58:44 2024 +0100
  -     chore(deps-dev): bump ip from 1.1.8 to 1.1.9 (#4495)
  - ...
### Auto resolving 9 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 6
UD (Updated <=> Deleted): 3

 - (UA) auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/test/grpc-exporter-transport.test.ts - Unmerged, added by them => checkout theirs
 - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/LogsExportServiceClient.ts - Unmerged, deleted by them => remove
 - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/MetricsExportServiceClient.ts - Unmerged, deleted by them => remove
 - (UD) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/TraceExportServiceClient.ts - Unmerged, deleted by them => remove
 - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/create-service-client-constructor.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/export-response.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/exporter-transport.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/grpc-exporter-transport.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/experimental/packages/otlp-grpc-exporter-base/src/serializers.ts - Unmerged, added by them => checkout theirs
@opentelemetrybot
[AutoMerge] ## Merging otel-js-contrib @ [3b2090b...](open-telemetry/…
9797c84 
…opentelemetry-js-contrib@3b2090b)

  - commit 3b2090b
  - Author: Marc Pichler <marc.pichler@dynatrace.com>
  - Date:   Fri Mar 8 19:35:04 2024 +0100
  -     fix(instrumentation-pg): prevent net.peer.port from being NaN (#1982)
  - ...
### Auto resolving 226 conflicts to select the master repo version
Summary of changes by file state
UD (Updated <=> Deleted): 3
AU (Added <=> Updated): 74
UA (Updated <=> Added): 75
DD (Deleted <=> Deleted): 74

 - (UD) auto-merge/contrib/metapackages/auto-instrumentations-web/test/index-webpack.ts - Unmerged, deleted by them => remove
 - (AU) auto-merge/contrib/packages/opentelemetry-host-metrics/LICENSE - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-id-generator-aws-xray/tsconfig.json - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-propagation-utils/tsconfig.esm.json - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/.eslintignore - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/.eslintrc.js - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/README.md - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/package.json - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/index.ts - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/remote-sampler.ts - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/src/types.ts - Added in ours => checkout ours
 - (AU) auto-merge/contrib/packages/opentelemetry-sampler-aws-xray/test/remote-sampler.test.ts - Added in ours => checkout ours
 - (AU) auto-merge/contrib/plugins/node/instrumentation-amqplib/LICENSE - Added in ours => checkout ours
 - (AU) auto-merge/contrib/plugins/node/instrumentation-cucumber/.eslintignore - Added in ours => checkout ours
 - (AU) auto-merge/contrib/plugins/node/instrumentation-fs/tsconfig.json - Added in ours => checkout ours
 - (AU) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/.eslintrc.js - Added in ours => checkout ours
 - (AU) auto-merge/contrib/plugins/node/instrumentation-perf-hooks/README.md - Added in ours => checkout ours
...truncated...
 - (UA) examples/bunyan/README.md - Unmerged, added by them => checkout theirs
@opentelemetrybot
[AutoMerge] Identifying and fixing merge issues from staged repos
42f63f5 
Processing otel-js
 - (*E) /auto-merge/js/experimental/packages/exporter-logs-otlp-grpc/test/grpc-exporter-transport.test.ts - Removing extra file
 - (xM) /auto-merge/js/experimental/packages/otlp-grpc-exporter-base/test/grpc-exporter-transport.test.ts - Re-Copying master file
 - (*F) /examples - Removing extra folder examples
 - (*F) /incubator - Removing extra folder incubator
 - (*F) /plugins - Removing extra folder plugins
Processing otel-js-contrib
 - (xM) /auto-merge/contrib/examples/bunyan/.npmrc - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/bunyan/README.md - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/bunyan/app.js - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/bunyan/app.mjs - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/bunyan/package.json - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/bunyan/telemetry.js - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/.npmrc - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/README.md - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/images/jaeger.jpg - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/images/zipkin.jpg - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/package.json - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/src/client.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/src/server.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/src/tracer.ts - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/express/tsconfig.json - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/koa/.npmrc - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/koa/README.md - Re-Copying master file
 - (xM) /auto-merge/contrib/examples/koa/images/jaeger.jpg - Re-Copying master file
...truncated...
@MSNev
Merge pull request open-telemetry#217 from opentelemetrybot/opentelem…
a7138c1 
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
@opentelemetrybot
[AutoMerge] staging @ [a7138c1...](open-telemetry@a7138c1)
518efba 
### 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/
@opentelemetrybot
[AutoMerge] Merge Staged changes to main
3c9dd25 
### Auto resolving 157 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 12
DD (Deleted <=> Deleted): 61
AA (Added <=> Added): 75
UD (Updated <=> Deleted): 4
AU (Added <=> Updated): 5

 - (UA) auto-merge/contrib/detectors/node/opentelemetry-resource-detector-azure/src/index.ts - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/contrib/plugins/node/instrumentation-runtime-node/src/types.ts - Unmerged, added by them => 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/opentelemetry-instrumentation-redis-4/src/internal-types.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/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/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
 - (DD) auto-merge/js/api/karma.worker.js - Removed from both
 - (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/api/tsconfig.esnext.json - Removed from both
 - (DD) auto-merge/js/api/tsconfig.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esnext.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.json - Removed from both
...truncated...
Identifying and fixing merge issues from staged repos
@MSNev MSNev closed this Apr 9, 2024
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet