Skip to content

Commit

Permalink
Release v0.29.0 (#505)
Browse files Browse the repository at this point in the history 
* Release v0.29.0

* fixes

* Change the map type in expandStringValues (#507)

* fix smartagent receiver/extension config

* Update CHANGELOG.md

Co-authored-by: Jay Camp <[email protected]>
Co-authored-by: Paulo Janotti <[email protected]>
  • Loading branch information
@jeffreyc-splunk @pjanotti
3 people authored Jun 25, 2021
1 parent 812130d commit 960ca93
Show file tree
Hide file tree
Showing 14 changed files with 504 additions and 305 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

## Unreleased

## v0.29.0

This Splunk OpenTelemetry Connector release includes changes from the [opentelemetry-collector v0.29.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.29.0) and the [opentelemetry-collector-contrib v0.29.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.29.0) releases.

### 💡 Enhancements 💡

- Add OTLP to logs pipeline for agent (#495)
- Enable collecting in memory config locally by default (#497)
- Enable host metadata updates by default (#513)

## v0.28.1

- Update bundled Smart Agent to [v5.11.0](https://github.com/signalfx/signalfx-agent/releases/tag/v5.11.0) (#487)
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcol/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func main() {
info,
configsources.Get()...,
)
serviceParams := service.AppSettings{
serviceParams := service.CollectorSettings{
BuildInfo: info,
Factories: factories,
ParserProvider: parserProvider,
Expand Down Expand Up @@ -287,7 +287,7 @@ func setMemoryLimit(memTotalSizeMiB int) {
log.Printf("Set memory limit to %d MiB", memLimit)
}

func runInteractive(params service.AppSettings) error {
func runInteractive(params service.CollectorSettings) error {
app, err := service.New(params)
if err != nil {
return fmt.Errorf("failed to construct the application: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcol/main_others.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ package main

import "go.opentelemetry.io/collector/service"

func run(params service.AppSettings) error {
func run(params service.CollectorSettings) error {
return runInteractive(params)
}
4 changes: 2 additions & 2 deletions cmd/otelcol/main_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"golang.org/x/sys/windows/svc"
)

func run(params service.AppSettings) error {
func run(params service.CollectorSettings) error {
if useInteractiveMode, err := checkUseInteractiveMode(); err != nil {
return err
} else if useInteractiveMode {
Expand All @@ -51,7 +51,7 @@ func checkUseInteractiveMode() (bool, error) {
}
}

func runService(params service.AppSettings) error {
func runService(params service.CollectorSettings) error {
// do not need to supply service name when startup is invoked through Service Control Manager directly
if err := svc.Run("", service.NewWindowsService(params)); err != nil {
return fmt.Errorf("failed to start service: %w", err)
Expand Down
82 changes: 41 additions & 41 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ require (
github.com/hashicorp/vault v1.7.0
github.com/hashicorp/vault-plugin-auth-gcp v0.9.0
github.com/hashicorp/vault/api v1.1.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.28.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.28.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.29.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.29.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.29.0
github.com/openzipkin/zipkin-go v0.2.5
github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657
github.com/signalfx/golib/v3 v3.3.33
Expand All @@ -44,26 +44,26 @@ require (
github.com/spf13/cast v1.3.1
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
go.opentelemetry.io/collector v0.28.0
go.opentelemetry.io/collector v0.29.0
go.uber.org/zap v1.17.0
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
golang.org/x/sys v0.0.0-20210611083646-a4fc73990273
gopkg.in/yaml.v2 v2.4.0
)

replace (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.24.1-0.20210408210148-736647af91e1 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.28.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.24.1-0.20210408210148-736647af91e1 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.29.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.29.0
)

// each of these is required for the smartagentreceiver
Expand Down
Loading

0 comments on commit 960ca93

Please sign in to comment.