Update to opentelemetry-collector v0.34.0 (#6106)

* Update otel-collector to v0.34.0 * processor/otel: use model/semconv package * Use opentelemetry-collector-contrib/pkg/translator/jaeger * processor/otel: adapt to upstream metrics changes - no more distrinct Int/Double metric types, but there are now Int/Double numeric values - labels replaced with attributes

Author: axw

NOTICE.txt

@@ -21,8 +21,8 @@ import (
 "context"
 
 "github.com/jaegertracing/jaeger/model"
+jaegertranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 "go.opentelemetry.io/collector/consumer"
-trjaeger "go.opentelemetry.io/collector/translator/trace/jaeger"
 
 "github.com/elastic/beats/v7/libbeat/monitoring"
 
@@ -51,6 +51,6 @@ func consumeBatch(
 ) error {
 spanCount := int64(len(batch.Spans))
 requestMetrics.add(request.IDEventReceivedCount, spanCount)
-traces := trjaeger.ProtoBatchToInternalTraces(batch)
+traces := jaegertranslator.ProtoBatchToInternalTraces(batch)
 return consumer.ConsumeTraces(ctx, traces)
 }

beater/jaeger/common.go

@@ -25,11 +25,11 @@ import (
 "time"
 
 "github.com/jaegertracing/jaeger/proto-gen/api_v2"
+jaegertranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"
 "go.opentelemetry.io/collector/consumer"
 "go.opentelemetry.io/collector/model/pdata"
-"go.opentelemetry.io/collector/translator/trace/jaeger"
 
 "github.com/elastic/beats/v7/libbeat/common"
 "github.com/elastic/beats/v7/libbeat/logp"
@@ -90,7 +90,7 @@ func (tc *testGRPCCollector) setup(t *testing.T) {
 span1.SetTraceID(pdata.NewTraceID([16]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}))
 span1.SetSpanID(pdata.NewSpanID([8]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}))
 
-batches, err := jaeger.InternalTracesToJaegerProto(traces)
+batches, err := jaegertranslator.InternalTracesToJaegerProto(traces)
 require.NoError(t, err)
 require.Len(t, batches, 1)
 tc.request = &api_v2.PostSpansRequest{Batch: *batches[0]}

beater/jaeger/grpc_test.go

@@ -19,6 +19,7 @@ https://github.com/elastic/apm-server/compare/7.13\...master[View commits]
 - Fix apm_error_grouping_name and apm_convert_destination_address {pull}5876[5876]
 - corrected OTel attribute names for `net.host.connection.*` {pull}5671[5671]
 - Fix response to agent config when running under Fleet with no agent config defined {pull}5917[5917]
+- Fix handling of OTLP sum/gauge metrics with integer values {pull}6106[6106]
 
 [float]
 ==== Intake API Changes

changelogs/head.asciidoc

@@ -5,9 +5,13 @@ go 1.13
 require (
 github.com/DataDog/zstd v1.4.4 // indirect
 github.com/apache/thrift v0.14.2
+github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 github.com/cespare/xxhash/v2 v2.1.1
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
+github.com/coreos/bbolt v1.3.2 // indirect
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
 github.com/dlclark/regexp2 v1.4.0 // indirect
 github.com/dop251/goja v0.0.0-20210810150349-acd0507c3d6f // indirect
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 // indirect
@@ -20,33 +24,41 @@ require (
 github.com/elastic/go-elasticsearch/v8 v8.0.0-20210727161915-8cf93274b968
 github.com/elastic/go-hdrhistogram v0.1.0
 github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6
+github.com/go-kit/kit v0.10.0 // indirect
+github.com/go-openapi/analysis v0.20.1 // indirect
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible
 github.com/gofrs/uuid v4.0.0+incompatible
 github.com/gogo/protobuf v1.3.2
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9
 github.com/hashicorp/errwrap v1.1.0 // indirect
 github.com/hashicorp/go-multierror v1.1.1
 github.com/hashicorp/golang-lru v0.5.4
-github.com/jaegertracing/jaeger v1.24.0
+github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
+github.com/jaegertracing/jaeger v1.25.0
 github.com/josephspurrier/goversioninfo v1.3.0 // indirect
 github.com/json-iterator/go v1.1.11
 github.com/jstemmer/go-junit-report v0.9.1
 github.com/libp2p/go-reuseport v0.0.2
 github.com/magefile/mage v1.11.0
+github.com/mailru/easyjson v0.7.7 // indirect
 github.com/mattn/go-isatty v0.0.13 // indirect
 github.com/mitchellh/hashstructure v1.1.0 // indirect
 github.com/modern-go/reflect2 v1.0.1
+github.com/oklog/run v1.1.0 // indirect
+github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.34.0 // indirect
 github.com/patrickmn/go-cache v2.1.0+incompatible
 github.com/pkg/errors v0.9.1
 github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
 github.com/prometheus/procfs v0.7.2 // indirect
+github.com/prometheus/tsdb v0.7.1 // indirect
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 github.com/ryanuber/go-glob v1.0.0
 github.com/spf13/cobra v1.2.1
 github.com/spf13/pflag v1.0.5
 github.com/stretchr/testify v1.7.0
 github.com/tidwall/gjson v1.6.5
 github.com/tidwall/sjson v1.1.1
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a // indirect
 github.com/xeipuuv/gojsonschema v1.2.0
 go.elastic.co/apm v1.13.1
@@ -55,8 +67,9 @@ require (
 go.elastic.co/apm/module/apmhttp v1.12.0
 go.elastic.co/ecszap v1.0.0 // indirect
 go.elastic.co/fastjson v1.1.0
-go.opentelemetry.io/collector v0.30.0
-go.opentelemetry.io/collector/model v0.30.0
+go.mongodb.org/mongo-driver v1.5.2 // indirect
+go.opentelemetry.io/collector v0.34.0
+go.opentelemetry.io/collector/model v0.34.0
 go.uber.org/atomic v1.9.0
 go.uber.org/multierr v1.7.0 // indirect
 go.uber.org/zap v1.19.0