8000 Update OTel dependencies (#1282) · nginx/agent@953cc00 · GitHub
[go: up one dir, main page]
Skip to content

Commit 953cc00

Browse files
dhurleydhurley
authored
Update OTel dependencies (#1282)
1 parent d64abd2 commit 953cc00

File tree

7 files changed

+819
-659
lines changed

7 files changed

+819
-659
lines changed

‎go.mod‎

Lines changed: 229 additions & 175 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 573 additions & 470 deletions
Large diffs are not rendered by default.

‎internal/collector/logsgzipprocessor/processor_benchmark_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ func BenchmarkGzipProcessor_Concurrent(b *testing.B) {
8383
b.ResetTimer()
8484
b.RunParallel(func(pb *testing.PB) {
8585
for pb.Next() {
86-
_ = p.ConsumeLogs(context.Background(), logs)
86+
logsCopy := plog.NewLogs()
87+
logs.CopyTo(logsCopy)
88+
_ = p.ConsumeLogs(context.Background(), logsCopy)
8789
}
8890
})
8991
}

‎internal/collector/nginxossreceiver/internal/scraper/accesslog/nginx_log_scraper.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ const Percentage = 100
3737

3838
type (
3939
NginxLogScraper struct {
40-
outChan <-chan []*entry.Entry
41-
cfg *config.Config
42-
settings receiver.Settings
43-
logger *zap.Logger
4440
mb *metadata.MetricsBuilder
4541
rb *metadata.ResourceBuilder
46-
pipes []*pipeline.DirectedPipeline
42+
logger *zap.Logger
43+
cfg *config.Config
4744
wg *sync.WaitGroup
45+
outChan <-chan []*entry.Entry
4846
cancel context.CancelFunc
47+
pipes []*pipeline.DirectedPipeline
4948
entries []*entry.Entry
5049
operators []operator.Config
50+
settings receiver.Settings
5151
mut sync.Mutex
5252
}
5353

‎internal/collector/nginxossreceiver/internal/scraper/accesslog/operator/input/file/input.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ func (i *Input) Stop() error {
3636
return i.fileConsumer.Stop()
3737
}
3838

39-
func (i *Input) emit(ctx context.Context, tokens [][]byte, attributes map[string]any, lastRecordNumber int64) error {
39+
func (i *Input) emit(
40+
ctx context.Context, tokens [][]byte, attributes map[string]any, lastRecordNumber int64, offsets []int64,
41+
) error {
4042
for _, token := range tokens {
4143
ent, err := i.NewEntry(i.toBody(token))
4244
if err != nil {

‎internal/collector/nginxossreceiver/internal/scraper/accesslog/operator/input/file/input_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package file
77

88
import (
9-
"context"
109
"testing"
1110

1211
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer"
@@ -37,10 +36,10 @@ func TestInput_emit(t *testing.T) {
3736

3837
token := []byte(accessLogLine)
3938

40-
err := input.emit(context.Background(), [][]byte{token}, map[string]any{"attribute1": "test"}, 1)
39+
err := input.emit(t.Context(), [][]byte{token}, map[string]any{"attribute1": "test"}, 1, []int64{})
4140
require.NoError(t, err)
4241

4342
// nil token check
44-
err = input.emit(context.Background(), nil, map[string]any{"attribute1": "test"}, 1)
43+
err = input.emit(t.Context(), nil, map[string]any{"attribute1": "test"}, 1, []int64{})
4544
require.NoError(t, err)
4645
}

‎test/helpers/test_containers_utils.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"os"
1212
"testing"
1313

14-
"github.com/docker/docker/api/types"
14+
"github.com/docker/docker/api/types/build"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717
"github.com/testcontainers/testcontainers-go"
@@ -76,7 +76,7 @@ func StartContainer(
7676
"IMAGE_PATH": ToPtr(imagePath),
7777
"TAG": ToPtr(tag),
7878
},
79-
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
79+
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
8080
buildOptions.Target = buildTarget
8181
},
8282
},
@@ -154,7 +154,7 @@ func StartAgentlessContainer(
154154
"IMAGE_PATH": ToPtr(imagePath),
155155
"TAG": ToPtr(tag),
156156
},
157-
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
157+
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
158158
buildOptions.Target = "install-nginx"
159159
},
160160
},
@@ -215,7 +215,7 @@ func StartNginxLessContainer(
215215
"IMAGE_PATH": ToPtr(imagePath),
216216
"TAG": ToPtr(tag),
217217
},
218-
BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
218+
BuildOptionsModifier: func(buildOptions *build.ImageBuildOptions) {
219219
buildOptions.Target = buildTarget
220220
},
221221
},

0 commit comments

Comments
 (0)
0