Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] make update-otel OTEL_VERSION=v0.114.0 OTEL_STABLE_VERSION=v1.20.0 #36420

Merged
merged 4 commits into from
Nov 18, 2024
Merged

[chore] make update-otel OTEL_VERSION=v0.114.0 OTEL_STABLE_VERSION=v1.20.0 #36420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35c447b
[chore] Upgrade to latest released mdatagen
bogdandrutu Nov 18, 2024
1c1e471
[chore] multimod update stable modules
bogdandrutu Nov 18, 2024
0f6b83e
[chore] multimod update beta modules
bogdandrutu Nov 18, 2024
0b6b2bf
Run make gotidy
bogdandrutu Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion connector/grafanacloudconnector/generated_component_telemetry_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 15 additions & 8 deletions connector/grafanacloudconnector/internal/metadata/generated_telemetry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion connector/servicegraphconnector/generated_component_telemetry_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions connector/servicegraphconnector/internal/metadata/generated_telemetry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 3 additions & 11 deletions exporter/dorisexporter/exporter_common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,18 @@ import (
"time"

"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/collector/component/componenttest"
)

var testTelemetrySettings = component.TelemetrySettings{
LeveledMeterProvider: func(_ configtelemetry.Level) metric.MeterProvider {
return nil
},
}

func TestNewCommonExporter(t *testing.T) {
cfg := createDefaultConfig().(*Config)
exporter := newExporter(nil, cfg, testTelemetrySettings)
exporter := newExporter(nil, cfg, componenttest.NewNopTelemetrySettings())
require.NotNil(t, exporter)
}

func TestCommonExporter_FormatTime(t *testing.T) {
cfg := createDefaultConfig().(*Config)
exporter := newExporter(nil, cfg, testTelemetrySettings)
exporter := newExporter(nil, cfg, componenttest.NewNopTelemetrySettings())
require.NotNil(t, exporter)

now := time.Date(2024, 1, 1, 0, 0, 0, 1000, time.Local)
Expand Down
5 changes: 3 additions & 2 deletions exporter/dorisexporter/exporter_logs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
Expand All @@ -28,11 +29,11 @@ func TestPushLogData(t *testing.T) {
err = config.Validate()
require.NoError(t, err)

exporter := newLogsExporter(nil, config, testTelemetrySettings)
exporter := newLogsExporter(nil, config, componenttest.NewNopTelemetrySettings())

ctx := context.Background()

client, err := createDorisHTTPClient(ctx, config, nil, testTelemetrySettings)
client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
require.NoError(t, err)
require.NotNil(t, client)

Expand Down
5 changes: 3 additions & 2 deletions exporter/dorisexporter/exporter_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
)
Expand All @@ -27,11 +28,11 @@ func TestPushMetricData(t *testing.T) {
err = config.Validate()
require.NoError(t, err)

exporter := newMetricsExporter(nil, config, testTelemetrySettings)
exporter := newMetricsExporter(nil, config, componenttest.NewNopTelemetrySettings())

ctx := context.Background()

client, err := createDorisHTTPClient(ctx, config, nil, testTelemetrySettings)
client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
require.NoError(t, err)
require.NotNil(t, client)

Expand Down
5 changes: 3 additions & 2 deletions exporter/dorisexporter/exporter_traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
semconv "go.opentelemetry.io/collector/semconv/v1.25.0"
Expand All @@ -28,11 +29,11 @@ func TestPushTraceData(t *testing.T) {
err = config.Validate()
require.NoError(t, err)

exporter := newTracesExporter(nil, config, testTelemetrySettings)
exporter := newTracesExporter(nil, config, componenttest.NewNopTelemetrySettings())

ctx := context.Background()

client, err := createDorisHTTPClient(ctx, config, nil, testTelemetrySettings)
client, err := createDorisHTTPClient(ctx, config, nil, componenttest.NewNopTelemetrySettings())
require.NoError(t, err)
require.NotNil(t, client)

Expand Down
3 changes: 2 additions & 1 deletion exporter/loadbalancingexporter/generated_component_telemetry_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions exporter/loadbalancingexporter/internal/metadata/generated_telemetry.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion exporter/lokiexporter/generated_component_telemetry_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading