From f6be42d729d29fd73dd73e60a0bf45ff149da047 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Wed, 22 Mar 2023 12:25:44 -0400 Subject: [PATCH] Update proposed deprecation version --- component/host.go | 8 +++++++- service/host.go | 7 ++++++- service/internal/graph/graph.go | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/component/host.go b/component/host.go index 1d92da244e6..bf36e2718c4 100644 --- a/component/host.go +++ b/component/host.go @@ -58,6 +58,12 @@ type Host interface { // // GetExporters can be called by the component anytime after Component.Start() begins and // until Component.Shutdown() ends. - // Deprecated: [0.74.0] Use a connector or extension to send data between pipelines. + // + // Deprecated: [0.75.0] This function will be removed no earlier than 0.80.0. + // Several components in the contrib repository use this function so it cannot be removed + // before those cases are removed. In most cases, use of this function can be replaced by a + // connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and + // https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 + // for additional information. GetExporters() map[DataType]map[ID]Component } diff --git a/service/host.go b/service/host.go index 926c000ff0f..bd750d4dec3 100644 --- a/service/host.go +++ b/service/host.go @@ -68,7 +68,12 @@ func (host *serviceHost) GetExtensions() map[component.ID]component.Component { return host.serviceExtensions.GetExtensions() } -// Deprecated: [0.74.0] Use a connector or extension to send data between pipelines. +// Deprecated: [0.75.0] This function will be removed no earlier than 0.80.0. +// Several components in the contrib repository use this function so it cannot be removed +// before those cases are removed. In most cases, use of this function can be replaced by a +// connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and +// https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 +// for additional information. func (host *serviceHost) GetExporters() map[component.DataType]map[component.ID]component.Component { return host.pipelines.GetExporters() } diff --git a/service/internal/graph/graph.go b/service/internal/graph/graph.go index 74d59091504..9bfa3196709 100644 --- a/service/internal/graph/graph.go +++ b/service/internal/graph/graph.go @@ -321,7 +321,12 @@ func (g *Graph) ShutdownAll(ctx context.Context) error { return errs } -// Deprecated: [0.74.0] Use a connector or extension to send data between pipelines. +// Deprecated: [0.75.0] This function will be removed no earlier than 0.80.0. +// Several components in the contrib repository use this function so it cannot be removed +// before those cases are removed. In most cases, use of this function can be replaced by a +// connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and +// https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 +// for additional information. func (g *Graph) GetExporters() map[component.DataType]map[component.ID]component.Component { exportersMap := make(map[component.DataType]map[component.ID]component.Component) exportersMap[component.DataTypeTraces] = make(map[component.ID]component.Component)