-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into es-archive-dependency
Signed-off-by: Mahad Zaryab <[email protected]>
- Loading branch information
Showing
10 changed files
with
104 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,17 +46,36 @@ If you are new to GitHub's contribution workflow, we recommend the following set | |
* Go to the respective Jaeger repo on GitHub and create a fork using the button at the top. Select a destination org where you have write permissions (usually it is your personal "org"). | ||
* Clone the fork into your workspace. | ||
* (Recommended): register upstream repo as remote | ||
* After you clone your forked repo, `git remote -v` will show `origin`, e.g. `origin [email protected]:{username}/jaeger.git` | ||
* Add `upstream` remote: `git remote add upstream [email protected]:jaegertracing/jaeger.git` | ||
* Fetch it: `git fetch upstream main` | ||
* Repoint your main branch: `git branch --set-upstream-to=upstream/main main` | ||
* After you clone your forked repo, running below command | ||
```bash | ||
git remote -v | ||
``` | ||
will show `origin`, e.g. `origin [email protected]:{username}/jaeger.git` | ||
* Add `upstream` remote: | ||
```bash | ||
git remote add upstream [email protected]:jaegertracing/jaeger.git | ||
``` | ||
* Fetch it: | ||
```bash | ||
git fetch upstream main | ||
``` | ||
* Repoint your main branch: | ||
```bash | ||
git branch --set-upstream-to=upstream/main main | ||
``` | ||
* With this setup, you will not need to keep your main branch in the fork in sync with the upstream repo. | ||
|
||
Once you're ready to make changes: | ||
* Create a new local branch (DO NOT make changes to `main`, it will cause CI errors). | ||
* Commit your changes, making sure **each commit is signed**, e.g. `git commit -s ...` ([see below](#certificate-of-origin---sign-your-work)). | ||
* Commit your changes, making sure **each commit is signed** ([see below](#certificate-of-origin---sign-your-work)): | ||
```bash | ||
git commit -s -m "Your commit message" | ||
``` | ||
* You do not need to squash the commits, it will happen once the PR is merged into the official repo (but each individual commit must be signed). | ||
* When satisfied, push the changes. Git will likely ask for upstream destination: `git push --set-upstream origin {branch-name}`. | ||
* When satisfied, push the changes. Git will likely ask for upstream destination, so you push commits like this: | ||
```bash | ||
git push --set-upstream origin {branch-name} | ||
``` | ||
* After you push, look for the output, it usually contains a URL to create a pull request. | ||
Each PR should have: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright (c) 2024 The Jaeger Authors. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
package jptrace | ||
|
||
const ( | ||
// WarningsAttribute is the name of the span attribute where we can | ||
// store various warnings produced from transformations, | ||
// such as inbound sanitizers and outbound adjusters. | ||
// The value type of the attribute is a string slice. | ||
WarningsAttribute = "@jaeger@warnings" | ||
// FormatAttribute is a key for span attribute that records the original | ||
// wire format in which the span was received by Jaeger, | ||
// e.g. proto, thrift, json. | ||
FormatAttribute = "@jaeger@format" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters