Skip to content

Commit

Permalink
Merge branch 'open-telemetry:main' into splunkenterprisereceiver_add_…
Browse files Browse the repository at this point in the history
…health_metric
  • Loading branch information
macolby42 authored Nov 19, 2024
2 parents 0711d3e + 16b139d commit 9b39b59
Show file tree
Hide file tree
Showing 1,791 changed files with 36,424 additions and 31,499 deletions.
27 changes: 0 additions & 27 deletions .chloggen/datadog-metric-prefix.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/elasticsearchexporter_ecs-translate-k8s-names.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/fix_group_container_permissions.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/fix_prometheusexporter-shutdown-server-2.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
change_type: bug_fix

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Ensure that time parsing happens before entry is sent to downstream operators
note: Allow indexing []int64, []float64, []bool, and []byte slices

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

# (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:
subtext: It should now be possible to index all slice types

# 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.
Expand Down
27 changes: 0 additions & 27 deletions .chloggen/otlpjson-connector-invalid-otlp.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/refactor-callback-token.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/resourcedetectionprocessor-profiles.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/splunkenterprisereceiver-search-artifact-cache.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions .chloggen/stanza-sync-log-emitter.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ examples/demo/ @open-telemetry/collector-cont
exporter/alertmanagerexporter/ @open-telemetry/collector-contrib-approvers @jpkrohling @sokoide @mcube8
exporter/alibabacloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
exporter/awscloudwatchlogsexporter/ @open-telemetry/collector-contrib-approvers @boostchicken @bryan-aguilar @rapphil
exporter/awsemfexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia @bryan-aguilar
exporter/awsemfexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia @bryan-aguilar
exporter/awskinesisexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy
exporter/awss3exporter/ @open-telemetry/collector-contrib-approvers @atoulme @pdelewski
exporter/awsxrayexporter/ @open-telemetry/collector-contrib-approvers @wangzlei @srprash
exporter/azuredataexplorerexporter/ @open-telemetry/collector-contrib-approvers @asaharn @ag-ramachandran
exporter/azuredataexplorerexporter/ @open-telemetry/collector-contrib-approvers @ag-ramachandran
exporter/azuremonitorexporter/ @open-telemetry/collector-contrib-approvers @pcwiese
exporter/carbonexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
exporter/cassandraexporter/ @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac
Expand All @@ -63,7 +63,7 @@ exporter/googlemanagedprometheusexporter/ @open-telemetry/collector-cont
exporter/honeycombmarkerexporter/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @fchikwekwe
exporter/influxdbexporter/ @open-telemetry/collector-contrib-approvers @jacobmarble
exporter/kafkaexporter/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
exporter/kineticaexporter/ @open-telemetry/collector-contrib-approvers @am-kinetica @TylerHelmuth
exporter/kineticaexporter/ @open-telemetry/collector-contrib-approvers @TylerHelmuth
exporter/loadbalancingexporter/ @open-telemetry/collector-contrib-approvers @jpkrohling
exporter/logicmonitorexporter/ @open-telemetry/collector-contrib-approvers @bogdandrutu @khyatigandhi6 @avadhut123pisal
exporter/logzioexporter/ @open-telemetry/collector-contrib-approvers @yotamloe
Expand All @@ -81,7 +81,7 @@ exporter/signalfxexporter/ @open-telemetry/collector-cont
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo @chan-tim-sumo
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kasia-kujawa @rnishtala-sumo @andrzej-stencel
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1

extension/ackextension/ @open-telemetry/collector-contrib-approvers @zpzhuSplunk @splunkericl
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ jobs:
merge-multiple: true
pattern: coverage-artifacts-*
- name: Upload coverage report
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # 4.6.0
uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # 5.0.2
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/scripts/add-labels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ COMMON_LABELS["needs-triage"]="needs triage"
COMMON_LABELS["os:mac"]="os:mac"
COMMON_LABELS["os:windows"]="os:windows"
COMMON_LABELS["waiting-for-author"]="waiting for author"
COMMON_LABELS["waiting-for-code-owners"]="waiting-for-code-owners"
COMMON_LABELS["bug"]="bug"
COMMON_LABELS["priority:p0"]="priority:p0"
COMMON_LABELS["priority:p1"]="priority:p1"
COMMON_LABELS["priority:p2"]="priority:p2"
COMMON_LABELS["priority:p3"]="priority:p3"
COMMON_LABELS["stale"]="Stale"
COMMON_LABELS["never-stale"]="never stale"

LABELS=$(echo "${COMMENT}" | sed -E 's%^/label%%')

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/ping-codeowners-issues.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ if [[ -z "${OWNERS}" ]]; then
exit 0
fi

gh issue comment "${ISSUE}" --body "Pinging code owners for ${COMPONENT}: ${OWNERS}. See [Adding Labels via Comments](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#adding-labels-via-comments) if you do not have permissions to add labels yourself."
gh issue comment "${ISSUE}" --body "Pinging code owners for ${COMPONENT}: ${OWNERS}. See [Adding Labels via Comments](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#adding-labels-via-comments) if you do not have permissions to add labels yourself. For example, comment '/label priority:p2 -needs-triaged' to set the priority and remove the needs-triaged label."
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ linters:
- unused
- usestdlibvars
- wastedassign
- whitespace

issues:
# Excluding configuration per-path, per-linter, per-text and per-source
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG

<!-- next version -->

## v0.114.0

### 🛑 Breaking changes 🛑

- `pkg/stanza`: Changed signature of `emit.Callback` function in `pkg/stanza/fileconsumer/emit` package by introducing `emit.Token` struct that encapsulates the token's body and attributes. (#36260)

### 💡 Enhancements 💡

- `pkg/datadog`: Expose an API `TranslatorFromConfig` that creates a new metrics translator (#36300)
This is only code refactor and has no user-facing impact

## v0.113.0

### 🛑 Breaking changes 🛑
Expand Down
Loading

0 comments on commit 9b39b59

Please sign in to comment.