Skip to content

Commit 7cd0a2f

Browse files
committed
[cmd/mdatagen] Pull new changes from contrib
1 parent e696206 commit 7cd0a2f

Some content is hidden

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

53 files changed

+1247
-182
lines changed

.chloggen/mdatagen-tests.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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Generate the lifecycle tests for components by default.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [9683]
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+
It's encouraged to have lifecycle tests for all components enadled, but they can be disabled if needed
20+
in metadata.yaml with `skip_lifecycle: true` and `skip_shutdown: true` under `tests` section.
21+
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: []

cmd/mdatagen/doc.go

Lines changed: 0 additions & 7 deletions
This file was deleted.

cmd/mdatagen/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ require (
88
go.opentelemetry.io/collector/component v0.96.0
99
go.opentelemetry.io/collector/confmap v0.96.0
1010
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0
11+
go.opentelemetry.io/collector/consumer v0.96.0
1112
go.opentelemetry.io/collector/pdata v1.3.0
1213
go.opentelemetry.io/collector/receiver v0.96.0
1314
go.opentelemetry.io/collector/semconv v0.96.0
1415
go.opentelemetry.io/otel/metric v1.24.0
1516
go.opentelemetry.io/otel/trace v1.24.0
17+
go.uber.org/goleak v1.3.0
1618
go.uber.org/multierr v1.11.0
1719
go.uber.org/zap v1.27.0
1820
golang.org/x/text v0.14.0
@@ -41,7 +43,6 @@ require (
4143
github.com/prometheus/common v0.48.0 // indirect
4244
github.com/prometheus/procfs v0.12.0 // indirect
4345
go.opentelemetry.io/collector/config/configtelemetry v0.96.0 // indirect
44-
go.opentelemetry.io/collector/consumer v0.96.0 // indirect
4546
go.opentelemetry.io/otel v1.24.0 // indirect
4647
go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect
4748
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
// Generate a test metrics builder from a sample metrics set covering all configuration options.
5+
//go:generate mdatagen metadata.yaml
6+
7+
// Deprecated: This package is moving to https://github.com/open-telemetry/opentelemetry-collector and will eventually be removed.
8+
// Please see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/30497
9+
// This is a sample receiver package used to showcase how mdatagen is applied.
10+
package samplereceiver // import "go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver"

cmd/mdatagen/documentation.md renamed to cmd/mdatagen/internal/samplereceiver/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[comment]: <> (Code generated by mdatagen. DO NOT EDIT.)
22

3-
# file
3+
# sample
44

55
## Default Metrics
66

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package samplereceiver // import "go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver"
5+
6+
import (
7+
"context"
8+
9+
"go.opentelemetry.io/collector/component"
10+
"go.opentelemetry.io/collector/consumer"
11+
"go.opentelemetry.io/collector/receiver"
12+
13+
"go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver/internal/metadata"
14+
)
15+
16+
// NewFactory returns a receiver.Factory for sample receiver.
17+
func NewFactory() receiver.Factory {
18+
return receiver.NewFactory(
19+
metadata.Type,
20+
func() component.Config { return &struct{}{} },
21+
receiver.WithTraces(createTraces, metadata.TracesStability),
22+
receiver.WithMetrics(createMetrics, metadata.MetricsStability),
23+
receiver.WithLogs(createLogs, metadata.LogsStability))
24+
}
25+
26+
func createTraces(context.Context, receiver.CreateSettings, component.Config, consumer.Traces) (receiver.Traces, error) {
27+
return nopInstance, nil
28+
}
29+
30+
func createMetrics(context.Context, receiver.CreateSettings, component.Config, consumer.Metrics) (receiver.Metrics, error) {
31+
return nopInstance, nil
32+
}
33+
34+
func createLogs(context.Context, receiver.CreateSettings, component.Config, consumer.Logs) (receiver.Logs, error) {
35+
return nopInstance, nil
36+
}
37+
38+
var nopInstance = &nopReceiver{}
39+
40+
type nopReceiver struct {
41+
component.StartFunc
42+
component.ShutdownFunc
43+
}

cmd/mdatagen/internal/samplereceiver/generated_component_test.go

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

cmd/mdatagen/internal/metadata/generated_config.go renamed to cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config.go

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

cmd/mdatagen/internal/metadata/generated_metrics.go renamed to cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)