From 5457f7e225f84d34e17c764be4525783587825f4 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Mon, 1 Aug 2022 13:23:05 +0300 Subject: [PATCH] Update otel components (0.56.0) + `disable_start_time` --- otelbuilder/Makefile | 4 +- otelbuilder/otelcol-builder.yaml | 129 ++++++++++++++++--------------- 2 files changed, 67 insertions(+), 66 deletions(-) diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index acd8ec0..2c85536 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -1,8 +1,8 @@ BINARY_NAME ?= otelcol-logzio -BUILDER_VERSION ?= 0.54.0 +BUILDER_VERSION ?= 0.56.0 BUILDER_REPO ?= github.com/open-telemetry/opentelemetry-collector BUILDER_BIN_NAME ?= opentelemetry-collector-builder -VERSION ?= 0.0.1 +VERSION ?= 0.56.0 GO ?= go OS ?= $(shell uname -s | tr A-Z a-z) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index 3ae3f09..b98b587 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -2,93 +2,94 @@ dist: module: github.com/logzio/otel-collector-distro # the module name for the new distribution, following Go mod conventions. Optional, but recommended. name: otelcol-logzio description: "Logzio OpenTelemetry Collector distribution" - otelcol_version: "0.54.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. + otelcol_version: "0.56.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. output_path: ./cmd - version: "0.0.1" + version: "0.56.0" exporters: # Maintained exporters - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.54.0 + gomod: go.opentelemetry.io/collector v0.56.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.54.0 + gomod: go.opentelemetry.io/collector v0.56.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.54.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.54.0" + gomod: go.opentelemetry.io/collector v0.56.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.56.0" processors: # Upstream processors - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.54.0 + gomod: go.opentelemetry.io/collector v0.56.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.54.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.54.0" + gomod: go.opentelemetry.io/collector v0.56.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.56.0" receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.54.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.54.0" + gomod: go.opentelemetry.io/collector v0.56.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.56.0" extensions: # Upstream extensions - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.54.0 + gomod: go.opentelemetry.io/collector v0.56.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.54.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.54.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.54.0" + gomod: go.opentelemetry.io/collector v0.56.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.56.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.56.0" replaces: # Google renamed their org from `googleapis` to `google`, and for `gnostic` this happened in v0.5.6 # However, kubernetes/client-go still uses the old name for v0.5.5, and this causes go mod to complain # Replace this here instead of modifying indirect dependencies in packages, as it's more robust - github.com/googleapis/gnostic => github.com/google/gnostic v0.5.5 + - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/newly12/opentelemetry-collector-contrib/receiver/prometheusreceiver prom_receiver_mem \ No newline at end of file