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

Add OTLP support #1

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
49114db
Update module github.com/golangci/golangci-lint to v1.60.2 (#5869)
renovate-bot Aug 21, 2024
8f2543c
Define contents permissions on "dependabot validate" workflow (#5874)
mmorel-35 Aug 22, 2024
18cb683
[v2] Configure health check extension for all configs (#5861)
Wise-Wizard Aug 23, 2024
865dd5d
Update module github.com/golangci/golangci-lint to v1.60.3 (#5876)
renovate-bot Aug 23, 2024
922faf0
Clean up gRPC storage config (#5877)
yurishkuro Aug 23, 2024
b8e2c81
Add hardcoded DB password and username to Cassandra integration test …
Ali-Alnosairi Aug 23, 2024
ac88a88
Update opentelemetry-go monorepo (#5881)
renovate-bot Aug 23, 2024
e07c6aa
Update module github.com/prometheus/client_golang to v1.20.2 (#5880)
renovate-bot Aug 23, 2024
e178570
Add go.opentelemetry.io/contrib to OTEL SDK group (#5884)
renovate-bot Aug 24, 2024
6351b0e
Update module go.opentelemetry.io/contrib/samplers/jaegerremote to v0…
renovate-bot Aug 24, 2024
f48d5a8
Update All OTEL SDK + contrib packages (alternative) (#5886)
renovate-bot Aug 24, 2024
9d70957
Update github/codeql-action action to v3.26.5 (#5887)
renovate-bot Aug 24, 2024
910f2ba
[ci] Add support for v2 tags during build (#5890)
yurishkuro Aug 27, 2024
8e66cda
Add jaeger-v2 binary as new release artifact (#5893)
renovate-bot Aug 27, 2024
2b9a9b8
Update All OTEL Collector packages (#5892)
renovate-bot Aug 27, 2024
0339b4b
Remove the description of esCleaner.py from plugin/storage/es/README.…
chinaran Aug 27, 2024
1704955
Update All OTEL Collector packages to v0.108.1 (#5897)
renovate-bot Aug 27, 2024
9ea931a
Bump github.com/prometheus/common from 0.55.0 to 0.56.0 (#5899)
dependabot[bot] Aug 28, 2024
d520c41
Update module github.com/dgraph-io/badger/v4 to v4.3.0 (#5901)
renovate-bot Aug 29, 2024
c0449f4
Update grpc to v1.66.0 and switch to CodecV2 (#5900)
renovate-bot Aug 29, 2024
9a2921a
Update module github.com/elastic/go-elasticsearch/v8 to v8.15.0 (#5906)
renovate-bot Aug 29, 2024
9a30dfc
Extract code to run test binary and log outputs (#5902)
renovate-bot Aug 31, 2024
8ad6ed0
Support Tail Based Sampling Processor From OTEL Collector Extension (…
mahadzaryab1 Aug 31, 2024
edc3152
Refactor/cleanup makefile (#5908)
renovate-bot Aug 31, 2024
8879938
Fix Integration Test Log Dumping For Storage Backends (#5915)
mahadzaryab1 Sep 1, 2024
f4c975c
Update github-actions deps (#5916)
renovate-bot Sep 1, 2024
5bd6980
Add nocommit linter (#5905)
dependabot[bot] Sep 2, 2024
7df6975
Simplify Bundling of UI assets (#5917)
mahadzaryab1 Sep 2, 2024
ad6af7a
[jaeger-v2] Add validation and comments to memory storage config (#5925)
mahadzaryab1 Sep 2, 2024
58f2508
Update module github.com/josephspurrier/goversioninfo to v1.4.1 (#5930)
renovate-bot Sep 3, 2024
3f5e87c
Normalize build-binaries targets (#5924)
yurishkuro Sep 3, 2024
7a8fe39
Remove unused "namespace" field from Badger config (#5929)
yurishkuro Sep 4, 2024
ced61e0
Do not fail DCO checks on author @users.noreply.github.com (#5920)
dependabot[bot] Sep 4, 2024
5a484af
V2 repease prep (#5932)
yurishkuro Sep 4, 2024
1da98bb
Fix typo (#5933)
yurishkuro Sep 4, 2024
3e240fa
[jaeger-v2] Add Validation And Comments to Badger Storage Config (#5927)
mahadzaryab1 Sep 5, 2024
31ddb0d
Update module golang.org/x/sys to v0.25.0 (#5936)
renovate-bot Sep 5, 2024
8d8719a
Update module github.com/prometheus/common to v0.58.0 (#5914)
renovate-bot Sep 5, 2024
978ecbf
[jaeger-v2] Consolidate Options And NamespaceConfig For Badger Storag…
mahadzaryab1 Sep 5, 2024
08ae568
Update dependency go to v1.23.1 (#5940)
renovate-bot Sep 5, 2024
ecdcf64
Update golang Docker tag to v1.23.1 (#5943)
renovate-bot Sep 6, 2024
e1c8f66
Update alpine Docker tag to v3.20.3 (#5950)
renovate-bot Sep 7, 2024
2ca5de3
Group github.com/prometheus/* updates (#5946)
dependabot[bot] Sep 7, 2024
db42502
Update module golang.org/x/net to v0.29.0 (#5942)
renovate-bot Sep 7, 2024
364832f
Update All github.com/prometheus packages (#5952)
renovate-bot Sep 7, 2024
88a0319
[adaptive processor] Remove redundant function (#5953)
yurishkuro Sep 7, 2024
9bdd368
[adaptive sampling] Clean-up after previous refactoring (#5954)
yurishkuro Sep 7, 2024
e667eea
Stop using v1 and v1.x tags for Docker images (#5956)
yurishkuro Sep 9, 2024
d2134e4
Add README for adaptive sampling (#5955)
yurishkuro Sep 9, 2024
f98cd17
Update module github.com/vektra/mockery/v2 to v2.45.1 (#5959)
renovate-bot Sep 9, 2024
d46a232
Update module google.golang.org/grpc to v1.66.1 (#5961)
renovate-bot Sep 9, 2024
bdeb8e6
Remove support for Cassandra 3.x and add Cassandra 5.x (#5962)
mahadzaryab1 Sep 10, 2024
004a686
Update All OTEL Collector packages (#5963)
renovate-bot Sep 11, 2024
99f33a4
Update All OTEL SDK + contrib packages (#5969)
renovate-bot Sep 11, 2024
d2d92c6
Replace loopvar linter (#5976)
anishbista60 Sep 11, 2024
27b6d08
Update module google.golang.org/grpc to v1.66.2 (#5977)
renovate-bot Sep 11, 2024
7787010
Update All OTEL SDK + contrib packages (#5978)
renovate-bot Sep 12, 2024
af00f3a
Fix: The 'tagType' in ES jaeger-span mapping tags.properties should b…
chinaran Sep 13, 2024
7d6ebaa
Bump github.com/golangci/golangci-lint from 1.60.3 to 1.61.0 in /inte…
dependabot[bot] Sep 13, 2024
4640518
Release v2 cleanup 3 (#5984)
yurishkuro Sep 14, 2024
fdb8830
Prepare release 1.61.0 / 2.0.0-rc1 (#5985)
yurishkuro Sep 15, 2024
e047f20
Upgrade UI (#5987)
yurishkuro Sep 15, 2024
0824fc2
Fix regex for publishing v2 image (#5988)
yurishkuro Sep 15, 2024
da039e8
testifylint: enable float-compare (#5989)
mmorel-35 Sep 15, 2024
55d330b
[v2] Add temporary expvar extension (#5986)
yurishkuro Sep 15, 2024
8d1a955
testifylint: enable go-require (#5983)
mmorel-35 Sep 15, 2024
dbb0f77
Remove skip for OTLP_JSON
joeyyy09 Sep 16, 2024
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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ updates:
update-types: [ "version-update:semver-major" ]
- package-ecosystem: docker
directories:
- /docker-compose/cassandra/v3
- /docker-compose/cassandra/v4
- /docker-compose/cassandra/v5
schedule:
interval: daily
ignore:
Expand Down
41 changes: 17 additions & 24 deletions .github/workflows/ci-build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,25 @@ permissions:
contents: read

jobs:
generate-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: define matrix
id: set-matrix
run: |
echo "matrix=$(bash scripts/platforms-to-gh-matrix.sh)" >> $GITHUB_OUTPUT

build-binaries:
needs: generate-matrix
runs-on: ubuntu-latest
strategy:
matrix:
platform:
- name: linux
task: build-binaries-linux
- name: windows
task: build-binaries-windows
- name: osx
task: build-binaries-darwin
- name: osx-m1
task: build-binaries-darwin-arm64
- name: system/390
task: build-binaries-s390x
- name: arm
task: build-binaries-arm64
- name: powerpc
task: build-binaries-ppc64le
name: build binaries for ${{ matrix.platform.name }}
matrix: ${{fromJson(needs.generate-matrix.outputs.matrix)}}
name: build-binaries-${{ matrix.os }}-${{ matrix.arch }}
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
- uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -57,11 +53,8 @@ jobs:
- name: Setup Node.js version
uses: ./.github/actions/setup-node.js

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci

- name: Build binaries
run: make ${{ matrix.platform.task }}
- name: Build platform binaries
run: make build-binaries-${{ matrix.os }}-${{ matrix.arch }}
9 changes: 3 additions & 6 deletions .github/workflows/ci-crossdock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
- uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -37,11 +36,9 @@ jobs:
with:
go-version: 1.23.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
- uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci
- run: make install-ci

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

Expand Down
33 changes: 7 additions & 26 deletions .github/workflows/ci-docker-all-in-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
mode:
- name: v1
binary: all-in-one
- name: v2
binary: jaeger
jaeger_version: [v1, v2]

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
- uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -37,21 +32,17 @@ jobs:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
run: git fetch --prune --unshallow --tags

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.23.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
- uses: ./.github/actions/setup-node.js

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
- uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci
- run: make install-ci

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

Expand All @@ -66,21 +57,11 @@ jobs:
;;
esac

- name: Determine healthcheck setting
id: healthcheck
run: |
if [[ "${{ matrix.mode.name }}" == "v1" ]]; then
echo "HEALTHCHECK_V2=false" >> $GITHUB_ENV
elif [[ "${{ matrix.mode.name }}" == "v2" ]]; then
echo "HEALTHCHECK_V2=true" >> $GITHUB_ENV
fi

- name: Build, test, and publish all-in-one image
run: |
bash scripts/build-all-in-one-image.sh \
${{ env.BUILD_FLAGS }} \
-b ${{ matrix.mode.binary }}
"${{ matrix.jaeger_version }}"
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
HEALTHCHECK_V2: ${{ env.HEALTHCHECK_V2 }}
17 changes: 6 additions & 11 deletions .github/workflows/ci-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
- uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -30,31 +29,27 @@ jobs:
submodules: true

- name: Fetch git tags
run: |
git fetch --prune --unshallow --tags
run: git fetch --prune --unshallow --tags

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.23.x

- name: Setup Node.js version
uses: ./.github/actions/setup-node.js
- uses: ./.github/actions/setup-node.js

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
- uses: ./.github/actions/setup-branch

- name: Install tools
run: make install-ci
- run: make install-ci

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Build only linux/amd64 container images for a Pull Request
if: github.ref_name != 'main'
# -D disables images with debugger
run: bash scripts/build-upload-docker-images.sh -D -p linux/amd64

- name: Build and upload all container images
if: github.ref_name == 'main'
# -d: include images with debugger
run: bash scripts/build-upload-docker-images.sh
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/ci-docker-hotrod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ jobs:
hotrod:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
- uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

Expand All @@ -36,8 +35,7 @@ jobs:
with:
go-version: 1.23.x

- name: Export BRANCH variable
uses: ./.github/actions/setup-branch
- uses: ./.github/actions/setup-branch

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

Expand All @@ -53,11 +51,7 @@ jobs:
esac

- name: Build, test, and publish hotrod image
run: bash scripts/hotrod-integration-test.sh ${{ env.BUILD_FLAGS }}
run: bash scripts/build-hotrod-image.sh ${{ env.BUILD_FLAGS }}
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}

- name: Print logs from hotrod
run: docker compose -f ./examples/hotrod/docker-compose.yml logs
if: failure()
10 changes: 3 additions & 7 deletions .github/workflows/ci-e2e-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
matrix:
jaeger-version: [v1, v2]
version:
- distribution: cassandra
major: 3.x
schema: v003
- distribution: cassandra
major: 4.x
schema: v004
- distribution: cassandra
major: 5.x
schema: v004
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.jaeger-version }}
steps:
- name: Harden Runner
Expand All @@ -45,10 +45,6 @@ jobs:
id: test-execution
run: bash scripts/cassandra-integration-test.sh ${{ matrix.version.major }} ${{ matrix.version.schema }} ${{ matrix.jaeger-version }}

- name: Output Cassandra logs
run: docker compose -f ${{ steps.test-execution.outputs.docker_compose_file }} logs
if: ${{ failure() }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/ci-e2e-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ jobs:
id: test-execution
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}


- name: Output ${{ matrix.version.distribution }} logs
run: docker compose -f ${{ steps.test-execution.outputs.docker_compose_file }} logs
if: ${{ failure() }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/ci-e2e-opensearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ jobs:
id: test-execution
run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}


- name: Output ${{ matrix.version.distribution }} logs
run: docker compose -f ${{ steps.test-execution.outputs.docker_compose_file }} logs
if: ${{ failure() }}

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Generated Files Validation
name: Test Tail Sampling Processor

on:
push:
Expand All @@ -16,7 +16,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
contents: read

jobs:
generated-files-check:
tailsampling-processor:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
Expand All @@ -25,18 +25,17 @@ jobs:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: recursive

- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version: 1.23.x

- name: Verify Protobuf types are up to date
run: make proto && git diff --name-status --exit-code

- name: Verify Thrift types are up to date
run: make thrift && git diff --name-status --exit-code
- name: Run Tail Sampling Processor Integration Test
run: |
make tail-sampling-integration-test

- name: Verify Mockery types are up to date
run: make generate-mocks && git diff --name-status --exit-code
- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out
flags: tailsampling-processor
Loading
Loading