Skip to content

Commit

Permalink
Merge branch 'main' into prep-v0.113.x
Browse files Browse the repository at this point in the history
  • Loading branch information
djaglowski committed Nov 6, 2024
2 parents 616b47a + 9ae0db9 commit f36a663
Show file tree
Hide file tree
Showing 298 changed files with 933 additions and 1,098 deletions.
28 changes: 28 additions & 0 deletions .chloggen/mark_opensearchexporter_unmaintained.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Use this changelog template to create an entry for release notes.

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

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: The OpenSearch exporter is now marked as unmaintained and will be removed in 6 months.

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

# (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: |
Any codeowners can reinstate the component by submitting a PR to revert the change or commenting on https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/35781.
# 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: []
2 changes: 1 addition & 1 deletion .chloggen/routing-connector-by-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ change_type: enhancement
component: routingconnector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add ability to route logs by request metadata.
note: Add ability to route by request metadata.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [19738]
Expand Down
27 changes: 27 additions & 0 deletions .chloggen/transform-set-stable-gate.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: breaking

# 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: Promote `processor.transform.ConvertBetweenSumAndGaugeMetricContext` feature gate to Stable

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

# (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: This gate can no longer be disabled. The `convert_sum_to_gauge` and `convert_gauge_to_sum` may now only be used with the `metric` context.

# 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: []
1 change: 1 addition & 0 deletions .github/ALLOWLIST
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ internal/common
## DEPRECATED components

## UNMAINTAINED components
exporter/opensearchexporter/
extension/observer/ecstaskobserver/
receiver/jmxreceiver/
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ exporter/logzioexporter/ @open-teleme
exporter/lokiexporter/ @open-telemetry/collector-contrib-approvers @gramidt @jpkrohling @mar4uk
exporter/mezmoexporter/ @open-telemetry/collector-contrib-approvers @dashpole @billmeyer @gjanco
exporter/opencensusexporter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
exporter/opensearchexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @MitchellGale @MaxKsyunz @YANG-DB
exporter/otelarrowexporter/ @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3 @lquerel
exporter/prometheusexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
exporter/prometheusremotewriteexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil @dashpole
Expand Down Expand Up @@ -105,7 +104,7 @@ extension/httpforwarderextension/ @open-teleme
extension/jaegerremotesampling/ @open-telemetry/collector-contrib-approvers @yurishkuro @frzifus
extension/oauth2clientauthextension/ @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
extension/observer/ @open-telemetry/collector-contrib-approvers @dmitryax
extension/observer/cfgardenobserver/ @open-telemetry/collector-contrib-approvers @crobert-1 @cemdk @tomasmota @m1rp @jriguera
extension/observer/cfgardenobserver/ @open-telemetry/collector-contrib-approvers @crobert-1 @cemdk @m1rp @jriguera
extension/observer/dockerobserver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
extension/observer/ecsobserver/ @open-telemetry/collector-contrib-approvers @dmitryax
extension/observer/hostobserver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
Expand Down Expand Up @@ -323,5 +322,6 @@ reports/distributions/k8s.yaml @open-telemetry/collector-contrib-approvers

## UNMAINTAINED components

exporter/opensearchexporter/ @open-telemetry/collector-contrib-approvers
extension/observer/ecstaskobserver/ @open-telemetry/collector-contrib-approvers
receiver/jmxreceiver/ @open-telemetry/collector-contrib-approvers
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,20 +185,6 @@ body:
- processor/remotetap
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/aws/ec2
- processor/resourcedetection/internal/aws/ecs
- processor/resourcedetection/internal/aws/eks
- processor/resourcedetection/internal/aws/elasticbeanstalk
- processor/resourcedetection/internal/aws/lambda
- processor/resourcedetection/internal/azure
- processor/resourcedetection/internal/azure/aks
- processor/resourcedetection/internal/consul
- processor/resourcedetection/internal/docker
- processor/resourcedetection/internal/gcp
- processor/resourcedetection/internal/heroku
- processor/resourcedetection/internal/k8snode
- processor/resourcedetection/internal/openshift
- processor/resourcedetection/internal/system
- processor/routing
- processor/schema
- processor/span
Expand Down
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,6 @@ body:
- processor/remotetap
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/aws/ec2
- processor/resourcedetection/internal/aws/ecs
- processor/resourcedetection/internal/aws/eks
- processor/resourcedetection/internal/aws/elasticbeanstalk
- processor/resourcedetection/internal/aws/lambda
- processor/resourcedetection/internal/azure
- processor/resourcedetection/internal/azure/aks
- processor/resourcedetection/internal/consul
- processor/resourcedetection/internal/docker
- processor/resourcedetection/internal/gcp
- processor/resourcedetection/internal/heroku
- processor/resourcedetection/internal/k8snode
- processor/resourcedetection/internal/openshift
- processor/resourcedetection/internal/system
- processor/routing
- processor/schema
- processor/span
Expand Down
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,6 @@ body:
- processor/remotetap
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/aws/ec2
- processor/resourcedetection/internal/aws/ecs
- processor/resourcedetection/internal/aws/eks
- processor/resourcedetection/internal/aws/elasticbeanstalk
- processor/resourcedetection/internal/aws/lambda
- processor/resourcedetection/internal/azure
- processor/resourcedetection/internal/azure/aks
- processor/resourcedetection/internal/consul
- processor/resourcedetection/internal/docker
- processor/resourcedetection/internal/gcp
- processor/resourcedetection/internal/heroku
- processor/resourcedetection/internal/k8snode
- processor/resourcedetection/internal/openshift
- processor/resourcedetection/internal/system
- processor/routing
- processor/schema
- processor/span
Expand Down
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/unmaintained.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,6 @@ body:
- processor/remotetap
- processor/resource
- processor/resourcedetection
- processor/resourcedetection/internal/aws/ec2
- processor/resourcedetection/internal/aws/ecs
- processor/resourcedetection/internal/aws/eks
- processor/resourcedetection/internal/aws/elasticbeanstalk
- processor/resourcedetection/internal/aws/lambda
- processor/resourcedetection/internal/azure
- processor/resourcedetection/internal/azure/aks
- processor/resourcedetection/internal/consul
- processor/resourcedetection/internal/docker
- processor/resourcedetection/internal/gcp
- processor/resourcedetection/internal/heroku
- processor/resourcedetection/internal/k8snode
- processor/resourcedetection/internal/openshift
- processor/resourcedetection/internal/system
- processor/routing
- processor/schema
- processor/span
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
run: make chlog-preview > changelog_preview.md
- name: Install markdown-link-check
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
run: npm install -g markdown-link-check
run: npm install -g markdown-link-check@3.12.2
- name: Run markdown-link-check
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
fetch-depth: 0

- name: Install markdown-link-check
run: npm install -g markdown-link-check
run: npm install -g markdown-link-check@3.12.2

- name: Run markdown-link-check
run: |
Expand Down
4 changes: 0 additions & 4 deletions cmd/githubgen/allowlist.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Caleb-Hurshman
MaxKsyunz
MitchellGale
YANG-DB
asaharn
emreyalvac
shaochengwang
Expand All @@ -18,7 +15,6 @@ zpzhuSplunk
thmshmm
galrose
cemdk
tomasmota
m1rp
jriguera
abhishek-at-cloudwerx
Expand Down
4 changes: 2 additions & 2 deletions cmd/telemetrygen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Acmd%2Ftelemetrygen%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Acmd%2Ftelemetrygen) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Acmd%2Ftelemetrygen%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Acmd%2Ftelemetrygen) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mx-psi](https://www.github.com/mx-psi), [@codeboten](https://www.github.com/codeboten) |

[development]: https://github.com/open-telemetry/opentelemetry-collector#development
[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[development]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#development
[alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
<!-- end autogenerated section -->

This utility simulates a client generating **traces**, **metrics**, and **logs**. It is useful for testing and demonstration purposes.
Expand Down
4 changes: 2 additions & 2 deletions connector/countconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fcount%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fcount) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fcount%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fcount) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@jpkrohling](https://www.github.com/jpkrohling) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s

Expand All @@ -20,7 +20,7 @@

[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type
[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#stability-levels
<!-- end autogenerated section -->

The `count` connector can be used to count spans, span events, metrics, data points, and log records.
Expand Down
4 changes: 2 additions & 2 deletions connector/datadogconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mx-psi](https://www.github.com/mx-psi), [@dineshg13](https://www.github.com/dineshg13), [@ankitpatel96](https://www.github.com/ankitpatel96) |
| Emeritus | [@gbbr](https://www.github.com/gbbr) |

[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta
[beta]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#beta
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib

## Supported Pipeline Types
Expand All @@ -20,7 +20,7 @@

[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type
[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#stability-levels
<!-- end autogenerated section -->

## Description
Expand Down
4 changes: 2 additions & 2 deletions connector/exceptionsconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fexceptions%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fexceptions) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fexceptions%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fexceptions) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@marctc](https://www.github.com/marctc) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s

Expand All @@ -20,7 +20,7 @@

[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type
[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#stability-levels
<!-- end autogenerated section -->

## Overview
Expand Down
4 changes: 2 additions & 2 deletions connector/failoverconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Ffailover%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Ffailover) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Ffailover%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Ffailover) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@akats7](https://www.github.com/akats7), [@djaglowski](https://www.github.com/djaglowski), [@fatsheep9146](https://www.github.com/fatsheep9146) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[alpha]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
[k8s]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-k8s

Expand All @@ -21,7 +21,7 @@

[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type
[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels
[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#stability-levels
<!-- end autogenerated section -->

Allows for health based routing between trace, metric, and log pipelines depending on the health of target downstream exporters.
Expand Down
Loading

0 comments on commit f36a663

Please sign in to comment.