Skip to content
Closed
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
8 changes: 4 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
- [ ] CircleCI [jobs/workflows][4].
- [ ] Plugin is [exported][5].

[1]: https://github.com/DataDog/dd-trace-js/blob/master/index.d.ts
[2]: https://github.com/DataDog/dd-trace-js/blob/master/docs/test.ts
[1]: https://github.com/DataDog/dd-trace-js/blob/main/index.d.ts
[2]: https://github.com/DataDog/dd-trace-js/blob/main/docs/test.ts
[3]: https://github.com/DataDog/documentation/blob/master/content/en/tracing/trace_collection/library_config/nodejs.md
[4]: https://github.com/DataDog/dd-trace-js/blob/master/.circleci/config.yml
[5]: https://github.com/DataDog/dd-trace-js/blob/master/packages/dd-trace/src/plugins/index.js
[4]: https://github.com/DataDog/dd-trace-js/blob/main/.circleci/config.yml
[5]: https://github.com/DataDog/dd-trace-js/blob/main/packages/dd-trace/src/plugins/index.js

### Additional Notes
<!-- Anything else we should know when reviewing? -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Actionlint
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/all-green.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- master
- main
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/appsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: AppSec
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-visibility-performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master]
branches: [ main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Core
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Datadog Static Analysis
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debugger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Debugger
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/instrumentations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Instrumentations
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lambda
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/llmobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: LLMObs
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Plugins
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request_target:
types: [opened, labeled, unlabeled, synchronize]
branches:
- 'master'
- 'main'
jobs:
label:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-release-proposal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

- name: Pull master branch
- name: Pull main branch
run: |
git checkout master
git checkout main
git pull
cp -r scripts _scripts
git checkout ${{ matrix.base-branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/profiling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Profiling
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Project
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/serverless-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Serverless Integration Test
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: System Tests
on:
pull_request:
push:
branches: [master]
branches: [main]
workflow_dispatch: {}
schedule:
- cron: 0 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tracing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tracing
on:
pull_request:
push:
branches: [master]
branches: [main]
schedule:
- cron: 0 4 * * *
- cron: 20 4 * * *
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/macrobenchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.macrobenchmarks:
stage: macrobenchmarks
rules:
- if: ($NIGHTLY_BENCHMARKS || $CI_PIPELINE_SOURCE != "schedule") && $CI_COMMIT_REF_NAME == "master"
- if: ($NIGHTLY_BENCHMARKS || $CI_PIPELINE_SOURCE != "schedule") && $CI_COMMIT_REF_NAME == "main"
when: always
- when: manual
tags: ["runner:apm-k8s-same-cpu"]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# `dd-trace`: Node.js APM Tracer Library

[![npm v5](https://img.shields.io/npm/v/dd-trace/latest?color=blue&label=dd-trace%40v5&logo=npm)](https://www.npmjs.com/package/dd-trace)
[![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/master/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)
[![codecov](https://codecov.io/gh/DataDog/dd-trace-js/branch/main/graph/badge.svg)](https://codecov.io/gh/DataDog/dd-trace-js)

<img align="right" src="https://user-images.githubusercontent.com/551402/208212084-1d0c07e2-4135-4c61-b2da-8f2fddbc66ed.png" alt="Bits the dog JavaScript" width="200px"/>

Expand Down Expand Up @@ -66,7 +66,7 @@ Changes associated with each individual release are documented on the [GitHub Re

## Development and Contribution

Please read the [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/master/CONTRIBUTING.md) document before contributing to this open source project.
Please read the [CONTRIBUTING.md](https://github.com/DataDog/dd-trace-js/blob/main/CONTRIBUTING.md) document before contributing to this open source project.


## EcmaScript Modules (ESM) Support
Expand Down Expand Up @@ -101,7 +101,7 @@ If you would like to trace your bundled application then please read this page o

## Security Vulnerabilities

Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/master/SECURITY.md) document if you have found a security issue.
Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/main/SECURITY.md) document if you have found a security issue.


## Datadog With OpenTelemetery
Expand Down
2 changes: 1 addition & 1 deletion benchmark/sirun/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The version of this file in master is used across all PRs regardless of upstream branch
# The version of this file in main is used across all PRs regardless of upstream branch
FROM --platform=linux/amd64 ubuntu:22.04

RUN apt-get update && apt-get install --no-install-recommends -y \
Expand Down
10 changes: 5 additions & 5 deletions benchmark/sirun/diff-recent.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function getReadmes () {
return readmes
}

function diff (beforeSummary, afterSummary, prev = 'master', curr = 'this commit') {
function diff (beforeSummary, afterSummary, prev = 'main', curr = 'this commit') {
const diffTree = walk(afterSummary, beforeSummary)
const html = fs.readFileSync(path.join(__dirname, 'diff.html'), 'utf8')
.replace('REPLACE_ME_DIFF_DATA', JSON.stringify(diffTree, null, 2))
Expand All @@ -56,27 +56,27 @@ function latestVersionResults (jsonStr) {
}

const main = async () => {
const prev = execSync('git rev-parse master').toString().trim()
const prev = execSync('git rev-parse main').toString().trim()
const builds = await getBuildNumsFromGithub(prev)
const buildId = Object.keys(builds).find(n => n.includes('sirun-all'))
if (!buildId) {
console.error('No `sirun-all` build found on master.')
console.error('No `sirun-all` build found on main.')
return
}
const build = builds[buildId]

const artifacts = JSON.parse(await get(artifactsUrl(build), circleHeaders))
const artifact = artifacts.find(a => a.path.endsWith('summary.json'))
if (!artifact) {
console.error('summary.json artifact not found on master')
console.error('summary.json artifact not found on main')
console.error('artifacts', JSON.stringify(artifacts, null, 2))
return
}
const prevSummary = latestVersionResults(await get(artifact.url, circleHeaders))
const currentSummary = latestVersionResults(fs.readFileSync('/tmp/artifacts/summary.json'))

const thisCommit = execSync('git rev-parse HEAD').toString().trim()
const { diffTree, html } = diff(prevSummary, currentSummary, 'master', thisCommit)
const { diffTree, html } = diff(prevSummary, currentSummary, 'main', thisCommit)

console.log(JSON.stringify(diffTree, null, 2))

Expand Down
2 changes: 1 addition & 1 deletion benchmark/sirun/runall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function cleanup {

trap cleanup EXIT

# Temporary until merged to master
# Temporary until merged to main
wget -O sirun.tar.gz https://github.com/DataDog/sirun/releases/download/v0.1.10/sirun-v0.1.10-x86_64-unknown-linux-musl.tar.gz \
&& tar -xzf sirun.tar.gz \
&& rm sirun.tar.gz \
Expand Down
Loading
Loading