Skip to content

Commit d02d376

Browse files
author
Alex Boten
authored
[processor/servicegraph] remove deprecated component (#30149)
This component was replaced by the servicegraphconnector, which was a wrapper around the servicegraphprocessor. This PR moves the processor code into the connector component and removes the processor altogether. Note that as part of this PR I added the traces_to_traces support as it was supported by the processor before (with the development status). Fixes #30041 Fixes #26091 --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 9e6cd97 commit d02d376

40 files changed

+395
-1516
lines changed
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. filelogreceiver)
7+
component: servicegraphprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: removed deprecated component, use the servicegraph connector instead.
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: [26091]
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: []

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ processor/resourcedetectionprocessor/internal/openshift/ @open-telemetry/collect
174174
processor/resourceprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
175175
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
176176
processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
177-
processor/servicegraphprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno
178177
processor/spanmetricsprocessor/ @open-telemetry/collector-contrib-approvers
179178
processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
180179
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ body:
170170
- processor/resourcedetection/internal/openshift
171171
- processor/routing
172172
- processor/schema
173-
- processor/servicegraph
174173
- processor/span
175174
- processor/spanmetrics
176175
- processor/sumologic

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ body:
164164
- processor/resourcedetection/internal/openshift
165165
- processor/routing
166166
- processor/schema
167-
- processor/servicegraph
168167
- processor/span
169168
- processor/spanmetrics
170169
- processor/sumologic

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ body:
164164
- processor/resourcedetection/internal/openshift
165165
- processor/routing
166166
- processor/schema
167-
- processor/servicegraph
168167
- processor/span
169168
- processor/spanmetrics
170169
- processor/sumologic

cmd/configschema/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ require (
513513
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.93.0 // indirect
514514
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 // indirect
515515
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.93.0 // indirect
516-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 // indirect
517516
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.93.0 // indirect
518517
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.93.0 // indirect
519518
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.93.0 // indirect
@@ -928,8 +927,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/reso
928927

929928
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor => ../../processor/routingprocessor/
930929

931-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor/
932-
933930
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor => ../../processor/spanmetricsprocessor/
934931

935932
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor => ../../processor/spanprocessor/

cmd/otelcontribcol/builder-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ processors:
112112
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.93.0
113113
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0
114114
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.93.0
115-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0
116115
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.93.0
117116
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.93.0
118117
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.93.0
@@ -283,7 +282,6 @@ replaces:
283282
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver => ../../receiver/vcenterreceiver
284283
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver => ../../receiver/statsdreceiver
285284
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
286-
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor
287285
- github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ../../processor/groupbytraceprocessor
288286
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter => ../../exporter/tencentcloudlogserviceexporter
289287
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter => ../../exporter/loadbalancingexporter

cmd/otelcontribcol/components.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ require (
102102
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.93.0
103103
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0
104104
github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.93.0
105-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0
106105
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.93.0
107106
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.93.0
108107
github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.93.0
@@ -855,8 +854,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stats
855854

856855
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
857856

858-
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor
859-
860857
replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ../../processor/groupbytraceprocessor
861858

862859
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter => ../../exporter/tencentcloudlogserviceexporter

processor/servicegraphprocessor/config.go renamed to connector/servicegraphconnector/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor"
4+
package servicegraphconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
55

66
import (
77
"time"

0 commit comments

Comments
 (0)