Skip to content

Commit

Permalink
Merge branch 'refs/heads/0.118.0' into insight-main
Browse files Browse the repository at this point in the history
# Conflicts:
#	cmd/otelcontribcol/builder-config.yaml
  • Loading branch information
JaredTan95 committed Jan 22, 2025
2 parents 1b66837 + e0351bf commit 81deb03
Show file tree
Hide file tree
Showing 2,658 changed files with 92,844 additions and 43,520 deletions.
3 changes: 2 additions & 1 deletion .github/ALLOWLIST
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ internal/common
## DEPRECATED components

## UNMAINTAINED components
exporter/kineticaexporter/
exporter/opensearchexporter/
extension/observer/ecstaskobserver/
receiver/jmxreceiver/
receiver/awscloudwatchmetricsreceiver/
570 changes: 294 additions & 276 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ body:
- connector/roundrobin
- connector/routing
- connector/servicegraph
- connector/signaltometrics
- connector/spanmetrics
- connector/sum
- examples/demo
Expand All @@ -47,6 +48,7 @@ body:
- exporter/awsxray
- exporter/azuredataexplorer
- exporter/azuremonitor
- exporter/bmchelix
- exporter/carbon
- exporter/cassandra
- exporter/clickhouse
Expand Down Expand Up @@ -88,11 +90,13 @@ body:
- extension/awsproxy
- extension/basicauth
- extension/bearertokenauth
- extension/cgroupruntime
- extension/encoding
- extension/encoding/avrologencoding
- extension/encoding/jaegerencoding
- extension/encoding/jsonlogencoding
- extension/encoding/otlpencoding
- extension/encoding/skywalkingencoding
- extension/encoding/textencoding
- extension/encoding/zipkinencoding
- extension/googleclientauth
Expand Down Expand Up @@ -221,12 +225,24 @@ body:
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/github
- receiver/gitlab
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
- receiver/haproxy
- receiver/hostmetrics
- receiver/hostmetrics/internal/scraper/cpuscraper
- receiver/hostmetrics/internal/scraper/diskscraper
- receiver/hostmetrics/internal/scraper/filesystemscraper
- receiver/hostmetrics/internal/scraper/loadscraper
- receiver/hostmetrics/internal/scraper/memoryscraper
- receiver/hostmetrics/internal/scraper/networkscraper
- receiver/hostmetrics/internal/scraper/pagingscraper
- receiver/hostmetrics/internal/scraper/processesscraper
- receiver/hostmetrics/internal/scraper/processscraper
- receiver/hostmetrics/internal/scraper/systemscraper
- receiver/httpcheck
- receiver/huaweicloudces
- receiver/iis
- receiver/influxdb
- receiver/jaeger
Expand All @@ -238,12 +254,14 @@ body:
- receiver/kafka
- receiver/kafkametrics
- receiver/kubeletstats
- receiver/libhoney
- receiver/loki
- receiver/memcached
- receiver/mongodb
- receiver/mongodbatlas
- receiver/mysql
- receiver/namedpipe
- receiver/netflow
- receiver/nginx
- receiver/nsxt
- receiver/ntp
Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ body:
- connector/roundrobin
- connector/routing
- connector/servicegraph
- connector/signaltometrics
- connector/spanmetrics
- connector/sum
- examples/demo
Expand All @@ -41,6 +42,7 @@ body:
- exporter/awsxray
- exporter/azuredataexplorer
- exporter/azuremonitor
- exporter/bmchelix
- exporter/carbon
- exporter/cassandra
- exporter/clickhouse
Expand Down Expand Up @@ -82,11 +84,13 @@ body:
- extension/awsproxy
- extension/basicauth
- extension/bearertokenauth
- extension/cgroupruntime
- extension/encoding
- extension/encoding/avrologencoding
- extension/encoding/jaegerencoding
- extension/encoding/jsonlogencoding
- extension/encoding/otlpencoding
- extension/encoding/skywalkingencoding
- extension/encoding/textencoding
- extension/encoding/zipkinencoding
- extension/googleclientauth
Expand Down Expand Up @@ -215,12 +219,24 @@ body:
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/github
- receiver/gitlab
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
- receiver/haproxy
- receiver/hostmetrics
- receiver/hostmetrics/internal/scraper/cpuscraper
- receiver/hostmetrics/internal/scraper/diskscraper
- receiver/hostmetrics/internal/scraper/filesystemscraper
- receiver/hostmetrics/internal/scraper/loadscraper
- receiver/hostmetrics/internal/scraper/memoryscraper
- receiver/hostmetrics/internal/scraper/networkscraper
- receiver/hostmetrics/internal/scraper/pagingscraper
- receiver/hostmetrics/internal/scraper/processesscraper
- receiver/hostmetrics/internal/scraper/processscraper
- receiver/hostmetrics/internal/scraper/systemscraper
- receiver/httpcheck
- receiver/huaweicloudces
- receiver/iis
- receiver/influxdb
- receiver/jaeger
Expand All @@ -232,12 +248,14 @@ body:
- receiver/kafka
- receiver/kafkametrics
- receiver/kubeletstats
- receiver/libhoney
- receiver/loki
- receiver/memcached
- receiver/mongodb
- receiver/mongodbatlas
- receiver/mysql
- receiver/namedpipe
- receiver/netflow
- receiver/nginx
- receiver/nsxt
- receiver/ntp
Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ body:
- connector/roundrobin
- connector/routing
- connector/servicegraph
- connector/signaltometrics
- connector/spanmetrics
- connector/sum
- examples/demo
Expand All @@ -41,6 +42,7 @@ body:
- exporter/awsxray
- exporter/azuredataexplorer
- exporter/azuremonitor
- exporter/bmchelix
- exporter/carbon
- exporter/cassandra
- exporter/clickhouse
Expand Down Expand Up @@ -82,11 +84,13 @@ body:
- extension/awsproxy
- extension/basicauth
- extension/bearertokenauth
- extension/cgroupruntime
- extension/encoding
- extension/encoding/avrologencoding
- extension/encoding/jaegerencoding
- extension/encoding/jsonlogencoding
- extension/encoding/otlpencoding
- extension/encoding/skywalkingencoding
- extension/encoding/textencoding
- extension/encoding/zipkinencoding
- extension/googleclientauth
Expand Down Expand Up @@ -215,12 +219,24 @@ body:
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/github
- receiver/gitlab
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
- receiver/haproxy
- receiver/hostmetrics
- receiver/hostmetrics/internal/scraper/cpuscraper
- receiver/hostmetrics/internal/scraper/diskscraper
- receiver/hostmetrics/internal/scraper/filesystemscraper
- receiver/hostmetrics/internal/scraper/loadscraper
- receiver/hostmetrics/internal/scraper/memoryscraper
- receiver/hostmetrics/internal/scraper/networkscraper
- receiver/hostmetrics/internal/scraper/pagingscraper
- receiver/hostmetrics/internal/scraper/processesscraper
- receiver/hostmetrics/internal/scraper/processscraper
- receiver/hostmetrics/internal/scraper/systemscraper
- receiver/httpcheck
- receiver/huaweicloudces
- receiver/iis
- receiver/influxdb
- receiver/jaeger
Expand All @@ -232,12 +248,14 @@ body:
- receiver/kafka
- receiver/kafkametrics
- receiver/kubeletstats
- receiver/libhoney
- receiver/loki
- receiver/memcached
- receiver/mongodb
- receiver/mongodbatlas
- receiver/mysql
- receiver/namedpipe
- receiver/netflow
- receiver/nginx
- receiver/nsxt
- receiver/ntp
Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/unmaintained.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ body:
- connector/roundrobin
- connector/routing
- connector/servicegraph
- connector/signaltometrics
- connector/spanmetrics
- connector/sum
- examples/demo
Expand All @@ -46,6 +47,7 @@ body:
- exporter/awsxray
- exporter/azuredataexplorer
- exporter/azuremonitor
- exporter/bmchelix
- exporter/carbon
- exporter/cassandra
- exporter/clickhouse
Expand Down Expand Up @@ -87,11 +89,13 @@ body:
- extension/awsproxy
- extension/basicauth
- extension/bearertokenauth
- extension/cgroupruntime
- extension/encoding
- extension/encoding/avrologencoding
- extension/encoding/jaegerencoding
- extension/encoding/jsonlogencoding
- extension/encoding/otlpencoding
- extension/encoding/skywalkingencoding
- extension/encoding/textencoding
- extension/encoding/zipkinencoding
- extension/googleclientauth
Expand Down Expand Up @@ -220,12 +224,24 @@ body:
- receiver/flinkmetrics
- receiver/fluentforward
- receiver/github
- receiver/gitlab
- receiver/googlecloudmonitoring
- receiver/googlecloudpubsub
- receiver/googlecloudspanner
- receiver/haproxy
- receiver/hostmetrics
- receiver/hostmetrics/internal/scraper/cpuscraper
- receiver/hostmetrics/internal/scraper/diskscraper
- receiver/hostmetrics/internal/scraper/filesystemscraper
- receiver/hostmetrics/internal/scraper/loadscraper
- receiver/hostmetrics/internal/scraper/memoryscraper
- receiver/hostmetrics/internal/scraper/networkscraper
- receiver/hostmetrics/internal/scraper/pagingscraper
- receiver/hostmetrics/internal/scraper/processesscraper
- receiver/hostmetrics/internal/scraper/processscraper
- receiver/hostmetrics/internal/scraper/systemscraper
- receiver/httpcheck
- receiver/huaweicloudces
- receiver/iis
- receiver/influxdb
- receiver/jaeger
Expand All @@ -237,12 +253,14 @@ body:
- receiver/kafka
- receiver/kafkametrics
- receiver/kubeletstats
- receiver/libhoney
- receiver/loki
- receiver/memcached
- receiver/mongodb
- receiver/mongodbatlas
- receiver/mysql
- receiver/namedpipe
- receiver/netflow
- receiver/nginx
- receiver/nsxt
- receiver/ntp
Expand Down
2 changes: 1 addition & 1 deletion .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ assigneeGroups:
# Approvers
- atoulme
- ChrsMark
# - crobert-1 on leave
- crobert-1
- dashpole
- mwear
- songy23
Expand Down
11 changes: 11 additions & 0 deletions .github/lychee.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
include-fragments = true

accept = ["200..=299", "429"]

exclude = [
"^http(s)?://localhost",
"^http(s)?://example.com"
]

# better to be safe and avoid failures
max-retries = 6
2 changes: 1 addition & 1 deletion .github/workflows/add-codeowners-to-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
add-owners-to-pr:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/add-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
add-labels:
if: ${{ !github.event.issue.pull_request && startsWith(github.event.comment.body, '/label') && github.repository_owner == 'open-telemetry' }}

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:

jobs:
add-owner:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: run
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-update-jmx-metrics-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check-versions:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
latest-version: ${{ steps.check-versions.outputs.latest-version }}
already-added: ${{ steps.check-versions.outputs.already-added }}
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
echo "already-opened=$already_opened" >> $GITHUB_OUTPUT
update-jmx-metrics-component:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: |
needs.check-versions.outputs.already-added != 'true' &&
needs.check-versions.outputs.already-opened != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: make -j2 gotest GROUP=${{ matrix.group }}
arm-unittest:
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [arm-unittest-matrix]
steps:
- name: Print result
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:
- cmd-0
- cmd-1
- other
runs-on: windows-latest
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
env:
# Limit memory usage via GC environment variables to avoid OOM on GH runners, especially for `cmd/otelcontribcol`,
Expand Down
Loading

0 comments on commit 81deb03

Please sign in to comment.