diff --git a/.chloggen/revertargs.yaml b/.chloggen/revertargs.yaml deleted file mode 100755 index 5a2c49e1ed6..00000000000 --- a/.chloggen/revertargs.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix running collector as a windows service. - -# One or more tracking issues or pull requests related to the change -issues: [6433] diff --git a/CHANGELOG.md b/CHANGELOG.md index a792520bfc8..f2561646f22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ +## v0.63.1 + +### 🧰 Bug fixes 🧰 + +- `service`: Fix running collector as a windows service. (#6433) + ## v0.63.0 ### 🛑 Breaking changes 🛑 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index ed58a6249be..b8c1a2c0bdc 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.63.0" +const defaultOtelColVersion = "0.63.1" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 9e5d2962353..6829758475a 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,24 +2,24 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.63.0-dev - otelcol_version: 0.63.0 + version: 0.63.1-dev + otelcol_version: 0.63.1 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.63.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.63.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.63.1 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.63.1 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index ea52161b1f8..4710a43087d 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,26 +2,26 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.63.0-dev - otelcol_version: 0.63.0 + version: 0.63.1-dev + otelcol_version: 0.63.1 receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.63.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.63.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.63.1 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.63.1 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1 extensions: - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 processors: - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.63.0 + gomod: go.opentelemetry.io/collector v0.63.1 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 8e7c3af0f80..1ffc9ce978b 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,10 +6,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.63.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.63.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.0 + go.opentelemetry.io/collector v0.63.1 + go.opentelemetry.io/collector/exporter/loggingexporter v0.63.1 + go.opentelemetry.io/collector/exporter/otlpexporter v0.63.1 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.1 golang.org/x/sys v0.1.0 ) @@ -57,8 +57,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.63.0 // indirect - go.opentelemetry.io/collector/semconv v0.63.0 // indirect + go.opentelemetry.io/collector/pdata v0.63.1 // indirect + go.opentelemetry.io/collector/semconv v0.63.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 2548cc8911b..9a4ee6aa553 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -19,7 +19,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.63.0-dev", + Version: "0.63.1-dev", } if err := run(service.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/examples/k8s/otel-config.yaml b/examples/k8s/otel-config.yaml index bbf0e85bcee..e4da7f4f178 100644 --- a/examples/k8s/otel-config.yaml +++ b/examples/k8s/otel-config.yaml @@ -66,7 +66,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-agent-config.yaml" - image: otel/opentelemetry-collector:0.63.0 + image: otel/opentelemetry-collector:0.63.1 name: otel-agent resources: limits: @@ -177,7 +177,7 @@ spec: - command: - "/otelcol" - "--config=/conf/otel-collector-config.yaml" - image: otel/opentelemetry-collector:0.63.0 + image: otel/opentelemetry-collector:0.63.1 name: otel-collector resources: limits: diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 714f379d354..b6c95524a08 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.0 + go.opentelemetry.io/collector v0.63.1 + go.opentelemetry.io/collector/pdata v0.63.1 go.uber.org/zap v1.23.0 golang.org/x/sys v0.1.0 ) diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 2b8ece8481f..db25896593c 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.0 + go.opentelemetry.io/collector v0.63.1 + go.opentelemetry.io/collector/pdata v0.63.1 go.uber.org/atomic v1.10.0 google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 google.golang.org/grpc v1.50.1 diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 11d7782e24b..3414b535ac1 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.63.0 - go.opentelemetry.io/collector/pdata v0.63.0 + go.opentelemetry.io/collector v0.63.1 + go.opentelemetry.io/collector/pdata v0.63.1 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 google.golang.org/grpc v1.50.1 diff --git a/go.mod b/go.mod index a9eabc73bfb..a550bbd814a 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/pdata v0.63.0 - go.opentelemetry.io/collector/semconv v0.63.0 + go.opentelemetry.io/collector/pdata v0.63.1 + go.opentelemetry.io/collector/semconv v0.63.1 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 go.opentelemetry.io/contrib/propagators/b3 v1.11.1 diff --git a/versions.yaml b/versions.yaml index 32056c0f35b..77599169307 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,11 +14,11 @@ module-sets: stable: - version: v0.63.0 + version: v0.63.1 modules: - go.opentelemetry.io/collector/pdata beta: - version: v0.63.0 + version: v0.63.1 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder