diff --git a/cmd/mdatagen/internal/status.go b/cmd/mdatagen/internal/status.go index 74191fa8c86..eafd86ca179 100644 --- a/cmd/mdatagen/internal/status.go +++ b/cmd/mdatagen/internal/status.go @@ -77,6 +77,7 @@ func (s *Status) Validate() error { if err := s.validateClass(); err != nil { errs = errors.Join(errs, err) } + if err := s.Stability.Validate(); err != nil { errs = errors.Join(errs, err) } diff --git a/exporter/exporterhelper/internal/metadata/generated_status.go b/exporter/exporterhelper/internal/metadata/generated_status.go deleted file mode 100644 index 5c9e6c455ca..00000000000 --- a/exporter/exporterhelper/internal/metadata/generated_status.go +++ /dev/null @@ -1,17 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package metadata - -import ( - "go.opentelemetry.io/collector/component" -) - -var ( - Type = component.MustNewType("exporterhelper") -) - -const ( - TracesStability = component.StabilityLevelBeta - MetricsStability = component.StabilityLevelBeta - LogsStability = component.StabilityLevelBeta -) diff --git a/pdata/README.md b/pdata/README.md index 583d408a143..1bd3ae4a889 100644 --- a/pdata/README.md +++ b/pdata/README.md @@ -1,5 +1,15 @@ # Pipeline data (pdata) + +| Status | | +| ------------- |-----------| +| Stability | [stable]: traces, metrics, logs | +| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector?query=is%3Aissue%20is%3Aopen%20label%3Apkg%2Fpdata%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector/issues?q=is%3Aopen+is%3Aissue+label%3Apkg%2Fpdata) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector?query=is%3Aissue%20is%3Aclosed%20label%3Apkg%2Fpdata%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector/issues?q=is%3Aclosed+is%3Aissue+label%3Apkg%2Fpdata) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@BogdanDrutu](https://www.github.com/BogdanDrutu), [@dmitryax](https://www.github.com/dmitryax) | + +[stable]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#stable + + Pipeline data (pdata) implements data structures that represent telemetry data in-memory. All data received is converted into this format, travels through the pipeline in this format, and is converted from this format by exporters when sending. diff --git a/pdata/doc.go b/pdata/doc.go new file mode 100644 index 00000000000..cbfb4223b67 --- /dev/null +++ b/pdata/doc.go @@ -0,0 +1,7 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:generate mdatagen metadata.yaml + +// Package pdata provides the data model definitions for all supported pipeline data. +package pdata // import "go.opentelemetry.io/collector/pdata" diff --git a/pdata/generated_package_test.go b/pdata/generated_package_test.go new file mode 100644 index 00000000000..98ab671461d --- /dev/null +++ b/pdata/generated_package_test.go @@ -0,0 +1,13 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package pdata + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/pdata/metadata.yaml b/pdata/metadata.yaml index bcb68722fb9..5bb99667d07 100644 --- a/pdata/metadata.yaml +++ b/pdata/metadata.yaml @@ -1,4 +1,5 @@ type: pdata +github_project: open-telemetry/opentelemetry-collector status: class: pkg @@ -6,3 +7,5 @@ status: active: - BogdanDrutu - dmitryax + stability: + stable: [traces, metrics, logs] diff --git a/receiver/go.mod b/receiver/go.mod index 18864e66885..dc3068b57e1 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -9,7 +9,6 @@ require ( go.opentelemetry.io/collector/consumer v1.25.0 go.opentelemetry.io/collector/consumer/consumertest v0.119.0 go.opentelemetry.io/collector/pipeline v0.119.0 - go.opentelemetry.io/collector/receiver/receivertest v0.119.0 go.opentelemetry.io/otel v1.34.0 go.opentelemetry.io/otel/metric v1.34.0 go.opentelemetry.io/otel/sdk/metric v1.34.0 @@ -28,11 +27,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.119.0 // indirect go.opentelemetry.io/collector/pdata v1.25.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect - go.opentelemetry.io/collector/receiver/xreceiver v0.119.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect @@ -61,12 +58,6 @@ replace go.opentelemetry.io/collector/consumer/xconsumer => ../consumer/xconsume replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest -replace go.opentelemetry.io/collector/receiver/xreceiver => ./xreceiver - -replace go.opentelemetry.io/collector/receiver/receivertest => ./receivertest - retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/pipeline => ../pipeline - -replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/consumererror diff --git a/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go b/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go index 422799e41d4..29010d9663f 100644 --- a/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go +++ b/receiver/receiverhelper/internal/metadatatest/generated_telemetrytest.go @@ -9,19 +9,9 @@ import ( "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/receivertest" ) -func NewSettings(tt *componenttest.Telemetry) receiver.Settings { - set := receivertest.NewNopSettingsWithType(receivertest.NopType) - set.ID = component.NewID(component.MustNewType("receiverhelper")) - set.TelemetrySettings = tt.NewTelemetrySettings() - return set -} - func AssertEqualReceiverAcceptedLogRecords(t *testing.T, tt *componenttest.Telemetry, dps []metricdata.DataPoint[int64], opts ...metricdatatest.Option) { want := metricdata.Metrics{ Name: "otelcol_receiver_accepted_log_records", diff --git a/receiver/receiverhelper/metadata.yaml b/receiver/receiverhelper/metadata.yaml index d13d7c3307b..a1b77790d04 100644 --- a/receiver/receiverhelper/metadata.yaml +++ b/receiver/receiverhelper/metadata.yaml @@ -2,8 +2,7 @@ type: receiverhelper github_project: open-telemetry/opentelemetry-collector status: - class: receiver - not_component: true + class: pkg stability: beta: [traces, metrics, logs] diff --git a/receiver/xreceiver/go.mod b/receiver/xreceiver/go.mod index 9496a9b7898..358ec6346a0 100644 --- a/receiver/xreceiver/go.mod +++ b/receiver/xreceiver/go.mod @@ -54,7 +54,3 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest replace go.opentelemetry.io/collector/pipeline => ../../pipeline - -replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror - -replace go.opentelemetry.io/collector/receiver/receivertest => ../receivertest diff --git a/scraper/metadata.yaml b/scraper/metadata.yaml index a1c93bd8540..d4c2683d8f4 100644 --- a/scraper/metadata.yaml +++ b/scraper/metadata.yaml @@ -1,4 +1,4 @@ -type: service +type: scraper github_project: open-telemetry/opentelemetry-collector status: