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.

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

[7.x] Update opentelemetry-collector to v0.30.0 (backport #5749) #5792

Merged
merged 2 commits into from
Jul 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 23, 2021

This is an automatic backport of pull request #5749 done by Mergify.
Cherry-pick of 3de7384 has failed:

On branch mergify/bp/7.x/pr-5749
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 3de7384b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   beater/jaeger/grpc_test.go
	modified:   beater/jaeger/http_test.go
	modified:   beater/otlp/grpc.go
	modified:   beater/otlp/grpc_test.go
	modified:   internal/.otel_collector_mixin/receiver/otlpreceiver/mixin.go
	modified:   internal/otel_collector/CHANGELOG.md
	modified:   internal/otel_collector/Makefile
	modified:   internal/otel_collector/cmd/otelcol/main.go
	modified:   internal/otel_collector/cmd/otelcol/main_others.go
	modified:   internal/otel_collector/cmd/otelcol/main_windows.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/base_fields.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/base_slices.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/common_structs.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/log_structs.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/metrics_structs.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/resource_structs.go
	modified:   internal/otel_collector/cmd/pdatagen/internal/trace_structs.go
	modified:   internal/otel_collector/cmd/pdatagen/main.go
	modified:   internal/otel_collector/component/componenttest/nop_exporter.go
	modified:   internal/otel_collector/component/componenttest/nop_extension.go
	modified:   internal/otel_collector/component/componenttest/nop_processor.go
	modified:   internal/otel_collector/component/componenttest/nop_receiver.go
	modified:   internal/otel_collector/component/componenttest/shutdown_verifier.go
	modified:   internal/otel_collector/component/exporter.go
	modified:   internal/otel_collector/component/extension.go
	modified:   internal/otel_collector/component/host.go
	modified:   internal/otel_collector/component/processor.go
	modified:   internal/otel_collector/component/receiver.go
	modified:   internal/otel_collector/config/configcheck/configcheck.go
	modified:   internal/otel_collector/config/configgrpc/README.md
	modified:   internal/otel_collector/config/configgrpc/configgrpc.go
	modified:   internal/otel_collector/config/confighttp/confighttp.go
	modified:   internal/otel_collector/config/configloader/config.go
	modified:   internal/otel_collector/config/configparser/parser.go
	modified:   internal/otel_collector/config/configtls/README.md
	modified:   internal/otel_collector/config/configtls/configtls.go
	modified:   internal/otel_collector/config/internal/configsource/manager.go
	modified:   internal/otel_collector/consumer/consumer.go
	modified:   internal/otel_collector/consumer/consumererror/permanent.go
	modified:   internal/otel_collector/consumer/consumererror/signalerrors.go
	modified:   internal/otel_collector/consumer/consumerhelper/common.go
	modified:   internal/otel_collector/consumer/consumerhelper/logs.go
	modified:   internal/otel_collector/consumer/consumerhelper/metrics.go
	modified:   internal/otel_collector/consumer/consumerhelper/traces.go
	modified:   internal/otel_collector/consumer/consumertest/base_consumer.go
	modified:   internal/otel_collector/consumer/consumertest/consumer.go
	modified:   internal/otel_collector/consumer/consumertest/err.go
	modified:   internal/otel_collector/consumer/consumertest/nop.go
	modified:   internal/otel_collector/consumer/consumertest/sink.go
	deleted:    internal/otel_collector/consumer/pdata/common.go
	deleted:    internal/otel_collector/consumer/pdata/doc.go
	deleted:    internal/otel_collector/consumer/pdata/generated_common.go
	deleted:    internal/otel_collector/consumer/pdata/generated_log.go
	deleted:    internal/otel_collector/consumer/pdata/generated_metrics.go
	deleted:    internal/otel_collector/consumer/pdata/generated_resource.go
	deleted:    internal/otel_collector/consumer/pdata/generated_trace.go
	deleted:    internal/otel_collector/consumer/pdata/logs.go
	deleted:    internal/otel_collector/consumer/pdata/metrics.go
	deleted:    internal/otel_collector/consumer/pdata/spanid.go
	deleted:    internal/otel_collector/consumer/pdata/timestamp.go
	deleted:    internal/otel_collector/consumer/pdata/traceid.go
	deleted:    internal/otel_collector/consumer/pdata/traces.go
	deleted:    internal/otel_collector/consumer/simple/metrics.go
	modified:   internal/otel_collector/docs/metric-metadata.yaml
	modified:   internal/otel_collector/docs/service-extensions.md
	renamed:    internal/otel_collector/consumer/simple/doc.go -> internal/otel_collector/exporter/exporterhelper/doc.go
	modified:   internal/otel_collector/exporter/exporterhelper/logs.go
	modified:   internal/otel_collector/exporter/exporterhelper/metrics.go
	modified:   internal/otel_collector/exporter/exporterhelper/queued_retry.go
	modified:   internal/otel_collector/exporter/exporterhelper/resource_to_label.go
	modified:   internal/otel_collector/exporter/exporterhelper/traces.go
	renamed:    internal/otel_collector/internal/model/errors.go -> internal/otel_collector/exporter/fileexporter/doc.go
	modified:   internal/otel_collector/exporter/fileexporter/factory.go
	modified:   internal/otel_collector/exporter/fileexporter/file_exporter.go
	modified:   internal/otel_collector/exporter/jaegerexporter/doc.go
	modified:   internal/otel_collector/exporter/jaegerexporter/exporter.go
	modified:   internal/otel_collector/exporter/jaegerexporter/factory.go
	renamed:    internal/.otel_collector_mixin/otlptext/mixin.go -> internal/otel_collector/exporter/kafkaexporter/doc.go
	modified:   internal/otel_collector/exporter/kafkaexporter/factory.go
	modified:   internal/otel_collector/exporter/kafkaexporter/jaeger_marshaler.go
	modified:   internal/otel_collector/exporter/kafkaexporter/kafka_exporter.go
	modified:   internal/otel_collector/exporter/kafkaexporter/marshaler.go
	deleted:    internal/otel_collector/exporter/kafkaexporter/otlp_marshaler.go
	new file:   internal/otel_collector/exporter/kafkaexporter/pdata_marshaler.go
	renamed:    internal/otel_collector/otlptext/mixin.go -> internal/otel_collector/exporter/loggingexporter/doc.go
	modified:   internal/otel_collector/exporter/loggingexporter/factory.go
	modified:   internal/otel_collector/exporter/loggingexporter/logging_exporter.go
	new file:   internal/otel_collector/exporter/opencensusexporter/doc.go
	modified:   internal/otel_collector/exporter/opencensusexporter/factory.go
	modified:   internal/otel_collector/exporter/opencensusexporter/opencensus.go
	new file:   internal/otel_collector/exporter/otlpexporter/doc.go
	modified:   internal/otel_collector/exporter/otlpexporter/factory.go
	modified:   internal/otel_collector/exporter/otlpexporter/otlp.go
	new file:   internal/otel_collector/exporter/otlphttpexporter/doc.go
	modified:   internal/otel_collector/exporter/otlphttpexporter/factory.go
	modified:   internal/otel_collector/exporter/otlphttpexporter/otlp.go
	modified:   internal/otel_collector/exporter/prometheusexporter/accumulator.go
	modified:   internal/otel_collector/exporter/prometheusexporter/collector.go
	new file:   internal/otel_collector/exporter/prometheusexporter/doc.go
	modified:   internal/otel_collector/exporter/prometheusexporter/factory.go
	modified:   internal/otel_collector/exporter/prometheusexporter/prometheus.go
	new file:   internal/otel_collector/exporter/prometheusremotewriteexporter/doc.go
	modified:   internal/otel_collector/exporter/prometheusremotewriteexporter/exporter.go
	modified:   internal/otel_collector/exporter/prometheusremotewriteexporter/factory.go
	modified:   internal/otel_collector/exporter/prometheusremotewriteexporter/helper.go
	new file:   internal/otel_collector/exporter/zipkinexporter/doc.go
	modified:   internal/otel_collector/exporter/zipkinexporter/factory.go
	modified:   internal/otel_collector/exporter/zipkinexporter/zipkin.go
	modified:   internal/otel_collector/extension/ballastextension/README.md
	modified:   internal/otel_collector/extension/ballastextension/config.go
	modified:   internal/otel_collector/extension/ballastextension/factory.go
	modified:   internal/otel_collector/extension/ballastextension/memory_ballast.go
	modified:   internal/otel_collector/extension/ballastextension/testdata/config.yaml
	new file:   internal/otel_collector/extension/ballastextension/testdata/config_invalid.yaml
	modified:   internal/otel_collector/go.mod
	modified:   internal/otel_collector/go.sum
	modified:   internal/otel_collector/internal/buildscripts/compare-apidiff.sh
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/cgroup.go -> internal/otel_collector/internal/cgroups/cgroup.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/cgroups.go -> internal/otel_collector/internal/cgroups/cgroups.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/doc.go -> internal/otel_collector/internal/cgroups/doc.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/errors.go -> internal/otel_collector/internal/cgroups/errors.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/mountpoint.go -> internal/otel_collector/internal/cgroups/mountpoint.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/subsys.go -> internal/otel_collector/internal/cgroups/subsys.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_period_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/cpu/cpu.cfs_quota_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/empty/cpu.cfs_quota_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/invalid/cpu.cfs_quota_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/undefined-period/cpu.cfs_quota_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_period_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us -> internal/otel_collector/internal/cgroups/testdata/cgroups/undefined/cpu.cfs_quota_us
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/cgroup -> internal/otel_collector/internal/cgroups/testdata/proc/cgroups/cgroup
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/cgroups/mountinfo -> internal/otel_collector/internal/cgroups/testdata/proc/cgroups/mountinfo
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/invalid-cgroup/cgroup -> internal/otel_collector/internal/cgroups/testdata/proc/invalid-cgroup/cgroup
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo -> internal/otel_collector/internal/cgroups/testdata/proc/invalid-mountinfo/mountinfo
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/cgroup -> internal/otel_collector/internal/cgroups/testdata/proc/untranslatable/cgroup
	renamed:    internal/otel_collector/processor/memorylimiter/internal/cgroups/testdata/proc/untranslatable/mountinfo -> internal/otel_collector/internal/cgroups/testdata/proc/untranslatable/mountinfo
	deleted:    internal/otel_collector/internal/data/.gitignore
	deleted:    internal/otel_collector/internal/data/bytesid.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/logs/v1/logs_service.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/logs/v1/logs_service.pb.gw.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/metrics/v1/metrics_service.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/metrics/v1/metrics_service.pb.gw.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/trace/v1/trace_config.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/trace/v1/trace_service.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/trace/v1/trace_service.pb.gw.go
	deleted:    internal/otel_collector/internal/data/protogen/collector/trace/v1/trace_service_gateway_aliases.go
	deleted:    internal/otel_collector/internal/data/protogen/common/v1/common.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/logs/v1/logs.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/metrics/v1/metrics.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/resource/v1/resource.pb.go
	deleted:    internal/otel_collector/internal/data/protogen/trace/v1/trace.pb.go
	deleted:    internal/otel_collector/internal/data/spanid.go
	deleted:    internal/otel_collector/internal/data/traceid.go
	modified:   internal/otel_collector/internal/goldendataset/metrics_gen.go
	modified:   internal/otel_collector/internal/goldendataset/pict_metrics_gen.go
	modified:   internal/otel_collector/internal/goldendataset/resource_generator.go
	modified:   internal/otel_collector/internal/goldendataset/span_generator.go
	modified:   internal/otel_collector/internal/goldendataset/testdata/pict_input_metrics.txt
	modified:   internal/otel_collector/internal/goldendataset/traces_generator.go
	modified:   internal/otel_collector/internal/idutils/big_endian_converter.go
	modified:   internal/otel_collector/internal/internalconsumertest/err_or_sink_consumer.go
	new file:   internal/otel_collector/internal/iruntime/mem_info.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/iruntime/total_memory_linux.go -> internal/otel_collector/internal/iruntime/total_memory_linux.go
	renamed:    internal/otel_collector/processor/memorylimiter/internal/iruntime/total_memory_other.go -> internal/otel_collector/internal/iruntime/total_memory_other.go
	deleted:    internal/otel_collector/internal/model/README.md
	deleted:    internal/otel_collector/internal/model/decoder.go
	deleted:    internal/otel_collector/internal/model/encoder.go
	deleted:    internal/otel_collector/internal/model/encoding.go
	deleted:    internal/otel_collector/internal/model/from_translator.go
	deleted:    internal/otel_collector/internal/model/marshaler.go
	deleted:    internal/otel_collector/internal/model/to_translator.go
	deleted:    internal/otel_collector/internal/model/unmarshal.go
	deleted:    internal/otel_collector/internal/otlp/from_translator.go
	deleted:    internal/otel_collector/internal/otlp/json_decoder.go
	deleted:    internal/otel_collector/internal/otlp/json_encoder.go
	deleted:    internal/otel_collector/internal/otlp/marshaler.go
	deleted:    internal/otel_collector/internal/otlp/to_translator.go
	deleted:    internal/otel_collector/internal/otlp/unmarshaler.go
	deleted:    internal/otel_collector/internal/otlp_wrapper.go
	modified:   internal/otel_collector/internal/otlptext/databuffer.go
	modified:   internal/otel_collector/internal/otlptext/logs.go
	modified:   internal/otel_collector/internal/otlptext/metrics.go
	modified:   internal/otel_collector/internal/otlptext/traces.go
	deleted:    internal/otel_collector/internal/pdatagrpc/logs.go
	deleted:    internal/otel_collector/internal/pdatagrpc/metrics.go
	deleted:    internal/otel_collector/internal/pdatagrpc/traces.go
	modified:   internal/otel_collector/internal/processor/filterexpr/matcher.go
	modified:   internal/otel_collector/internal/processor/filterhelper/filterhelper.go
	modified:   internal/otel_collector/internal/processor/filterlog/filterlog.go
	modified:   internal/otel_collector/internal/processor/filtermatcher/attributematcher.go
	modified:   internal/otel_collector/internal/processor/filtermatcher/filtermatcher.go
	modified:   internal/otel_collector/internal/processor/filtermetric/expr_matcher.go
	modified:   internal/otel_collector/internal/processor/filtermetric/filtermetric.go
	modified:   internal/otel_collector/internal/processor/filtermetric/name_matcher.go
	modified:   internal/otel_collector/internal/processor/filterspan/filterspan.go
	modified:   internal/otel_collector/internal/testcomponents/example_exporter.go
	modified:   internal/otel_collector/internal/testdata/common.go
	modified:   internal/otel_collector/internal/testdata/log.go
	modified:   internal/otel_collector/internal/testdata/metric.go
	modified:   internal/otel_collector/internal/testdata/resource.go
	modified:   internal/otel_collector/internal/testdata/trace.go
	modified:   internal/otel_collector/obsreport/obsreport.go
	modified:   internal/otel_collector/obsreport/obsreport_exporter.go
	modified:   internal/otel_collector/obsreport/obsreport_receiver.go
	modified:   internal/otel_collector/obsreport/obsreport_scraper.go
	modified:   internal/otel_collector/processor/attributesprocessor/attributes_log.go
	modified:   internal/otel_collector/processor/attributesprocessor/attributes_trace.go
	modified:   internal/otel_collector/processor/attributesprocessor/factory.go
	modified:   internal/otel_collector/processor/attributesprocessor/testdata/config.yaml
	modified:   internal/otel_collector/processor/batchprocessor/batch_processor.go
	modified:   internal/otel_collector/processor/batchprocessor/splitlogs.go
	modified:   internal/otel_collector/processor/batchprocessor/splitmetrics.go
	modified:   internal/otel_collector/processor/batchprocessor/splittraces.go
	modified:   internal/otel_collector/processor/filterprocessor/factory.go
	modified:   internal/otel_collector/processor/filterprocessor/filter_processor.go
	modified:   internal/otel_collector/processor/memorylimiter/factory.go
	modified:   internal/otel_collector/processor/memorylimiter/memorylimiter.go
	modified:   internal/otel_collector/processor/probabilisticsamplerprocessor/probabilisticsampler.go
	modified:   internal/otel_collector/processor/processorhelper/attraction.go
	modified:   internal/otel_collector/processor/processorhelper/hasher.go
	modified:   internal/otel_collector/processor/processorhelper/logs.go
	modified:   internal/otel_collector/processor/processorhelper/metrics.go
	modified:   internal/otel_collector/processor/processorhelper/processor.go
	modified:   internal/otel_collector/processor/processorhelper/traces.go
	modified:   internal/otel_collector/processor/resourceprocessor/factory.go
	modified:   internal/otel_collector/processor/resourceprocessor/resource_processor.go
	modified:   internal/otel_collector/processor/spanprocessor/factory.go
	modified:   internal/otel_collector/processor/spanprocessor/span.go
	modified:   internal/otel_collector/proto_patch.sed
	modified:   internal/otel_collector/receiver/doc.go
	new file:   internal/otel_collector/receiver/hostmetricsreceiver/doc.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_fallback.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_linux.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_unix.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/loadscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_linux.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_windows.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/networkscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_darwin.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_fallback.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/factory.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/process.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_linux.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_others.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_windows.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/internal/testutils.go
	modified:   internal/otel_collector/receiver/hostmetricsreceiver/metadata.yaml
	modified:   internal/otel_collector/receiver/jaegerreceiver/config.go
	new file:   internal/otel_collector/receiver/jaegerreceiver/doc.go
	modified:   internal/otel_collector/receiver/jaegerreceiver/trace_receiver.go
	new file:   internal/otel_collector/receiver/kafkareceiver/doc.go
	modified:   internal/otel_collector/receiver/kafkareceiver/factory.go
	modified:   internal/otel_collector/receiver/kafkareceiver/jaeger_unmarshaler.go
	modified:   internal/otel_collector/receiver/kafkareceiver/kafka_receiver.go
	deleted:    internal/otel_collector/receiver/kafkareceiver/otlp_unmarshaler.go
	new file:   internal/otel_collector/receiver/kafkareceiver/pdata_unmarshaler.go
	modified:   internal/otel_collector/receiver/kafkareceiver/unmarshaler.go
	modified:   internal/otel_collector/receiver/kafkareceiver/zipkin_unmarshaler.go
	new file:   internal/otel_collector/receiver/opencensusreceiver/doc.go
	modified:   internal/otel_collector/receiver/opencensusreceiver/internal/ocmetrics/opencensus.go
	modified:   internal/otel_collector/receiver/opencensusreceiver/internal/octrace/opencensus.go
	modified:   internal/otel_collector/receiver/otlpreceiver/config.go
	new file:   internal/otel_collector/receiver/otlpreceiver/doc.go
	modified:   internal/otel_collector/receiver/otlpreceiver/factory.go
	modified:   internal/otel_collector/receiver/otlpreceiver/internal/logs/otlp.go
	deleted:    internal/otel_collector/receiver/otlpreceiver/internal/marshal_jsonpb.go
	modified:   internal/otel_collector/receiver/otlpreceiver/internal/metrics/otlp.go
	modified:   internal/otel_collector/receiver/otlpreceiver/internal/trace/otlp.go
	modified:   internal/otel_collector/receiver/otlpreceiver/mixin.go
	modified:   internal/otel_collector/receiver/otlpreceiver/otlp.go
	modified:   internal/otel_collector/receiver/otlpreceiver/otlphttp.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/README.md
	modified:   internal/otel_collector/receiver/prometheusreceiver/config.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/doc.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/factory.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/metadata.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/metricfamily.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/metrics_adjuster.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/metricsbuilder.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/ocastore.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/otlp_metricfamily.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/prom_to_otlp.go
	new file:   internal/otel_collector/receiver/prometheusreceiver/internal/staleness_store.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/internal/transaction.go
	modified:   internal/otel_collector/receiver/prometheusreceiver/metrics_receiver.go
	new file:   internal/otel_collector/receiver/prometheusreceiver/testdata/invalid-config-prometheus-relabel.yaml
	new file:   internal/otel_collector/receiver/receiverhelper/doc.go
	new file:   internal/otel_collector/receiver/scrapererror/doc.go
	modified:   internal/otel_collector/receiver/scrapererror/partialscrapeerror.go
	renamed:    internal/otel_collector/receiver/scrapererror/scrapeerrors.go -> internal/otel_collector/receiver/scrapererror/scrapeerror.go
	new file:   internal/otel_collector/receiver/scraperhelper/doc.go
	modified:   internal/otel_collector/receiver/scraperhelper/scraper.go
	modified:   internal/otel_collector/receiver/scraperhelper/scrapercontroller.go
	new file:   internal/otel_collector/receiver/zipkinreceiver/doc.go
	modified:   internal/otel_collector/receiver/zipkinreceiver/trace_receiver.go
	renamed:    internal/otel_collector/service/application.go -> internal/otel_collector/service/collector.go
	renamed:    internal/otel_collector/service/application_windows.go -> internal/otel_collector/service/collector_windows.go
	modified:   internal/otel_collector/service/internal/builder/builder.go
	modified:   internal/otel_collector/service/internal/builder/exporters_builder.go
	modified:   internal/otel_collector/service/internal/builder/extensions_builder.go
	modified:   internal/otel_collector/service/internal/builder/pipelines_builder.go
	modified:   internal/otel_collector/service/internal/builder/receivers_builder.go
	modified:   internal/otel_collector/service/internal/fanoutconsumer/cloningconsumer.go
	modified:   internal/otel_collector/service/internal/fanoutconsumer/consumer.go
	modified:   internal/otel_collector/service/parserprovider/setflag.go
	modified:   internal/otel_collector/service/service.go
	modified:   internal/otel_collector/service/settings.go
	modified:   internal/otel_collector/service/telemetry.go
	modified:   internal/otel_collector/testbed/correctness/metrics/correctness_test_case.go
	modified:   internal/otel_collector/testbed/correctness/metrics/metric_diff.go
	modified:   internal/otel_collector/testbed/correctness/metrics/metric_index.go
	modified:   internal/otel_collector/testbed/correctness/metrics/metric_supplier.go
	modified:   internal/otel_collector/testbed/correctness/metrics/metrics_test_harness.go
	renamed:    internal/otel_collector/testbed/testbed/child_process.go -> internal/otel_collector/testbed/testbed/child_process_collector.go
	modified:   internal/otel_collector/testbed/testbed/data_providers.go
	new file:   internal/otel_collector/testbed/testbed/in_process_collector.go
	modified:   internal/otel_collector/testbed/testbed/load_generator.go
	modified:   internal/otel_collector/testbed/testbed/mock_backend.go
	modified:   internal/otel_collector/testbed/testbed/options.go
	modified:   internal/otel_collector/testbed/testbed/otelcol_runner.go
	modified:   internal/otel_collector/testbed/testbed/receivers.go
	modified:   internal/otel_collector/testbed/testbed/senders.go
	modified:   internal/otel_collector/testbed/testbed/test_bed.go
	modified:   internal/otel_collector/testbed/testbed/test_case.go
	modified:   internal/otel_collector/testbed/testbed/validator.go
	modified:   internal/otel_collector/testbed/tests/scenarios.go
	modified:   internal/otel_collector/testutil/metricstestutil/metricsutil.go
	modified:   internal/otel_collector/translator/internaldata/metrics_to_oc.go
	modified:   internal/otel_collector/translator/internaldata/oc_to_metrics.go
	modified:   internal/otel_collector/translator/internaldata/oc_to_resource.go
	modified:   internal/otel_collector/translator/internaldata/oc_to_traces.go
	modified:   internal/otel_collector/translator/internaldata/resource_to_oc.go
	modified:   internal/otel_collector/translator/internaldata/timestamp.go
	modified:   internal/otel_collector/translator/internaldata/traces_to_oc.go
	renamed:    internal/otel_collector/translator/trace/zipkin/attributes.go -> internal/otel_collector/translator/trace/internal/zipkin/attributes.go
	modified:   internal/otel_collector/translator/trace/jaeger/constants.go
	modified:   internal/otel_collector/translator/trace/jaeger/jaegerproto_to_traces.go
	modified:   internal/otel_collector/translator/trace/jaeger/jaegerthrift_to_traces.go
	modified:   internal/otel_collector/translator/trace/jaeger/traces_to_jaegerproto.go
	modified:   internal/otel_collector/translator/trace/protospan_translation.go
	deleted:    internal/otel_collector/translator/trace/zipkin/zipkinv1_thrift_to_traces.go
	deleted:    internal/otel_collector/translator/trace/zipkin/zipkinv1_to_traces.go
	renamed:    internal/otel_collector/translator/trace/zipkin/consumerdata.go -> internal/otel_collector/translator/trace/zipkinv1/consumerdata.go
	renamed:    internal/otel_collector/translator/trace/zipkin/grpc_http_mapper.go -> internal/otel_collector/translator/trace/zipkinv1/grpc_http_mapper.go
	renamed:    internal/otel_collector/translator/trace/zipkin/zipkinv1_to_protospan.go -> internal/otel_collector/translator/trace/zipkinv1/json.go
	renamed:    internal/otel_collector/translator/trace/zipkin/status_code.go -> internal/otel_collector/translator/trace/zipkinv1/status_code.go
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_error_batch.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_error_batch.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_local_component.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_local_component.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_multiple_batches.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_multiple_batches.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_single_batch.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_single_batch.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_thrift_local_component.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_thrift_local_component.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v1_thrift_single_batch.json -> internal/otel_collector/translator/trace/zipkinv1/testdata/zipkin_v1_thrift_single_batch.json
	renamed:    internal/otel_collector/translator/trace/zipkin/zipkinv1_thrift_to_protospan.go -> internal/otel_collector/translator/trace/zipkinv1/thrift.go
	new file:   internal/otel_collector/translator/trace/zipkinv1/to_translator.go
	renamed:    internal/otel_collector/translator/trace/zipkin/traces_to_zipkinv2.go -> internal/otel_collector/translator/trace/zipkinv2/from_translator.go
	new file:   internal/otel_collector/translator/trace/zipkinv2/json.go
	new file:   internal/otel_collector/translator/trace/zipkinv2/protobuf.go
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v2_notimestamp.json -> internal/otel_collector/translator/trace/zipkinv2/testdata/zipkin_v2_notimestamp.json
	renamed:    internal/otel_collector/translator/trace/zipkin/testdata/zipkin_v2_single.json -> internal/otel_collector/translator/trace/zipkinv2/testdata/zipkin_v2_single.json
	renamed:    internal/otel_collector/translator/trace/zipkin/zipkinv2_to_traces.go -> internal/otel_collector/translator/trace/zipkinv2/to_translator.go
	modified:   processor/otel/consumer.go
	modified:   processor/otel/consumer_test.go
	modified:   processor/otel/exceptions_test.go
	modified:   processor/otel/metadata.go
	modified:   processor/otel/metadata_test.go
	modified:   processor/otel/metrics.go
	modified:   processor/otel/metrics_test.go
	modified:   processor/otel/timestamps.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* Update opentelemetry-collector to v0.30.0

* Replace glog

* Adapt code to opentelemetry-collector API changes

(cherry picked from commit 3de7384)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 23, 2021
@mergify mergify bot assigned axw Jul 23, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jul 23, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-27T07:32:03.809+0000

  • Duration: 40 min 53 sec

  • Commit: 6fb25a7

Test stats 🧪

Test Results
Failed 0
Passed 4541
Skipped 15
Total 4556

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit 613849d into 7.x Jul 27, 2021
@axw axw deleted the mergify/bp/7.x/pr-5749 branch July 27, 2021 09:12
@axw axw removed the conflicts There is a conflict in the backported pull request label Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants