Skip to content

Commit

Permalink
Merge branch 'main' into fix-issue-open-telemetry#11820
Browse files Browse the repository at this point in the history
  • Loading branch information
codeboten authored Dec 13, 2024
2 parents c9ce37f + 128d9b7 commit 69577a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol

go 1.22.0

toolchain go1.22.9
toolchain go1.22.10

require (
go.opentelemetry.io/collector/component v0.115.0
Expand Down
8 changes: 4 additions & 4 deletions consumer/consumerprofiles/profiles.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Deprecated: [0.115.0] This package is deprecated. Use "go.opentelemetry.io/collector/consumer/xconsumer" instead.
// Deprecated: [0.116.0] This package is deprecated. Use "go.opentelemetry.io/collector/consumer/xconsumer" instead.
package consumerprofiles // import "go.opentelemetry.io/collector/consumer/consumerprofiles"

import (
Expand All @@ -15,15 +15,15 @@ var errNilFunc = errors.New("nil consumer func")

// Profiles is an interface that receives pprofile.Profiles, processes it
// as needed, and sends it to the next processing node if any or to the destination.
// Deprecated: [0.115.0] Use xconsumer.Profiles instead.
// Deprecated: [0.116.0] Use xconsumer.Profiles instead.
type Profiles = xconsumer.Profiles

// ConsumeProfilesFunc is a helper function that is similar to ConsumeProfiles.
// Deprecated: [0.115.0] Use xconsumer.ConsumeProfilesFunc instead.
// Deprecated: [0.116.0] Use xconsumer.ConsumeProfilesFunc instead.
type ConsumeProfilesFunc = xconsumer.ConsumeProfilesFunc

// NewProfiles returns a Profiles configured with the provided options.
// Deprecated: [0.115.0] Use xconsumer.NewProfiles instead.
// Deprecated: [0.116.0] Use xconsumer.NewProfiles instead.
func NewProfiles(consume ConsumeProfilesFunc, options ...consumer.Option) (Profiles, error) {
return xconsumer.NewProfiles(consume, options...)
}

0 comments on commit 69577a7

Please sign in to comment.