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.

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

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

Closed
wants to merge 110 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
5dc0f69
fix(exporter-logs-otlp-http): set useHex to true (#3875)
Nico385412 Jun 21, 2023
19fb033
feat(otlp-exporters): bump otlp proto to 0.20.0 (#3932)
pichlermarc Jun 21, 2023
856c252
feat: add sqlcommenter comment to mysql2 queries (#1523)
raphael-theriault-swi Jun 22, 2023
9977de7
fix(otlp-proto-exporter-base): add missing type import (#3937)
pichlermarc Jun 22, 2023
4514522
fix(ci): use npx to run lerna (#1546)
pichlermarc Jun 22, 2023
655e373
chore(deps): update dependency semver to v7.5.3 (#3942)
renovate-bot Jun 23, 2023
32fde65
chore: Update component owners for the Document Load web instrumentat…
martinkuba Jun 23, 2023
a30952c
chore(deps): update dependency nightwatch to v3 (#3950)
renovate-bot Jun 26, 2023
4dc8416
fix(exporter-logs-otlp-http): update tsconfigs (#3936)
pichlermarc Jun 26, 2023
15ede47
fix(example-opencensus-shim): avoid OpenCensus auto instrumentations …
llc1123 Jun 26, 2023
10c3e93
fix(selenium-tests): restore tests to functional state (#3923)
pichlermarc Jun 27, 2023
65f612e
feat(minification): Add importHelpers and tslib as a dependency (#1545)
MSNev Jun 27, 2023
de17f77
feat(aws-ecs): add cloud resource attributes for fargate (#1543)
davidweterings Jun 27, 2023
f7c4324
feat(opentelemetry-instrumentation-aws-sdk): add missing spec-defined…
carolabadeer Jun 27, 2023
8499b16
fix(connect): Skip update HTTP's span name and update RpcMetadata's r…
chigia001 Jun 28, 2023
7c7294c
feat(opentelemetry-instrumentation-document-load): Add access to perf…
pkanal Jun 28, 2023
8777cbd
feat(lambda): add OTEL_LAMBDA_DISABLE_AWS_CONTEXT_PROPAGATION environ…
dyladan Jun 28, 2023
e2e291c
fix(sdk-metrics): preserve startTime for cumulative ExponentialHistog…
aabmass Jun 29, 2023
b3d57bb
chore(deps): update lerna monorepo to v7.1.1 (#3956)
renovate-bot Jun 29, 2023
bb8a4f7
fix(http-intrumentation): prevent request socket null from throwing u…
aodysseos Jun 29, 2023
070b685
LowMemory metrics temporality preference (#3915)
martinkuba Jun 30, 2023
1ce8a89
Update the Prometheus Exporter to by Default not Append Timestamp (#3…
JacksonWeber Jul 3, 2023
de5cd0f
fix(deps): update dependency import-in-the-middle to v1.4.1 (#3962)
renovate-bot Jul 3, 2023
c51c9eb
docs(otlp-exporters): update docs to reflect OTLP 0.20.0 is used (#3938)
pichlermarc Jul 4, 2023
05c4e9e
feat(mongodb): support v5 (#1451)
GuillaumeDeconinck Jul 4, 2023
dccd906
chore(instrumentation-grpc): cleanup remnants of grpc-native support …
llc1123 Jul 4, 2023
ea160d9
fix: add secureConnectionStart to https only (#3879)
Abinet18 Jul 5, 2023
784a422
fix(instrumentation-fastify): fix fastify typescript compilation issu…
pichlermarc Jul 5, 2023
a675ae8
chore(deps): update all patch versions to v7.22.6 (#3965)
renovate-bot Jul 5, 2023
a18b074
docs: document merge reqiurements (#1553)
pichlermarc Jul 6, 2023
06e919d
chore: prepare release 1.15 / 0.41 (#3963)
pichlermarc Jul 6, 2023
02c1d95
chore: replace istanbul-instrumenter-loader with maintained component…
pichlermarc Jul 6, 2023
b34c39b
chore(deps): update dependency eslint to v8.43.0 (#3929)
pichlermarc Jul 6, 2023
68039c5
chore(deps): update dependency eslint to v8.44.0 (#3916)
renovate-bot Jul 6, 2023
cab31aa
chore(deps): update all patch versions (#3972)
renovate-bot Jul 7, 2023
6d13eb4
chore(deps): update dependency semver to v7.5.4 (#3977)
renovate-bot Jul 10, 2023
fc28665
docs(sdk-metrics): add example of exponential histogram metric (#3855)
JamieDanielson Jul 10, 2023
552abc8
feat(sdk-node): logs support added (#3969)
psk001 Jul 10, 2023
013695d
docs(api-logs): add disclaimers (#3979)
pichlermarc Jul 11, 2023
774d254
fix(document-load): compatibility issue with @opentelemetry/sdk-trace…
chigia001 Jul 11, 2023
f560426
[AutoMerge] ## Merging otel-js @ [013695d...](https://github.com/open…
opentelemetrybot Jul 11, 2023
bda2f34
[AutoMerge] ## Merging otel-js-contrib @ [774d254...](https://github.…
opentelemetrybot Jul 11, 2023
939d2d7
[AutoMerge] Identifying and fixing merge issues from staged repos
opentelemetrybot Jul 11, 2023
8e2f518
feat(express): Skip update HTTP's span name and update RpcMetadata's …
chigia001 Jul 11, 2023
9f0807d
Merge pull request #139 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Jul 11, 2023
ffb45fe
chore(renovate): split patch and minor rules (#1572)
haddasbronfman Jul 12, 2023
84a2377
fix(deps): update otel core experimental to ^0.41.0 (#1566)
nwalters512 Jul 12, 2023
273993b
chore: re-enable instrumentation-fastify unit test on node@18 (#1568)
chigia001 Jul 12, 2023
3139dbf
chore: update renovate.json (#1575)
Flarna Jul 12, 2023
bf25eb1
chore(renovate): change strategy for @opentelemetry/api, run experime…
pichlermarc Jul 12, 2023
8d9687d
feat(fastify): Skip update HTTP's span name and update RpcMetadata's …
chigia001 Jul 12, 2023
f81f8a7
chore: release main (#1539)
dyladan Jul 12, 2023
a3a577d
[AutoMerge] ## Merging otel-js-contrib @ [f81f8a7...](https://github.…
opentelemetrybot Jul 12, 2023
b92f6de
Merge pull request #140 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Jul 12, 2023
5352cc7
chore: apply update-ts-configs (#3987)
legendecas Jul 13, 2023
65483a4
chore(deps): update all patch versions (#3984)
renovate-bot Jul 13, 2023
1195872
fix(aws-xray): align aws xray to use contrib-test-utils v0.34.0 (#1582)
haddasbronfman Jul 13, 2023
87f21ef
chore(deps): update dependency nock to v13.3.2 (#3994)
renovate-bot Jul 14, 2023
00f7404
fix(instrumentation-mysql2): sql-common should be a dependency (#1584)
raphael-theriault-swi Jul 15, 2023
ea86583
chore: upgrade [email protected] and re-enable test in node@18 for resource…
chigia001 Jul 15, 2023
6150def
chore(deps): update dependency semver to v7.5.4 (#1577)
renovate-bot Jul 15, 2023
432d89e
chore(restify): update restify version to 11.1.0 and re-enable unit t…
chigia001 Jul 16, 2023
b77c282
chore(deps): update dependency @types/node to v18.16.19 (#1585)
renovate-bot Jul 17, 2023
b5fc0c4
chore(deps): update dependency nock to v13.3.2 (#1592)
blumamir Jul 17, 2023
82267ab
feat(cucumber): add instrumentation for @cucumber/cucumber (#1252)
Ugzuzg Jul 18, 2023
c9a348b
[AutoMerge] ## Merging otel-js @ [87f21ef...](https://github.com/open…
opentelemetrybot Jul 19, 2023
0c148b9
[AutoMerge] ## Merging otel-js-contrib @ [82267ab...](https://github.…
opentelemetrybot Jul 19, 2023
0a6608b
[AutoMerge] Identifying and fixing merge issues from staged repos
opentelemetrybot Jul 19, 2023
96451c9
Merge pull request #142 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Jul 19, 2023
0f20b2a
Revert tslib #3914 (#4011)
dyladan Jul 21, 2023
9f71800
chore: prepare release 1.15.1/0.41.1 (#4016)
dyladan Jul 24, 2023
2b20565
fix: Add otel-api as dev dep for sandbox tests (#4020)
MSNev Jul 26, 2023
301cf94
[AutoMerge] ## Merging otel-js @ [2b20565...](https://github.com/open…
opentelemetrybot Jul 26, 2023
3a875dd
Merge pull request #144 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Jul 26, 2023
c021b10
fix(core): stop rounding to nearest int in hrTimeTo*seconds() functio…
aabmass Jul 31, 2023
0755a5c
fix(ci): don't collect coverage for eol tests (#4030)
pichlermarc Aug 1, 2023
1a7488e
chore(exporter-logs-otlp-http): commit missing generated changes to t…
aabmass Aug 1, 2023
87fff2e
fix(instrumentation-grpc): instrument @grpc/grpc-js Client methods (#…
pichlermarc Aug 1, 2023
4cffe5d
fix(sdk-metrics): ignore invalid metric values (#3988)
legendecas Aug 1, 2023
9a51b10
[AutoMerge] ## Merging otel-js @ [4cffe5d...](https://github.com/open…
opentelemetrybot Aug 1, 2023
6214ca5
[AutoMerge] Identifying and fixing merge issues from staged repos
opentelemetrybot Aug 1, 2023
b0275fe
Merge pull request #150 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Aug 1, 2023
db50d00
chore: update patch dependencies (#1595)
haddasbronfman Aug 2, 2023
a53f643
chore: bump typescripts to 4.4.4 to fix compile issue with @types/koa…
chigia001 Aug 2, 2023
3d6c7be
fix(fastify): readme option table format (#1619)
NurimOnsemiro Aug 2, 2023
b4cda7a
chore(deps): update all patch versions (#3997)
renovate-bot Aug 2, 2023
2a0d543
chore(deps): update dependency rimraf to v5 (#1608)
renovate-bot Aug 2, 2023
4dc98d3
chore(deps): update dependency mongoose to v6.11.3 [security] (#1601)
renovate-bot Aug 2, 2023
e5bca5f
fix: Revert "feat(minification): Add importHelpers and tslib as a dep…
dyladan Aug 2, 2023
5d204b4
chore(deps): update dependency @types/semver to v7.5.0 (#1621)
blumamir Aug 3, 2023
e242645
fix(renovate): change renovate patch schedule (#1603)
haddasbronfman Aug 3, 2023
5fd656b
docs(resources): Fixes detectResources deprecated typos (#4003)
HPaulson Aug 3, 2023
154b30b
chore(deps): update dependency prettier to v2.8.8 (#1622)
renovate-bot Aug 6, 2023
3732256
docs(README): clarify browser support (#4037)
pichlermarc Aug 7, 2023
a421318
fix(parseKeyPairsIntoRecord): allow equals in baggage value #3974 (#3…
krosenk729 Aug 7, 2023
ffe641c
chore(deps): update all patch versions (#4043)
renovate-bot Aug 8, 2023
48fb158
chore: prepare release 1.15.2/0.41.2 (#4036)
pichlermarc Aug 8, 2023
d3436bf
feat(sdk-metrics): implement MetricProducer specification (#4007)
aabmass Aug 10, 2023
a1243ee
chore: fix issue with nyc crashing (#1605)
chigia001 Aug 10, 2023
902229a
chore: update blumamir employee name in the README (#4052)
blumamir Aug 10, 2023
e3d7f60
chore(deps): update all patch versions (#1604)
renovate-bot Aug 10, 2023
3f2bfe8
fix(aws-sdk-instrumentation): Patch new smithy client and middleware …
carolabadeer Aug 10, 2023
f4df836
fix(knex): nested queries result in wrong span names (#1537)
nachogiljaldo Aug 10, 2023
ccf1efe
fix(redis-4): omit credentials from db.connection_string span attribu…
jarlefosen Aug 10, 2023
4f11245
fix(deps): update otel core experimental to v0.41.2 (#1628)
renovate-bot Aug 10, 2023
dd51d74
[AutoMerge] ## Merging otel-js @ [902229a...](https://github.com/open…
opentelemetrybot Aug 10, 2023
88db0fd
[AutoMerge] ## Merging otel-js-contrib @ [4f11245...](https://github.…
opentelemetrybot Aug 10, 2023
44bcf14
Merge pull request #152 from opentelemetrybot/opentelemetrybot/auto-m…
MSNev Aug 10, 2023
e648c12
[AutoMerge] staging @ [44bcf14...](https://github.com/open-telemetry/…
MSNev Aug 12, 2023
4306204
[AutoMerge] Merge Staged changes to main
MSNev Aug 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion auto-merge/contrib/.github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ components:
- blumamir
plugins/node/instrumentation-amqplib:
- blumamir
plugins/node/instrumentation-cucumber:
- Ugzuzg
plugins/node/instrumentation-dataloader:
- henrinormak
plugins/node/instrumentation-fs:
Expand Down Expand Up @@ -109,7 +111,8 @@ components:
plugins/node/opentelemetry-instrumentation-winston:
- seemk
plugins/web/opentelemetry-instrumentation-document-load:
- obecny
- pkanal
- martinkuba
plugins/web/opentelemetry-instrumentation-long-task:
- mhennoch
- t2t2
Expand Down
5 changes: 1 addition & 4 deletions auto-merge/contrib/.github/workflows/peer-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Install lerna
run: npm install -g [email protected]

- name: Install script dependencies
run: npm install

- name: Check API dependency semantics
run: lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
15 changes: 6 additions & 9 deletions auto-merge/contrib/.github/workflows/test-all-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ jobs:
fail-fast: false
matrix:
node: ["14", "16", "18"]
include:
- node: "18"
lerna-extra-args: >-
--ignore @opentelemetry/instrumentation-fastify
--ignore @opentelemetry/instrumentation-restify
--ignore @opentelemetry/resource-detector-alibaba-cloud
runs-on: ubuntu-latest
services:
mongo:
Expand Down Expand Up @@ -93,8 +87,9 @@ jobs:
MONGODB_PORT: 27017
MSSQL_PASSWORD: mssql_passw0rd
MYSQL_DATABASE: otel_mysql_database
MYSQL_HOST: localhost
MYSQL_HOST: 127.0.0.1
MYSQL_PASSWORD: secret
MYSQL_ROOT_PASSWORD: rootpw
MYSQL_PORT: 3306
MYSQL_USER: otel
OPENTELEMETRY_REDIS_HOST: localhost
Expand All @@ -118,6 +113,8 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Set MySQL variables
run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
- name: Cache Dependencies
uses: actions/cache@v3
with:
Expand All @@ -143,6 +140,6 @@ jobs:
- name: Install Root Dependencies
run: npm install --ignore-scripts
- name: Bootstrap Dependencies
run: lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
- name: Run test-all-versions
run: lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
run: npx lerna run test-all-versions ${{ inputs.lerna-args }} ${{ matrix.lerna-extra-args }} --stream --concurrency 1
22 changes: 13 additions & 9 deletions auto-merge/contrib/.github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ jobs:
matrix:
node: ["14", "16", "18"]
include:
- node: "18"
lerna-extra-args: >-
--ignore @opentelemetry/resource-detector-alibaba-cloud
--ignore @opentelemetry/instrumentation-fastify
--ignore @opentelemetry/instrumentation-restify
- node: 14
code-coverage: true
runs-on: ubuntu-latest
services:
memcached:
image: memcached:1.6.9-alpine
image: memcached:1.6.21-alpine
ports:
- 11211:11211
mongo:
Expand Down Expand Up @@ -101,8 +98,9 @@ jobs:
MONGODB_PORT: 27017
MSSQL_PASSWORD: mssql_passw0rd
MYSQL_DATABASE: otel_mysql_database
MYSQL_HOST: localhost
MYSQL_HOST: 127.0.0.1
MYSQL_PASSWORD: secret
MYSQL_ROOT_PASSWORD: rootpw
MYSQL_PORT: 3306
MYSQL_USER: otel
OPENTELEMETRY_MEMCACHED_HOST: localhost
Expand All @@ -123,6 +121,8 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Set MySQL variables
run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
- name: Cache Dependencies
uses: actions/cache@v3
with:
Expand All @@ -149,12 +149,16 @@ jobs:
run: npm install --ignore-scripts
- name: Bootstrap Dependencies
run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
- name: Unit tests
- name: Unit tests (Full)
if: matrix.code-coverage
run: npm run test -- ${{ matrix.lerna-extra-args }}
- name: Unit tests (Delta)
if: ${{ !matrix.code-coverage }}
run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
- name: Build examples
run: npm run compile:examples
- name: Report Coverage
if: matrix.node == '14'
if: ${{ matrix.code-coverage && !cancelled()}}
uses: codecov/codecov-action@v3
with:
verbose: true
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.7","detectors/node/opentelemetry-resource-detector-aws":"1.2.5","detectors/node/opentelemetry-resource-detector-container":"0.2.5","detectors/node/opentelemetry-resource-detector-gcp":"0.28.3","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.4","metapackages/auto-instrumentations-node":"0.37.1","metapackages/auto-instrumentations-web":"0.32.3","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.5","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-test-utils":"0.33.4","plugins/node/instrumentation-amqplib":"0.32.5","plugins/node/instrumentation-dataloader":"0.4.3","plugins/node/instrumentation-fs":"0.7.4","plugins/node/instrumentation-lru-memoizer":"0.32.4","plugins/node/instrumentation-mongoose":"0.32.4","plugins/node/instrumentation-socket.io":"0.33.4","plugins/node/instrumentation-tedious":"0.5.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.3","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.4","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.4","plugins/node/opentelemetry-instrumentation-connect":"0.31.4","plugins/node/opentelemetry-instrumentation-dns":"0.31.5","plugins/node/opentelemetry-instrumentation-express":"0.32.4","plugins/node/opentelemetry-instrumentation-fastify":"0.31.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.4","plugins/node/opentelemetry-instrumentation-graphql":"0.34.3","plugins/node/opentelemetry-instrumentation-hapi":"0.31.4","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.3","plugins/node/opentelemetry-instrumentation-knex":"0.31.4","plugins/node/opentelemetry-instrumentation-koa":"0.34.6","plugins/node/opentelemetry-instrumentation-memcached":"0.31.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.35.0","plugins/node/opentelemetry-instrumentation-mysql":"0.33.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.5","plugins/node/opentelemetry-instrumentation-net":"0.31.4","plugins/node/opentelemetry-instrumentation-pg":"0.35.3","plugins/node/opentelemetry-instrumentation-pino":"0.33.4","plugins/node/opentelemetry-instrumentation-redis":"0.34.7","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.6","plugins/node/opentelemetry-instrumentation-restify":"0.32.4","plugins/node/opentelemetry-instrumentation-router":"0.32.4","plugins/node/opentelemetry-instrumentation-winston":"0.31.4","plugins/web/opentelemetry-instrumentation-document-load":"0.32.3","plugins/web/opentelemetry-instrumentation-long-task":"0.32.5","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.4","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.0","detectors/node/opentelemetry-resource-detector-aws":"1.3.0","detectors/node/opentelemetry-resource-detector-container":"0.3.0","detectors/node/opentelemetry-resource-detector-gcp":"0.29.0","detectors/node/opentelemetry-resource-detector-github":"0.28.0","detectors/node/opentelemetry-resource-detector-instana":"0.5.0","metapackages/auto-instrumentations-node":"0.38.0","metapackages/auto-instrumentations-web":"0.33.0","packages/opentelemetry-host-metrics":"0.33.0","packages/opentelemetry-id-generator-aws-xray":"1.2.0","packages/opentelemetry-propagation-utils":"0.30.0","packages/opentelemetry-redis-common":"0.36.0","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.0","plugins/node/instrumentation-amqplib":"0.33.0","plugins/node/instrumentation-cucumber":"0.0.1","plugins/node/instrumentation-dataloader":"0.5.0","plugins/node/instrumentation-fs":"0.8.0","plugins/node/instrumentation-lru-memoizer":"0.33.0","plugins/node/instrumentation-mongoose":"0.33.0","plugins/node/instrumentation-socket.io":"0.34.0","plugins/node/instrumentation-tedious":"0.6.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.36.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.35.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.0","plugins/node/opentelemetry-instrumentation-dns":"0.32.0","plugins/node/opentelemetry-instrumentation-express":"0.33.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.0","plugins/node/opentelemetry-instrumentation-graphql":"0.35.0","plugins/node/opentelemetry-instrumentation-hapi":"0.32.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.0","plugins/node/opentelemetry-instrumentation-koa":"0.35.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.0","plugins/node/opentelemetry-instrumentation-net":"0.32.0","plugins/node/opentelemetry-instrumentation-pg":"0.36.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.0","plugins/node/opentelemetry-instrumentation-redis":"0.35.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.0","plugins/node/opentelemetry-instrumentation-restify":"0.33.0","plugins/node/opentelemetry-instrumentation-router":"0.33.0","plugins/node/opentelemetry-instrumentation-winston":"0.32.0","plugins/web/opentelemetry-instrumentation-document-load":"0.33.0","plugins/web/opentelemetry-instrumentation-long-task":"0.33.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.0","plugins/web/opentelemetry-plugin-react-load":"0.29.0","propagators/opentelemetry-propagator-aws-xray":"1.3.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.0","propagators/opentelemetry-propagator-instana":"0.3.0","propagators/opentelemetry-propagator-ot-trace":"0.27.0"}
34 changes: 30 additions & 4 deletions auto-merge/contrib/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ The `opentelemetry-js-contrib` project is written in TypeScript.
- `npm test` tests code the same way that our CI will test it.
- `npm run lint:fix` lint (and maybe fix) any changes.

### Generating API documentation

- `npm run docs` to generate API documentation. Generates the documentation in `packages/opentelemetry-api/docs/out`

### Generating CHANGELOG documentation

- `npm run changelog` to generate CHANGELOG documentation in your terminal (see [RELEASING.md](RELEASING.md) for more details).
Expand All @@ -117,6 +113,9 @@ A component may be **unreleased**, **experimental**, **beta**, **stable**, **unm
With the exception of the stable status, it is up to each individual [component owner](#component-ownership) to determine the status of a component.
A component may only be marked stable with the approval of a member of @open-telemetry/javascript-maintainers; see the definition of stable below for more details.

A Pull Request modifying components in any stage of the lifecycle is subject to the
[Pull Request Merge Requirements](#pull-request-merge-requirements).

### Unreleased

Unreleased components are in active development and have not yet been released to NPM.
Expand Down Expand Up @@ -162,6 +161,33 @@ They may not work and there are no guarantees for fixes or new features.
Their source files may be deleted from the repository.
Any packages released from their source will be marked as deprecated in NPM.

## Pull Request Merge Requirements

Pull requests MAY be merged by an approver OR a maintainer provided they meet all the following requirements:

- Approved by
- at least one component owner if one is defined in [.github/component_owners.yml](.github/component_owners.yml)
- OR one maintainer
- OR at least one approver who is not the approver merging the pull request
- A pull request for small (simple typo, URL, update docs, or grammatical fix) changes may be approved and merged by the same approver
- No “changes requested” reviews or unresolved conversations by
- approvers
- maintainers
- technical committee members
- component owners
- subject-matter experts
- New or changed functionality is tested by unit tests
- New or changed functionality is documented if appropriate
- Substantial changes should not be merged within 24 hours of opening in order to allow reviewers from all time zones to have a chance to review

All requirements are at the discretion of the maintainers.
Maintainers MAY merge pull requests which have not strictly met these requirements.
Maintainers MAY close, block, or put on hold pull requests even if they have strictly met these requirements.

If a PR has not been interacted with by a reviewer within one week, please ping the component
owners as listed in [.github/component_owners.yml](.github/component_owners.yml), if component owners are unresponsive
please ping ([@open-telemetry/javascript-approvers](https://github.com/orgs/open-telemetry/teams/javascript-approvers)).

## Contributing Vendor Components

This repo is generally meant for hosting components that work with popular open-source frameworks and tools. However, it is also possible to contribute components specific to a 3rd party vendor in this repo.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4

## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.7...resource-detector-alibaba-cloud-v0.28.0) (2023-07-12)


### Features

* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0

## [0.27.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.5...resource-detector-alibaba-cloud-v0.27.6) (2023-05-16)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.27.7",
"version": "0.28.0",
"description": "OpenTelemetry resource detector for Alibaba Cloud",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -43,14 +43,14 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.33.4",
"@opentelemetry/contrib-test-utils": "^0.34.0",
"@types/mocha": "8.2.3",
"@types/node": "18.11.7",
"@types/sinon": "10.0.2",
"@types/node": "18.16.19",
"@types/sinon": "10.0.16",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.3.2",
"nyc": "15.1.0",
"rimraf": "5.0.0",
"rimraf": "5.0.1",
"sinon": "15.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4

## [1.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.5...resource-detector-aws-v1.3.0) (2023-07-12)


### Features

* **aws-ecs:** add cloud resource attributes for fargate ([#1543](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1543)) ([de17f77](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/de17f77bd7f75fc2fc8a92d35dfcfbf749b50f71))
* **minification:** Add importHelpers and tslib as a dependency ([#1545](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1545)) ([65f612e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/65f612e35c4d67b9935dc3a9155588b35d915482))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.4 to ^0.34.0

## [1.2.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.2.3...resource-detector-aws-v1.2.4) (2023-05-16)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-aws",
"version": "1.2.5",
"version": "1.3.0",
"description": "OpenTelemetry SDK resource detector for AWS",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -42,14 +42,14 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.33.4",
"@opentelemetry/contrib-test-utils": "^0.34.0",
"@types/mocha": "8.2.3",
"@types/node": "18.11.7",
"@types/sinon": "10.0.2",
"@types/node": "18.16.19",
"@types/sinon": "10.0.16",
"mocha": "7.2.0",
"nock": "12.0.3",
"nock": "13.3.2",
"nyc": "15.1.0",
"rimraf": "5.0.0",
"rimraf": "5.0.1",
"sinon": "15.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Loading
Loading