Skip to content

Commit

Permalink
Merge branch 'main' into dataloader-custom-methods
Browse files Browse the repository at this point in the history
  • Loading branch information
onurtemizkan authored Nov 12, 2024
2 parents 9b675f6 + 5eb61d8 commit 1554621
Show file tree
Hide file tree
Showing 124 changed files with 3,367 additions and 3,417 deletions.
21 changes: 11 additions & 10 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
components:
detectors/node/opentelemetry-resource-detector-alibaba-cloud:
- legendecas
detectors/node/opentelemetry-resource-detector-aws: []
# Unmaintained
detectors/node/opentelemetry-resource-detector-aws:
- jj22ee
detectors/node/opentelemetry-resource-detector-azure:
- jacksonweber
- hectorhdzg
Expand All @@ -16,8 +16,8 @@ components:
# Unmaintained
detectors/node/opentelemetry-resource-detector-instana:
- kirrg001
incubator/opentelemetry-sampler-aws-xray: []
# Unmaintained
incubator/opentelemetry-sampler-aws-xray:
- jj22ee
metapackages/auto-configuration-propagators:
- pichlermarc
metapackages/auto-instrumentations-node:
Expand All @@ -35,8 +35,8 @@ components:
- jamiedanielson
packages/opentelemetry-host-metrics:
- legendecas
packages/opentelemetry-id-generator-aws-xray: []
# Unmaintained
packages/opentelemetry-id-generator-aws-xray:
- jj22ee
packages/opentelemetry-propagation-utils:
- dyladan
- pichlermarc
Expand Down Expand Up @@ -69,10 +69,11 @@ components:
- mottibec
plugins/node/instrumentation-tedious: []
# Unmaintained
plugins/node/opentelemetry-instrumentation-aws-lambda: []
# Unmaintained
plugins/node/opentelemetry-instrumentation-aws-lambda:
- jj22ee
plugins/node/opentelemetry-instrumentation-aws-sdk:
- blumamir
- jj22ee
plugins/node/opentelemetry-instrumentation-bunyan:
- seemk
- trentm
Expand Down Expand Up @@ -145,8 +146,8 @@ components:
- kirrg001
propagators/opentelemetry-propagator-ot-trace: []
# Unmaintained
propagators/propagator-aws-xray: [ ]
# Unmaintained
propagators/propagator-aws-xray:
- jj22ee
propagators/propagator-aws-xray-lambda: [ ]
# Unmaintained

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
with:
fetch-depth: 0

# If you update this version make sure to keep in sync:
# - `build-and-cache` job of unit-test workflow
# - `build-and-cache` job of test-all-versions workflow
- name: Setup Node
uses: actions/setup-node@v4
with:
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/test-all-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,36 @@ on:
type: string

jobs:
build-and-cache:
strategy:
fail-fast: false
runs-on: ubuntu-latest
env:
NPM_CONFIG_UNSAFE_PERM: true
NODE_OPTIONS: --max-old-space-size=4096
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
# Use the same Node.js version used for `release-please` workflow.
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Install
run: npm ci
- name: Build
run: npm run compile
- name: Upload Build Artifacts
uses: actions/upload-artifact@v4
with:
name: tav-build-cache-${{ github.run_number }}
path: node_modules/.cache/nx
retention-days: 1

tav:
name: Run test-all-versions
needs: build-and-cache
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -120,6 +148,11 @@ jobs:
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
- name: Install
run: npm ci
- name: Download Build Artifacts
uses: actions/download-artifact@v4
with:
name: tav-build-cache-${{ github.run_number }}
path: node_modules/.cache/nx
- name: Build
run: npm run compile
- name: Run test-all-versions
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,35 @@ on:
pull_request:

jobs:
build-and-cache:
strategy:
fail-fast: false
runs-on: ubuntu-latest
env:
NPM_CONFIG_UNSAFE_PERM: true
NODE_OPTIONS: --max-old-space-size=4096
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
# Use the same Node.js version used for `release-please` workflow.
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Install
run: npm ci
- name: Build
run: npm run compile
- name: Upload build artifact
uses: actions/upload-artifact@v4
with:
name: tests-build-cache-${{ github.run_number }}
path: node_modules/.cache/nx
retention-days: 1

unit-test:
needs: build-and-cache
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -128,6 +156,11 @@ jobs:
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
- name: Install
run: npm ci
- name: Download Build Artifacts
uses: actions/download-artifact@v4
with:
name: tests-build-cache-${{ github.run_number }}
path: node_modules/.cache/nx
- name: Build
run: npm run compile
- name: Unit tests (Full)
Expand All @@ -145,6 +178,7 @@ jobs:
verbose: true

browser-test:
needs: build-and-cache
strategy:
fail-fast: false
matrix:
Expand All @@ -166,6 +200,11 @@ jobs:
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
- name: Install
run: npm ci
- name: Download Build Artifacts
uses: actions/download-artifact@v4
with:
name: tests-build-cache-${{ github.run_number }}
path: node_modules/.cache/nx
- name: Build
run: npm run compile
- name: Unit tests
Expand Down
14 changes: 7 additions & 7 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
"metapackages/auto-configuration-propagators": "0.3.1",
"metapackages/auto-instrumentations-node": "0.52.0",
"metapackages/auto-instrumentations-node": "0.52.1",
"metapackages/auto-instrumentations-web": "0.42.0",
"packages/baggage-span-processor": "0.3.1",
"packages/opentelemetry-host-metrics": "0.35.4",
Expand All @@ -24,12 +24,12 @@
"plugins/node/instrumentation-kafkajs": "0.4.0",
"plugins/node/instrumentation-lru-memoizer": "0.41.0",
"plugins/node/instrumentation-mongoose": "0.43.0",
"plugins/node/instrumentation-runtime-node": "0.8.0",
"plugins/node/instrumentation-runtime-node": "0.9.0",
"plugins/node/instrumentation-socket.io": "0.43.0",
"plugins/node/instrumentation-tedious": "0.15.0",
"plugins/node/instrumentation-undici": "0.7.0",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.46.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.45.0",
"plugins/node/instrumentation-undici": "0.7.1",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.47.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.46.0",
"plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
"plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
"plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
Expand All @@ -45,10 +45,10 @@
"plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
"plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
"plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.1",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
"plugins/node/opentelemetry-instrumentation-net": "0.40.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.47.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.47.1",
"plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand Down
8 changes: 4 additions & 4 deletions detectors/node/opentelemetry-resource-detector-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
[![NPM Published Version][npm-img]][npm-url]
[![Apache License][license-image]][license-image]

[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): N/A
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @jj22ee

Resource detector for Amazon Web Services.

## Status

| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
|-------------------------------------------------------|-------------------------------------------------------|-----------------------|
| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+<br/>SDK 1.0+ |
| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
| ----------------------------------------- | ----------------------------------------------------- | --------------------- |
| [Stable](../../../CONTRIBUTING.md#stable) | @jj22ee | API 1.0+<br/>SDK 1.0+ |

## Installation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand Down Expand Up @@ -40,6 +39,8 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.42.0",
"@opentelemetry/instrumentation-fs": "^0.16.0",
"@opentelemetry/instrumentation-http": "^0.54.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-azure --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand All @@ -33,6 +32,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.42.0",
"@opentelemetry/instrumentation-http": "^0.54.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-container --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand All @@ -34,6 +33,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.42.0",
"@opentelemetry/instrumentation-fs": "^0.16.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-gcp --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand Down Expand Up @@ -40,6 +39,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.42.0",
"@opentelemetry/instrumentation-http": "^0.54.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-github --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-instana --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test": "nyc mocha 'test/**/*.test.ts'",
Expand Down
2 changes: 1 addition & 1 deletion incubator/opentelemetry-sampler-aws-xray/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> This component is still in development and has not been released as an npm package.
component owner: N/A
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @jj22ee

This module provides the remote/centralized sampler for AWS X-Ray.

Expand Down
4 changes: 2 additions & 2 deletions metapackages/auto-configuration-propagators/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ The specification defines a list of [known propagators][env-var-url] for the `OT
- "b3": [B3 Single](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3)
- "b3multi": [B3 Multi](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3)
- "jaeger": [Jaeger](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-jaeger)
- "xray": [AWS X-Ray (third party)](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/propagator-aws-xray)
- "xray-lambda": [AWS X-Ray Lambda (third party)](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/propagator-aws-xray-lambda)
- "xray": [AWS X-Ray (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray)
- "xray-lambda": [AWS X-Ray Lambda (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/propagator-aws-xray-lambda)
- "ottrace": [OT Trace (third party)](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/propagators/opentelemetry-propagator-ot-trace)

## Useful links
Expand Down
1 change: 0 additions & 1 deletion metapackages/auto-configuration-propagators/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"compile": "tsc -p .",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-configuration-propagators --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"tdd": "npm run test -- --watch-extensions ts --watch",
Expand Down
13 changes: 13 additions & 0 deletions metapackages/auto-instrumentations-node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [0.52.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.52.0...auto-instrumentations-node-v0.52.1) (2024-11-07)


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-aws-lambda bumped from ^0.46.0 to ^0.47.0
* @opentelemetry/instrumentation-aws-sdk bumped from ^0.45.0 to ^0.46.0
* @opentelemetry/instrumentation-mysql2 bumped from ^0.42.0 to ^0.42.1
* @opentelemetry/instrumentation-pg bumped from ^0.47.0 to ^0.47.1
* @opentelemetry/instrumentation-undici bumped from ^0.7.0 to ^0.7.1

## [0.52.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.51.0...auto-instrumentations-node-v0.52.0) (2024-10-25)


Expand Down
Loading

0 comments on commit 1554621

Please sign in to comment.