Skip to content

Commit 357466c

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents c16c6c2 + 3936df2 commit 357466c

40 files changed

+48
-1866
lines changed

.chloggen/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ components:
6666
- exporter/prometheusremotewrite
6767
- exporter/pulsar
6868
- exporter/rabbitmq
69-
- exporter/sapm
7069
- exporter/sematext
7170
- exporter/sentry
7271
- exporter/signalfx
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
change_type: bug_fix
2+
component: exporter/elasticsearch
3+
note: Fix retry exponential backoff overflow handling edge case
4+
issues: [46178]
5+
subtext: |
6+
The retry delay growth now guards against duration overflow while preserving
7+
exponential backoff with jitter, so retries cap correctly at the configured
8+
max interval even for large attempt counts.
9+
change_logs: [user]
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7+
component: all
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove deprecated SAPM exporter
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [46555]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

.codecov.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,6 @@ component_management:
249249
name: exporter_rabbitmq
250250
paths:
251251
- exporter/rabbitmqexporter/**
252-
- component_id: exporter_sapm
253-
name: exporter_sapm
254-
paths:
255-
- exporter/sapmexporter/**
256252
- component_id: exporter_sematext
257253
name: exporter_sematext
258254
paths:

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ exporter/prometheusexporter/ @open-telemetry
7979
exporter/prometheusremotewriteexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil @dashpole @ArthurSens @ywwg
8080
exporter/pulsarexporter/ @open-telemetry/collector-contrib-approvers @dao-jun
8181
exporter/rabbitmqexporter/ @open-telemetry/collector-contrib-approvers @atoulme
82-
exporter/sapmexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
8382
exporter/sematextexporter/ @open-telemetry/collector-contrib-approvers @AkhigbeEromo
8483
exporter/sentryexporter/ @open-telemetry/collector-contrib-approvers @AbhiPrasad
8584
exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1

.github/ISSUE_TEMPLATE/beta_stability.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ body:
7777
- exporter/prometheusremotewrite
7878
- exporter/pulsar
7979
- exporter/rabbitmq
80-
- exporter/sapm
8180
- exporter/sematext
8281
- exporter/sentry
8382
- exporter/signalfx

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ body:
8080
- exporter/prometheusremotewrite
8181
- exporter/pulsar
8282
- exporter/rabbitmq
83-
- exporter/sapm
8483
- exporter/sematext
8584
- exporter/sentry
8685
- exporter/signalfx

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ body:
7474
- exporter/prometheusremotewrite
7575
- exporter/pulsar
7676
- exporter/rabbitmq
77-
- exporter/sapm
7877
- exporter/sematext
7978
- exporter/sentry
8079
- exporter/signalfx

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ body:
7474
- exporter/prometheusremotewrite
7575
- exporter/pulsar
7676
- exporter/rabbitmq
77-
- exporter/sapm
7877
- exporter/sematext
7978
- exporter/sentry
8079
- exporter/signalfx

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ body:
7979
- exporter/prometheusremotewrite
8080
- exporter/pulsar
8181
- exporter/rabbitmq
82-
- exporter/sapm
8382
- exporter/sematext
8483
- exporter/sentry
8584
- exporter/signalfx

0 commit comments

Comments
 (0)