Skip to content

Commit

Permalink
Merge branch 'main' into spec-http-port-4318
Browse files Browse the repository at this point in the history
  • Loading branch information
rauno56 committed Nov 5, 2021
2 parents 4330faf + 3d4a07f commit 2130d88
Show file tree
Hide file tree
Showing 410 changed files with 12,002 additions and 1,921 deletions.
52 changes: 52 additions & 0 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Keep all in alphabetical order
components:
detectors/node/opentelemetry-resource-detector-alibaba-cloud:
- legendecas
detectors/node/opentelemetry-resource-detector-aws:
- NathanielRN
- willarmiros
metapackages/auto-instrumentations-node:
- obecny
metapackages/auto-instrumentations-web:
- obecny
packages/opentelemetry-host-metrics:
- obecny
packages/opentelemetry-id-generator-aws-xray:
- NathanielRN
- willarmiros
plugins/node/opentelemetry-instrumentation-aws-lambda:
- NathanielRN
- willarmiros
plugins/node/opentelemetry-instrumentation-aws-sdk:
- NathanielRN
- willarmiros
- blumamir
plugins/node/opentelemetry-instrumentation-generic-pool:
- rauno56
plugins/node/opentelemetry-instrumentation-graphql:
- obecny
plugins/node/opentelemetry-instrumentation-ioredis:
- blumamir
- naseemkullah
plugins/node/opentelemetry-instrumentation-knex:
- rauno56
plugins/node/opentelemetry-instrumentation-memcached:
- rauno56
plugins/node/opentelemetry-instrumentation-nestjs-core:
- rauno56
plugins/node/opentelemetry-instrumentation-redis:
- blumamir
plugins/node/opentelemetry-instrumentation-restify:
- rauno56
plugins/node/opentelemetry-instrumentation-router:
- rauno56
plugins/web/opentelemetry-instrumentation-document-load:
- obecny
plugins/web/opentelemetry-instrumentation-user-interaction:
- obecny
propagators/opentelemetry-propagator-aws-xray:
- NathanielRN
- willarmiros

ignored-authors:
- renovate-bot
21 changes: 21 additions & 0 deletions .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '30 6 * * 1'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
with:
days-before-stale: 60
days-before-close: 14
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
close-issue-message: 'This issue was closed because it has been stale for 14 days with no activity.'
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
close-pr-message: 'This PR was closed because it has been stale for 14 days with no activity.'
stale-issue-label: stale
stale-pr-label: stale
exempt-issue-labels: never-stale,instrumentation-request
exempt-pr-labels: never-stale
13 changes: 13 additions & 0 deletions .github/workflows/component-owners.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 'Component Owners'
on:
pull_request_target:

jobs:
run_self:
runs-on: ubuntu-latest
name: Auto Assign Owners
steps:
- uses: dyladan/component-owners@main
with:
config-file: .github/component_owners.yml
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
run: |
npm install --only=dev --ignore-scripts
npx lerna bootstrap --no-ci --ignore-scripts -- --only=dev
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='gts' --ignore-scripts -- --only=dev
- name: Lint
run: npm run lint
2 changes: 1 addition & 1 deletion .github/workflows/peer-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Install lerna
run: npm install -g lerna

Expand Down
106 changes: 0 additions & 106 deletions .github/workflows/publish.yml

This file was deleted.

60 changes: 60 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
on:
push:
branches:
- main

name: Run Release Please
jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v2
id: release
with:
command: manifest
token: ${{secrets.RELEASE_PR_TOKEN}}
default-branch: main

# The logic below handles the npm publication:
- name: Checkout Repository
if: ${{ steps.release.outputs.releases_created }}
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v1
if: ${{ steps.release.outputs.releases_created }}
with:
node-version: 14
registry-url: 'https://registry.npmjs.org'

- name: Cache Dependencies
if: ${{ steps.release.outputs.releases_created }}
uses: actions/cache@v2
with:
path: |
node_modules
package-lock.json
detectors/node/*/node_modules
metapackages/*/node_modules
packages/*/node_modules
plugins/node/*/node_modules
plugins/web/*/node_modules
propagators/*/node_modules
key: release-${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}

- name: Build Packages
if: ${{ steps.release.outputs.releases_created }}
run: |
npm install
npx lerna bootstrap --no-ci
# Release Please has already incremented versions and published tags, so we just
# need to publish all unpublished versions to NPM here
# See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package
- name: Publish to NPM
if: ${{ steps.release.outputs.releases_created }}
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes
63 changes: 0 additions & 63 deletions .github/workflows/release-pr.yml

This file was deleted.

17 changes: 13 additions & 4 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ jobs:
fail-fast: false
matrix:
container: ["node:8", "node:10", "node:12", "node:14", "node:16"]
include:
- container: "node:8"
lerna-extra-args: >-
--ignore @opentelemetry/instrumentation-aws-sdk
runs-on: ubuntu-latest
container:
image: ${{ matrix.container }}
Expand Down Expand Up @@ -103,17 +107,22 @@ jobs:
plugins/web/*/node_modules
propagators/*/node_modules
key: ${{ runner.os }}-${{ matrix.container }}-${{ hashFiles('**/package.json') }}
- name: Legacy Peer Dependencies for npm 7
if: matrix.container == 'node:16'
run: npm config set legacy-peer-deps=true
- name: Install Root Dependencies
run: npm install --ignore-scripts
- name: Fix npm cache permissions
run: chown -R 1001:121 "/github/home/.npm"
run: |
chown -R 1001:121 "/github/home/.npm"
[ -e /__w/opentelemetry-js-contrib/opentelemetry-js-contrib/package-lock.json ] && chown 1001:121 /__w/opentelemetry-js-contrib/opentelemetry-js-contrib/package-lock.json
- name: Bootstrap Dependencies
run: npx lerna bootstrap --no-ci
run: npx lerna bootstrap --no-ci --hoist --nohoist='zone.js' --nohoist='mocha' --nohoist='ts-mocha'
- name: Unit tests
run: npm run test
run: npm run test:ci:changed -- ${{ matrix.lerna-extra-args }}
- name: Report Coverage
if: matrix.container == 'node:14'
run: npm run codecov
run: npm run codecov:ci:changed
browser-tests:
runs-on: ubuntu-latest
container:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ package.json.lerna_backup

*.iml
.idea

# version.ts file is automatically generated at compile time
version.ts
1 change: 1 addition & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.0","detectors/node/opentelemetry-resource-detector-aws":"1.0.1","detectors/node/opentelemetry-resource-detector-gcp":"0.26.0","detectors/node/opentelemetry-resource-detector-github":"0.26.0","metapackages/auto-instrumentations-node":"0.26.0","metapackages/auto-instrumentations-web":"0.26.0","packages/opentelemetry-browser-extension-autoinjection":"0.26.0","packages/opentelemetry-host-metrics":"0.26.0","packages/opentelemetry-id-generator-aws-xray":"1.0.0","packages/opentelemetry-test-utils":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.27.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.1.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.26.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.26.0","plugins/node/opentelemetry-instrumentation-connect":"0.26.0","plugins/node/opentelemetry-instrumentation-dns":"0.26.0","plugins/node/opentelemetry-instrumentation-express":"0.26.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.26.0","plugins/node/opentelemetry-instrumentation-graphql":"0.26.0","plugins/node/opentelemetry-instrumentation-hapi":"0.26.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.26.0","plugins/node/opentelemetry-instrumentation-knex":"0.26.0","plugins/node/opentelemetry-instrumentation-koa":"0.26.0","plugins/node/opentelemetry-instrumentation-memcached":"0.26.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql":"0.26.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.26.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.26.0","plugins/node/opentelemetry-instrumentation-net":"0.26.0","plugins/node/opentelemetry-instrumentation-pg":"0.26.0","plugins/node/opentelemetry-instrumentation-pino":"0.26.0","plugins/node/opentelemetry-instrumentation-redis":"0.26.0","plugins/node/opentelemetry-instrumentation-restify":"0.26.0","plugins/node/opentelemetry-instrumentation-router":"0.26.0","plugins/node/opentelemetry-instrumentation-winston":"0.26.0","plugins/web/opentelemetry-instrumentation-document-load":"0.26.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.26.0","plugins/web/opentelemetry-plugin-react-load":"0.26.0","propagators/opentelemetry-propagator-aws-xray":"1.0.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.0","propagators/opentelemetry-propagator-ot-trace":"0.25.0"}

0 comments on commit 2130d88

Please sign in to comment.