Skip to content

Commit

Permalink
Merge branch 'main' into cds-1320
Browse files Browse the repository at this point in the history
  • Loading branch information
daidokoro authored Jul 3, 2024
2 parents d4f9032 + 9d7fec7 commit 319b1f2
Show file tree
Hide file tree
Showing 227 changed files with 2,422 additions and 867 deletions.
27 changes: 27 additions & 0 deletions .chloggen/ottl-emit-traces.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/ottl

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Emit traces for statement sequence executions to troubleshoot OTTL statements/conditions

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [33433]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
31 changes: 31 additions & 0 deletions .chloggen/windowsperfcounters-instance-indexing.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: windowsperfcountersreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "`windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `\Process(*)` counters with multiple running instances of the same executable."

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [32319]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
**NOTES**
- This change can expose cardinality issues where the counters were previously collapsed under the non-indexed instance name.
- The change mimics Windows Performance Monitor behavior: The first instance name remains unchanged, additional instances are suffixed with `#<N>` where `N=1` and is increased for each duplicate.
- e.g. Given 3 powershell instances, this will return `powershell`, `powershell#1` and `powershell#2`.
# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-and-test-arm
on:
push:
branches: [ main ]
branches: [main]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
- "v[0-9]+.[0-9]+.[0-9]+*"
merge_group:
pull_request:
types: [opened, synchronize, reopened, labeled, unlabeled]
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "~1.22.4"
go-version: "~1.22.5"
cache: false
- name: Cache Go
id: go-cache
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: build-and-test-windows
on:
push:
branches:
- 'main'
- 'releases/**'
- "main"
- "releases/**"
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
- "v[0-9]+.[0-9]+.[0-9]+*"
merge_group:
pull_request:
types: [opened, synchronize, reopened, labeled, unlabeled]
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-mod-cache
Expand Down
43 changes: 21 additions & 22 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-and-test
on:
push:
branches: [ main ]
branches: [main]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
- "v[0-9]+.[0-9]+.[0-9]+*"
merge_group:
pull_request:
env:
Expand All @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -184,7 +184,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ["1.22.4", "1.21.11"] # 1.20 is interpreted as 1.2 without quotes
go-version: ["1.22.5", "1.21.12"] # 1.20 is interpreted as 1.2 without quotes
runner: [ubuntu-latest]
group:
- receiver-0
Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -386,7 +386,7 @@ jobs:
integration-tests:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
needs: [ setup-environment, integration-tests-matrix ]
needs: [setup-environment, integration-tests-matrix]
steps:
- name: Print result
run: echo ${{ needs.integration-tests-matrix.result }}
Expand All @@ -407,7 +407,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -433,7 +433,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -503,7 +503,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -542,7 +542,7 @@ jobs:
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3'
ruby-version: "3.3"
- name: Install fpm
run: gem install --no-document fpm -v 1.15.1
- name: Download Collector Binaries
Expand Down Expand Up @@ -604,7 +604,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Mkdir bin and dist
run: |
Expand Down Expand Up @@ -645,14 +645,14 @@ jobs:
- name: Build Docker Image
if: steps.check.outputs.passed == 'true'
run: |
make docker-otelcontribcol
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:latest
make docker-otelcontribcol
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:latest
- name: Validate Docker Image
if: steps.check.outputs.passed == 'true'
run: |
docker run otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA --version
docker run otel/opentelemetry-collector-contrib-dev:latest --version
docker run otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA --version
docker run otel/opentelemetry-collector-contrib-dev:latest --version
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand All @@ -661,8 +661,8 @@ jobs:
- name: Push Docker Image
if: steps.check.outputs.passed == 'true'
run: |
docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker push otel/opentelemetry-collector-contrib-dev:latest
docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker push otel/opentelemetry-collector-contrib-dev:latest
publish-stable:
runs-on: ubuntu-latest
needs: [lint, unittest, integration-tests, build-package]
Expand Down Expand Up @@ -710,4 +710,3 @@ jobs:
return
}
}
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [main]
paths-ignore:
- '**/README.md'
- "**/README.md"

jobs:
CodeQL-Build:
Expand All @@ -14,13 +14,13 @@ jobs:
# Force CodeQL to run the extraction on the files compiled by our custom
# build command, as opposed to letting the autobuilder figure it out.
# See: https://github.com/github/codeql-action/issues/1101#issuecomment-1157729589
CODEQL_EXTRACTOR_GO_BUILD_TRACING: 'on'
CODEQL_EXTRACTOR_GO_BUILD_TRACING: "on"

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false

# Initializes the CodeQL tools for scanning.
Expand All @@ -36,4 +36,3 @@ jobs:
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
timeout-minutes: 60

17 changes: 8 additions & 9 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
branches:
- main
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
- "v[0-9]+.[0-9]+.[0-9]+*"
paths-ignore:
- '**/README.md'
- "**/README.md"
pull_request:
paths-ignore:
- '**/README.md'
- "**/README.md"
merge_group:

env:
Expand All @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.11"
go-version: "1.21.12"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
kubernetes-test:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
needs: [ kubernetes-test-matrix ]
needs: [kubernetes-test-matrix]
steps:
- name: Print result
run: echo ${{ needs.kubernetes-test-matrix.result }}
Expand All @@ -189,4 +189,3 @@ jobs:
echo "One or more matrix jobs failed."
false
fi
Loading

0 comments on commit 319b1f2

Please sign in to comment.