Skip to content

Commit 5d8171e

Browse files
authored
Merge branch 'main' into useStableNetworkAttributes
2 parents 8bf8838 + 30b5ee0 commit 5d8171e

51 files changed

Lines changed: 27 additions & 4453 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.chloggen/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ components:
282282
- receiver/iis
283283
- receiver/influxdb
284284
- receiver/jaeger
285-
- receiver/jmx
286285
- receiver/journald
287286
- receiver/k8s_cluster
288287
- receiver/k8s_events

.chloggen/remove_jmx_receiver.yaml

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: deprecation
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 JMX receiver code
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: [45740]
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
@@ -773,10 +773,6 @@ component_management:
773773
name: receiver_jaeger
774774
paths:
775775
- receiver/jaegerreceiver/**
776-
- component_id: receiver_jmx
777-
name: receiver_jmx
778-
paths:
779-
- receiver/jmxreceiver/**
780776
- component_id: receiver_journald
781777
name: receiver_journald
782778
paths:

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ receiver/icmpcheckreceiver/ @open-telemetry
305305
receiver/iisreceiver/ @open-telemetry/collector-contrib-approvers @ishleenk17 @Mrod1598 @pjanotti
306306
receiver/influxdbreceiver/ @open-telemetry/collector-contrib-approvers @jacobmarble
307307
receiver/jaegerreceiver/ @open-telemetry/collector-contrib-approvers @yurishkuro
308-
receiver/jmxreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @rogercoll
309308
receiver/journaldreceiver/ @open-telemetry/collector-contrib-approvers @belimawr @namco1992
310309
receiver/k8sclusterreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @povilasv @ChrsMark
311310
receiver/k8seventsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @ChrsMark

.github/ISSUE_TEMPLATE/beta_stability.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ body:
302302
- receiver/iis
303303
- receiver/influxdb
304304
- receiver/jaeger
305-
- receiver/jmx
306305
- receiver/journald
307306
- receiver/k8scluster
308307
- receiver/k8sevents

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ body:
305305
- receiver/iis
306306
- receiver/influxdb
307307
- receiver/jaeger
308-
- receiver/jmx
309308
- receiver/journald
310309
- receiver/k8scluster
311310
- receiver/k8sevents

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ body:
299299
- receiver/iis
300300
- receiver/influxdb
301301
- receiver/jaeger
302-
- receiver/jmx
303302
- receiver/journald
304303
- receiver/k8scluster
305304
- receiver/k8sevents

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ body:
299299
- receiver/iis
300300
- receiver/influxdb
301301
- receiver/jaeger
302-
- receiver/jmx
303302
- receiver/journald
304303
- receiver/k8scluster
305304
- receiver/k8sevents

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ body:
304304
- receiver/iis
305305
- receiver/influxdb
306306
- receiver/jaeger
307-
- receiver/jmx
308307
- receiver/journald
309308
- receiver/k8scluster
310309
- receiver/k8sevents

.github.qkg1.topponent_labels.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ receiver/icmpcheckreceiver receiver/icmpcheck
286286
receiver/iisreceiver receiver/iis
287287
receiver/influxdbreceiver receiver/influxdb
288288
receiver/jaegerreceiver receiver/jaeger
289-
receiver/jmxreceiver receiver/jmx
290289
receiver/journaldreceiver receiver/journald
291290
receiver/k8sclusterreceiver receiver/k8scluster
292291
receiver/k8seventsreceiver receiver/k8sevents

0 commit comments

Comments
 (0)