diff --git a/internal/stanza/frompdataconverter.go b/internal/stanza/frompdataconverter.go index d53aa7e96e1b..5b2eb677e431 100644 --- a/internal/stanza/frompdataconverter.go +++ b/internal/stanza/frompdataconverter.go @@ -22,19 +22,18 @@ import ( "time" "github.com/open-telemetry/opentelemetry-log-collection/entry" - "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" ) -// FromPdataConverter converts a set of entry.Entry into pdata.Logs +// FromPdataConverter converts a set of entry.Entry into plog.Logs // // The diagram below illustrates the internal communication inside the FromPdataConverter: // // ┌─────────────────────────────────┐ // │ Batch() │ -// ┌─────────┤ Ingests pdata.Logs, splits up │ +// ┌─────────┤ Ingests plog.Logs, splits up │ // │ │ and places them on workerChan │ // │ └─────────────────────────────────┘ // │ @@ -107,9 +106,9 @@ func (c *FromPdataConverter) OutChannel() <-chan []*entry.Entry { } type fromConverterWorkerItem struct { - Resource pdata.Resource - LogRecordSlice pdata.LogRecordSlice - Scope pdata.ScopeLogs + Resource pcommon.Resource + LogRecordSlice plog.LogRecordSlice + Scope plog.ScopeLogs } // workerLoop is responsible for obtaining pdata logs from Batch() calls, @@ -136,8 +135,8 @@ func (c *FromPdataConverter) workerLoop() { } } -// Batch takes in an set of pdata.Logs and sends it to an available worker for processing. -func (c *FromPdataConverter) Batch(pLogs pdata.Logs) error { +// Batch takes in an set of plog.Logs and sends it to an available worker for processing. +func (c *FromPdataConverter) Batch(pLogs plog.Logs) error { for i := 0; i < pLogs.ResourceLogs().Len(); i++ { rls := pLogs.ResourceLogs().At(i) for j := 0; j < rls.ScopeLogs().Len(); j++ { @@ -174,10 +173,10 @@ func convertFromLogs(workerItem fromConverterWorkerItem) []*entry.Entry { return result } -// ConvertFrom converts pdata.Logs into a slice of entry.Entry +// ConvertFrom converts plog.Logs into a slice of entry.Entry // To be used in a stateless setting like tests where ease of use is more // important than performance or throughput. -func ConvertFrom(pLogs pdata.Logs) []*entry.Entry { +func ConvertFrom(pLogs plog.Logs) []*entry.Entry { result := make([]*entry.Entry, 0, pLogs.LogRecordCount()) for i := 0; i < pLogs.ResourceLogs().Len(); i++ { rls := pLogs.ResourceLogs().At(i) @@ -189,8 +188,8 @@ func ConvertFrom(pLogs pdata.Logs) []*entry.Entry { return result } -// convertFrom converts pdata.LogRecord into provided entry.Entry. -func convertFrom(src pdata.LogRecord, ent *entry.Entry) { +// convertFrom converts plog.LogRecord into provided entry.Entry. +func convertFrom(src plog.LogRecord, ent *entry.Entry) { // if src.Timestamp == 0, then leave ent.Timestamp as nil if src.Timestamp() != 0 { ent.Timestamp = src.Timestamp().AsTime() @@ -223,16 +222,16 @@ func convertFrom(src pdata.LogRecord, ent *entry.Entry) { } } -func valueToMap(value pdata.Map) map[string]interface{} { +func valueToMap(value pcommon.Map) map[string]interface{} { rawMap := map[string]interface{}{} - value.Range(func(k string, v pdata.Value) bool { + value.Range(func(k string, v pcommon.Value) bool { rawMap[k] = valueToInterface(v) return true }) return rawMap } -func valueToInterface(value pdata.Value) interface{} { +func valueToInterface(value pcommon.Value) interface{} { switch value.Type() { case pcommon.ValueTypeEmpty: return nil @@ -259,7 +258,7 @@ func valueToInterface(value pdata.Value) interface{} { } } -var fromPdataSevMap = map[pdata.SeverityNumber]entry.Severity{ +var fromPdataSevMap = map[plog.SeverityNumber]entry.Severity{ plog.SeverityNumberUNDEFINED: entry.Default, plog.SeverityNumberTRACE: entry.Trace, plog.SeverityNumberTRACE2: entry.Trace2, diff --git a/internal/stanza/frompdataconverter_test.go b/internal/stanza/frompdataconverter_test.go index 1a4a8ea8203d..c2268607ef09 100644 --- a/internal/stanza/frompdataconverter_test.go +++ b/internal/stanza/frompdataconverter_test.go @@ -22,14 +22,13 @@ import ( "github.com/open-telemetry/opentelemetry-log-collection/entry" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" ) func BenchmarkConvertFromPdataSimple(b *testing.B) { b.StopTimer() - pLogs := pdata.NewLogs() + pLogs := plog.NewLogs() b.StartTimer() for i := 0; i < b.N; i++ { @@ -47,7 +46,7 @@ func BenchmarkConvertFromPdataComplex(b *testing.B) { } } -func baseMap() pdata.Map { +func baseMap() pcommon.Map { obj := pcommon.NewMap() arr := pcommon.NewValueSlice() arr.SliceVal().AppendEmpty().SetStringVal("666") @@ -61,15 +60,15 @@ func baseMap() pdata.Map { return obj } -func baseMapValue() pdata.Value { +func baseMapValue() pcommon.Value { v := pcommon.NewValueMap() baseMap := baseMap() baseMap.CopyTo(v.MapVal()) return v } -func complexPdataForNDifferentHosts(count int, n int) pdata.Logs { - pLogs := pdata.NewLogs() +func complexPdataForNDifferentHosts(count int, n int) plog.Logs { + pLogs := plog.NewLogs() logs := pLogs.ResourceLogs() for i := 0; i < count; i++ { @@ -125,7 +124,7 @@ func TestRoundTrip(t *testing.T) { require.Equal(t, initialLogs, pLogs) } -func sortComplexData(pLogs pdata.Logs) { +func sortComplexData(pLogs plog.Logs) { pLogs.ResourceLogs().At(0).Resource().Attributes().Sort() attrObject, _ := pLogs.ResourceLogs().At(0).Resource().Attributes().Get("object") attrObject.MapVal().Sort() @@ -222,7 +221,7 @@ func TestConvertFrom(t *testing.T) { func TestConvertFromSeverity(t *testing.T) { cases := []struct { expectedSeverity entry.Severity - severityNumber pdata.SeverityNumber + severityNumber plog.SeverityNumber }{ {entry.Default, plog.SeverityNumberUNDEFINED}, {entry.Trace, plog.SeverityNumberTRACE}, @@ -254,7 +253,7 @@ func TestConvertFromSeverity(t *testing.T) { for _, tc := range cases { t.Run(fmt.Sprintf("%v", tc.severityNumber), func(t *testing.T) { entry := entry.New() - logRecord := pdata.NewLogRecord() + logRecord := plog.NewLogRecord() logRecord.SetSeverityNumber(tc.severityNumber) convertFrom(logRecord, entry) require.Equal(t, tc.expectedSeverity, entry.Severity) diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index 4382fde754c3..e06d1caa8901 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -7,7 +7,6 @@ require ( github.com/open-telemetry/opentelemetry-log-collection v0.29.1 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 - go.opentelemetry.io/collector/model v0.50.0 go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/trace v1.7.0 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index c788dbca2761..eb13f81fb2ca 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -209,8 +209,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index a85255beff2e..4a0c2a709d30 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -8,7 +8,6 @@ require ( github.com/open-telemetry/opentelemetry-log-collection v0.29.1 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 - go.opentelemetry.io/collector/model v0.50.0 go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 go.uber.org/zap v1.21.0 gonum.org/v1/gonum v0.11.0 diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 12c07f8cdea1..e3d173c7c94f 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -210,8 +210,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= diff --git a/processor/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go index e44b330ee836..94d8f56ef78e 100644 --- a/processor/logstransformprocessor/processor.go +++ b/processor/logstransformprocessor/processor.go @@ -26,7 +26,7 @@ import ( "github.com/open-telemetry/opentelemetry-log-collection/pipeline" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" "gonum.org/v1/gonum/graph/topo" @@ -34,7 +34,7 @@ import ( ) type outputType struct { - logs pdata.Logs + logs plog.Logs err error } @@ -146,7 +146,7 @@ func (ltp *logsTransformProcessor) Start(ctx context.Context, host component.Hos return nil } -func (ltp *logsTransformProcessor) processLogs(ctx context.Context, ld pdata.Logs) (pdata.Logs, error) { +func (ltp *logsTransformProcessor) processLogs(ctx context.Context, ld plog.Logs) (plog.Logs, error) { // Add the logs to the chain err := ltp.fromConverter.Batch(ld) if err != nil { diff --git a/processor/logstransformprocessor/processor_test.go b/processor/logstransformprocessor/processor_test.go index 035d138cc09f..f3ff5a46c78d 100644 --- a/processor/logstransformprocessor/processor_test.go +++ b/processor/logstransformprocessor/processor_test.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -63,15 +62,15 @@ func parseTime(format, input string) *time.Time { } type testLogMessage struct { - body *pdata.Value + body pcommon.Value time *time.Time observedTime *time.Time - severity pdata.SeverityNumber + severity plog.SeverityNumber severityText *string - spanID *pdata.SpanID - traceID *pdata.TraceID + spanID pcommon.SpanID + traceID pcommon.TraceID flags uint32 - attributes *map[string]pdata.Value + attributes *map[string]pcommon.Value } func TestLogsTransformProcessor(t *testing.T) { @@ -91,47 +90,47 @@ func TestLogsTransformProcessor(t *testing.T) { config: cfg, sourceMessages: []testLogMessage{ { - body: &baseMessage, - spanID: &spanID, - traceID: &traceID, + body: baseMessage, + spanID: spanID, + traceID: traceID, flags: uint32(0x01), observedTime: parseTime("2006-01-02", "2022-01-02"), }, { - body: &baseMessage, - spanID: &spanID, - traceID: &traceID, + body: baseMessage, + spanID: spanID, + traceID: traceID, flags: uint32(0x02), observedTime: parseTime("2006-01-02", "2022-01-03"), }, }, parsedMessages: []testLogMessage{ { - body: &baseMessage, + body: baseMessage, severity: plog.SeverityNumberINFO, severityText: &infoSeverityText, - attributes: &map[string]pdata.Value{ + attributes: &map[string]pcommon.Value{ "msg": pcommon.NewValueString("this is a test message"), "time": pcommon.NewValueString("2022-01-01 01:02:03"), "sev": pcommon.NewValueString("INFO"), }, - spanID: &spanID, - traceID: &traceID, + spanID: spanID, + traceID: traceID, flags: uint32(0x01), observedTime: parseTime("2006-01-02", "2022-01-02"), time: parseTime("2006-01-02 15:04:05", "2022-01-01 01:02:03"), }, { - body: &baseMessage, + body: baseMessage, severity: plog.SeverityNumberINFO, severityText: &infoSeverityText, - attributes: &map[string]pdata.Value{ + attributes: &map[string]pcommon.Value{ "msg": pcommon.NewValueString("this is a test message"), "time": pcommon.NewValueString("2022-01-01 01:02:03"), "sev": pcommon.NewValueString("INFO"), }, - spanID: &spanID, - traceID: &traceID, + spanID: spanID, + traceID: traceID, flags: uint32(0x02), observedTime: parseTime("2006-01-02", "2022-01-03"), time: parseTime("2006-01-02 15:04:05", "2022-01-01 01:02:03"), @@ -166,19 +165,17 @@ func TestLogsTransformProcessor(t *testing.T) { } } -func generateLogData(messages []testLogMessage) pdata.Logs { +func generateLogData(messages []testLogMessage) plog.Logs { ld := testdata.GenerateLogsOneEmptyResourceLogs() scope := ld.ResourceLogs().At(0).ScopeLogs().AppendEmpty() for _, content := range messages { log := scope.LogRecords().AppendEmpty() - if content.body != nil { - content.body.CopyTo(log.Body()) - } + content.body.CopyTo(log.Body()) if content.time != nil { - log.SetTimestamp(pdata.NewTimestampFromTime(*content.time)) + log.SetTimestamp(pcommon.NewTimestampFromTime(*content.time)) } if content.observedTime != nil { - log.SetObservedTimestamp(pdata.NewTimestampFromTime(*content.observedTime)) + log.SetObservedTimestamp(pcommon.NewTimestampFromTime(*content.observedTime)) } if content.severity != 0 { log.SetSeverityNumber(content.severity) @@ -193,13 +190,8 @@ func generateLogData(messages []testLogMessage) pdata.Logs { log.Attributes().Sort() } - if content.spanID != nil { - log.SetSpanID(*content.spanID) - } - - if content.traceID != nil { - log.SetTraceID(*content.traceID) - } + log.SetSpanID(content.spanID) + log.SetTraceID(content.traceID) if content.flags != uint32(0x00) { log.SetFlags(content.flags) diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 579cbc4425b1..8d3f080d262d 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -31,7 +31,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.50.0 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/metric v0.30.0 // indirect go.opentelemetry.io/otel/trace v1.7.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index f6f94fc986d7..b80c4a84b704 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -215,8 +215,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 6c463c07a31d..d4dbfdaf46d4 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -26,7 +26,6 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.50.0 // indirect go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/metric v0.30.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 177beb434ad4..0f358d1c58e4 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -210,8 +210,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 7445beb8f357..f3877196a472 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -29,7 +29,6 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.50.0 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/metric v0.30.0 // indirect go.opentelemetry.io/otel/trace v1.7.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index cc485ccf3614..82596a231185 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -215,8 +215,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index f3f337f598fc..2650445c812c 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -27,7 +27,6 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.50.0 // indirect go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/metric v0.30.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 4b1d5ebc5a11..ebff0ce4dfb4 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -212,8 +212,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 7cfe19bd5aec..439493d70a88 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -26,7 +26,6 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.50.0 // indirect go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 // indirect go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/metric v0.30.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 177beb434ad4..0f358d1c58e4 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -210,8 +210,6 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7 h1:EdzWPAR5/XWh6FjjCaqPBmbB62HIpeataITjfXQKS6U= go.opentelemetry.io/collector v0.50.1-0.20220429151328-041f39835df7/go.mod h1:Qer3GgFX3WkQFz/dRm7pHCITu8Yp6RxWg4Oh4mOmdPc= -go.opentelemetry.io/collector/model v0.50.0 h1:1wt8pQ4O6GaUeYEaR+dh3zHmYsFicduF2bbPGMZeSKk= -go.opentelemetry.io/collector/model v0.50.0/go.mod h1:vKpC0JMtrL7g9tUHmzcQqd8rEbnahKVdTWZSVO7x3Ms= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7 h1:CVS7mnrDVyeW+9tZ8ficfHGpYAbySGZoZFyuWZmqIzE= go.opentelemetry.io/collector/pdata v0.50.1-0.20220429151328-041f39835df7/go.mod h1:jrnUDnlHCTSKf9H7LYTmldQUmNQmPvilNNG/cKlv8Lc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU=