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

chore: upgrade 2.x to OTel 1.28.0 / 0.55.0 #987

Merged
merged 12 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 5 additions & 66 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
container: ['node:14.0.0']
container: ['node:14']
node_api_target: ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0']
include:
- container: 'node:16.0.0'
Expand All @@ -26,7 +26,7 @@ jobs:
container: ${{ matrix.container }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- name: Install npm dependencies
run: npm ci --ignore-scripts --no-optional
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
fail-fast: false
matrix:
container: ['node:14.0.0']
container: ['node:14']
node_api_target: ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0']
include:
- container: 'node:16.0.0'
Expand Down Expand Up @@ -70,10 +70,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2019, macos-12]
os: [windows-2019, macos-13]
node_api_target: ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0', '20.0.0', '21.2.0', '22.0.0']
include:
- os: macos-12
- os: macos-13
python_version: '3.11'
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -219,67 +219,6 @@ jobs:
name: splunk-otel-js-metadata.yaml
path: splunk-otel-js-metadata.yaml

centos-build-check:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
nodejs: [14]
include:
- container: 'centos:7'
- cmd: 'curl -sL https://rpm.nodesource.com/setup_${NODE_VERSION}.x | bash - && yum install -y nodejs gcc-c++ make'
name: CentOS build check - ${{ matrix.container }} - Node.js ${{ matrix.nodejs }}
container: ${{ matrix.container }}
env:
NODE_VERSION: ${{ matrix.nodejs }}
steps:
- name: Setup container
run: |
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=https://archive.kernel.org/centos-vault|g' /etc/yum.repos.d/CentOS-*
yum update -y
${{ matrix.cmd }}
- name: Checkout
uses: actions/checkout@v3
- name: Install npm dependencies
run: npm ci --ignore-scripts --no-optional
- name: Compile native
run: npm run prebuild:current
- name: Run tests
run: npm run test

centos-prebuild-check:
needs: [prebuilds-linux]
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
container: ['centos:7']
nodejs: [14, 16]
name: Centos check - ${{ matrix.container }} - Node.js ${{ matrix.nodejs }}
container: ${{ matrix.container }}
env:
NODE_VERSION: ${{ matrix.nodejs }}
steps:
- name: Setup container
run: |
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=https://archive.kernel.org/centos-vault|g' /etc/yum.repos.d/CentOS-*
yum update -y
curl -sL https://rpm.nodesource.com/setup_${NODE_VERSION}.x | bash - && yum install -y nodejs gcc-c++ make
- name: Checkout
uses: actions/checkout@v3
- name: Download
uses: actions/download-artifact@v3
- name: copy prebuilds
run: |
mkdir -p prebuilds
cp -r prebuilds-linux/* prebuilds
- name: Install npm dependencies
run: npm ci --ignore-scripts --no-optional --loglevel verbose
- name: Run tests
run: npm run test

e2e-local:
runs-on: ubuntu-latest
strategy:
Expand Down
Loading
Loading