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

Add update collector version task #30955

Merged
merged 16 commits into from
Nov 15, 2024
Merged

Add update collector version task #30955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
129b06c
Add update collector version task
dineshg13 Nov 11, 2024
03141de
run gotidy
dineshg13 Nov 11, 2024
3f4f637
Merge main + update deps
dineshg13 Nov 12, 2024
0dd36f3
fix lint issues - remove deprecated methods
dineshg13 Nov 13, 2024
a4f7061
Fix dd connector + unit tests
dineshg13 Nov 14, 2024
484c834
merge main + resolve conflicts
dineshg13 Nov 14, 2024
73dca9d
PR feedback - update version
dineshg13 Nov 14, 2024
5bfddcd
update builder-config.yaml
jackgopack4 Nov 14, 2024
a68f745
fix otelcol_version yq in otel.yml
jackgopack4 Nov 14, 2024
068c5de
inv -e go-deps.generate
jackgopack4 Nov 14, 2024
0e94614
Update tasks/collector.py
dineshg13 Nov 14, 2024
1e83398
PR feedback - use github-api
dineshg13 Nov 15, 2024
9c46adb
merge main + resolve conflicts
dineshg13 Nov 15, 2024
34ec735
merge main + resolve conflicts
dineshg13 Nov 15, 2024
2f27ce8
Merge remote-tracking branch 'origin/main' into dinesh.gurumurthy/OTE…
dineshg13 Nov 15, 2024
a408a85
fix e2e tests
dineshg13 Nov 15, 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
4 changes: 2 additions & 2 deletions .gitlab/integration_test/otel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ docker_image_build_otel:
- cp test/integration/docker/otel_agent_build_tests.py /tmp/otel-ci/
- wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O
/usr/bin/yq && chmod +x /usr/bin/yq
- export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.otelcol_version)
- export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.version)
- yq w -i /tmp/otel-ci/manifest.yaml "receivers[+] gomod"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver ${OTELCOL_VERSION}"
- yq w -i /tmp/otel-ci/manifest.yaml "processors[+] gomod"
Expand Down Expand Up @@ -65,7 +65,7 @@ ddflare_extension_ocb_build:
- !reference [.retrieve_linux_go_deps]
- mkdir -p /tmp/otel-ci
- cp test/otel/testdata/* /tmp/otel-ci/
- wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.111.0/ocb_0.111.0_linux_amd64
- wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.113.0/ocb_0.113.0_linux_amd64
- chmod +x /tmp/otel-ci/ocb
script:
- echo 'Building collector with OCB and test ddflare extension'
Expand Down
21 changes: 14 additions & 7 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,8 @@ core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetr
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/handlecount,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper/ucal,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/systemscraper,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/systemscraper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2322,7 +2324,6 @@ core,go.opencensus.io/trace/propagation,Apache-2.0,"Copyright 2018, OpenCensus A
core,go.opencensus.io/trace/tracestate,Apache-2.0,"Copyright 2018, OpenCensus Authors"
core,go.opentelemetry.io/collector/client,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/component,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/component/componentprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/component/componentstatus,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/component/componenttest,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/config/configauth,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2350,23 +2351,26 @@ core,go.opentelemetry.io/collector/connector/connectortest,Apache-2.0,Copyright
core,go.opentelemetry.io/collector/connector/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/consumererror,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/consumererror/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/consumerprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/consumertest,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/consumer/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/debugexporter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/debugexporter/internal/normal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterbatcher,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterhelper,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterhelper/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exporterqueue,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/exportertest,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/internal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/internal/experr,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/internal/otlptext,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/internal/queue,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/nopexporter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/exporter/nopexporter/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
Expand All @@ -2383,13 +2387,11 @@ core,go.opentelemetry.io/collector/extension/zpagesextension,Apache-2.0,Copyrigh
core,go.opentelemetry.io/collector/extension/zpagesextension/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/featuregate,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/filter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/cgroups,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/fanoutconsumer,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/globalgates,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/globalsignal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/httphelper,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/iruntime,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/memorylimiter,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/memorylimiter/cgroups,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/memorylimiter/iruntime,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/internal/sharedcomponent,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/otelcol,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/otelcol/internal/configunmarshaler,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2419,6 +2421,8 @@ core,go.opentelemetry.io/collector/pdata/ptrace,Apache-2.0,Copyright The OpenTel
core,go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/pdata/testdata,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/pipeline,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/pipeline/internal/globalsignal,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/pipeline/pipelineprofiles,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/processor,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/processor/batchprocessor,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2452,6 +2456,7 @@ core,go.opentelemetry.io/collector/semconv/v1.17.0,Apache-2.0,Copyright The Open
core,go.opentelemetry.io/collector/semconv/v1.18.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.25.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.27.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.6.1,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/semconv/v1.8.0,Apache-2.0,Copyright The OpenTelemetry Authors
Expand All @@ -2470,6 +2475,7 @@ core,go.opentelemetry.io/collector/service/internal/zpages,Apache-2.0,Copyright
core,go.opentelemetry.io/collector/service/pipelines,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/telemetry,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/collector/service/telemetry/internal/otelinit,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/contrib/bridges/otelzap,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/contrib/config,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2521,6 +2527,8 @@ core,go.opentelemetry.io/otel/internal/baggage,Apache-2.0,Copyright The OpenTele
core,go.opentelemetry.io/otel/internal/global,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/log,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/log/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/log/global,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/log/internal/global,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/log/noop,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/metric,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/metric/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -2549,7 +2557,6 @@ core,go.opentelemetry.io/otel/semconv/v1.17.0/httpconv,Apache-2.0,Copyright The
core,go.opentelemetry.io/otel/semconv/v1.20.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.21.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.26.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/semconv/v1.4.0,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace/embedded,Apache-2.0,Copyright The OpenTelemetry Authors
core,go.opentelemetry.io/otel/trace/noop,Apache-2.0,Copyright The OpenTelemetry Authors
Expand Down
21 changes: 15 additions & 6 deletions cmd/serverless/dependencies_linux_amd64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,11 @@ github.com/outcaste-io/ristretto/z/simd
github.com/patrickmn/go-cache
github.com/pelletier/go-toml
github.com/philhofer/fwd
github.com/pierrec/lz4/v4
github.com/pierrec/lz4/v4/internal/lz4block
github.com/pierrec/lz4/v4/internal/lz4errors
github.com/pierrec/lz4/v4/internal/lz4stream
github.com/pierrec/lz4/v4/internal/xxh32
github.com/pkg/errors
github.com/pmezard/go-difflib/difflib
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
Expand Down Expand Up @@ -572,7 +577,6 @@ github.com/tklauser/numcpus
github.com/twmb/murmur3
go.opentelemetry.io/collector/client
go.opentelemetry.io/collector/component
go.opentelemetry.io/collector/component/componentprofiles
go.opentelemetry.io/collector/component/componentstatus
go.opentelemetry.io/collector/component/componenttest
go.opentelemetry.io/collector/config/configauth
Expand All @@ -593,23 +597,26 @@ go.opentelemetry.io/collector/connector/connectortest
go.opentelemetry.io/collector/connector/internal
go.opentelemetry.io/collector/consumer
go.opentelemetry.io/collector/consumer/consumererror
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles
go.opentelemetry.io/collector/consumer/consumererror/internal
go.opentelemetry.io/collector/consumer/consumerprofiles
go.opentelemetry.io/collector/consumer/consumertest
go.opentelemetry.io/collector/consumer/internal
go.opentelemetry.io/collector/exporter
go.opentelemetry.io/collector/exporter/debugexporter
go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata
go.opentelemetry.io/collector/exporter/debugexporter/internal/normal
go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext
go.opentelemetry.io/collector/exporter/exporterbatcher
go.opentelemetry.io/collector/exporter/exporterhelper
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles
go.opentelemetry.io/collector/exporter/exporterhelper/internal
go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata
go.opentelemetry.io/collector/exporter/exporterprofiles
go.opentelemetry.io/collector/exporter/exporterqueue
go.opentelemetry.io/collector/exporter/exportertest
go.opentelemetry.io/collector/exporter/internal
go.opentelemetry.io/collector/exporter/internal/experr
go.opentelemetry.io/collector/exporter/internal/otlptext
go.opentelemetry.io/collector/exporter/internal/queue
go.opentelemetry.io/collector/exporter/otlpexporter
go.opentelemetry.io/collector/exporter/otlpexporter/internal/metadata
Expand All @@ -620,8 +627,6 @@ go.opentelemetry.io/collector/extension/extensioncapabilities
go.opentelemetry.io/collector/extension/extensiontest
go.opentelemetry.io/collector/featuregate
go.opentelemetry.io/collector/internal/fanoutconsumer
go.opentelemetry.io/collector/internal/globalgates
go.opentelemetry.io/collector/internal/globalsignal
go.opentelemetry.io/collector/internal/httphelper
go.opentelemetry.io/collector/internal/sharedcomponent
go.opentelemetry.io/collector/otelcol
Expand Down Expand Up @@ -652,6 +657,8 @@ go.opentelemetry.io/collector/pdata/ptrace
go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp
go.opentelemetry.io/collector/pdata/testdata
go.opentelemetry.io/collector/pipeline
go.opentelemetry.io/collector/pipeline/internal/globalsignal
go.opentelemetry.io/collector/pipeline/pipelineprofiles
go.opentelemetry.io/collector/processor
go.opentelemetry.io/collector/processor/batchprocessor
go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata
Expand All @@ -676,6 +683,7 @@ go.opentelemetry.io/collector/receiver/receivertest
go.opentelemetry.io/collector/semconv/v1.17.0
go.opentelemetry.io/collector/semconv/v1.18.0
go.opentelemetry.io/collector/semconv/v1.21.0
go.opentelemetry.io/collector/semconv/v1.26.0
go.opentelemetry.io/collector/semconv/v1.6.1
go.opentelemetry.io/collector/service
go.opentelemetry.io/collector/service/extensions
Expand All @@ -691,6 +699,7 @@ go.opentelemetry.io/collector/service/internal/zpages
go.opentelemetry.io/collector/service/pipelines
go.opentelemetry.io/collector/service/telemetry
go.opentelemetry.io/collector/service/telemetry/internal/otelinit
go.opentelemetry.io/contrib/bridges/otelzap
go.opentelemetry.io/contrib/config
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
Expand Down Expand Up @@ -740,6 +749,8 @@ go.opentelemetry.io/otel/internal/baggage
go.opentelemetry.io/otel/internal/global
go.opentelemetry.io/otel/log
go.opentelemetry.io/otel/log/embedded
go.opentelemetry.io/otel/log/global
go.opentelemetry.io/otel/log/internal/global
go.opentelemetry.io/otel/log/noop
go.opentelemetry.io/otel/metric
go.opentelemetry.io/otel/metric/embedded
Expand All @@ -760,11 +771,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata
go.opentelemetry.io/otel/sdk/resource
go.opentelemetry.io/otel/sdk/trace
go.opentelemetry.io/otel/sdk/trace/tracetest
go.opentelemetry.io/otel/semconv/internal
go.opentelemetry.io/otel/semconv/v1.17.0
go.opentelemetry.io/otel/semconv/v1.20.0
go.opentelemetry.io/otel/semconv/v1.26.0
go.opentelemetry.io/otel/semconv/v1.4.0
go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
go.opentelemetry.io/otel/trace/noop
Expand Down
Loading
Loading