Skip to content

Commit c8182c3

Browse files
jeffreyc-splunkrmfitzpatrickJay CampRyan Fitzpatrick
authored
Release v0.28.0 (#467)
* Release v0.28.0 * Update CHANGELOG.md Co-authored-by: Ryan Fitzpatrick <[email protected]> * Update to latest release * Update go.mod Co-authored-by: Ryan Fitzpatrick <[email protected]> * go mod tidy * Update CHANGELOG.md * linux and windows fixes * Update testutils for 0.28.0 * Update http/2.0 error content and correct package * Update CHANGELOG.md Co-authored-by: Ryan Fitzpatrick <[email protected]> Co-authored-by: Jay Camp <[email protected]> Co-authored-by: Ryan Fitzpatrick <[email protected]>
1 parent 13989c6 commit c8182c3

40 files changed

+526
-406
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
## Unreleased
44

5+
## v0.28.0
6+
7+
This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.28.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.28.0) and the [opentelemetry-collector-contrib v0.28.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.28.0) releases.
8+
9+
### 💡 Enhancements 💡
10+
11+
- Initial puppet module for linux (#405)
12+
- Add `include` config source (#419, #402, #397)
13+
- Allow setting both `SPLUNK_CONFIG` and `--config` with priority given to `--config` (#450)
14+
- Use internal pipelines for collector prometheus metrics (#469)
15+
16+
### 🧰 Bug fixes 🧰
17+
18+
- Correctly handle nil value on the config provider (#434)
19+
520
## v0.26.0
621

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

‎cmd/otelcol/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func main() {
7676
info,
7777
configsources.Get()...,
7878
)
79-
serviceParams := service.Parameters{
79+
serviceParams := service.AppSettings{
8080
BuildInfo: info,
8181
Factories: factories,
8282
ParserProvider: parserProvider,
@@ -282,7 +282,7 @@ func setMemoryLimit(memTotalSizeMiB int) {
282282
log.Printf("Set memory limit to %d MiB", memLimit)
283283
}
284284

285-
func runInteractive(params service.Parameters) error {
285+
func runInteractive(params service.AppSettings) error {
286286
app, err := service.New(params)
287287
if err != nil {
288288
return fmt.Errorf("failed to construct the application: %w", err)

‎cmd/otelcol/main_others.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ package main
1919

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

22-
func run(params service.Parameters) error {
22+
func run(params service.AppSettings) error {
2323
return runInteractive(params)
2424
}

‎cmd/otelcol/main_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"golang.org/x/sys/windows/svc"
2626
)
2727

28-
func run(params service.Parameters) error {
28+
func run(params service.AppSettings) error {
2929
if useInteractiveMode, err := checkUseInteractiveMode(); err != nil {
3030
return err
3131
} else if useInteractiveMode {
@@ -51,7 +51,7 @@ func checkUseInteractiveMode() (bool, error) {
5151
}
5252
}
5353

54-
func runService(params service.Parameters) error {
54+
func runService(params service.AppSettings) error {
5555
// do not need to supply service name when startup is invoked through Service Control Manager directly
5656
if err := svc.Run("", service.NewWindowsService(params)); err != nil {
5757
return fmt.Errorf("failed to start service: %w", err)

‎go.mod

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,67 @@ module github.com/signalfx/splunk-otel-collector
33
go 1.16
44

55
require (
6-
github.com/cenkalti/backoff/v4 v4.1.0
6+
github.com/cenkalti/backoff/v4 v4.1.1
77
github.com/fsnotify/fsnotify v1.4.9
88
github.com/go-playground/universal-translator v0.17.0 // indirect
99
github.com/go-zookeeper/zk v1.0.2
10-
github.com/gogo/googleapis v1.4.0 // indirect
1110
github.com/hashicorp/vault v1.7.0
1211
github.com/hashicorp/vault-plugin-auth-gcp v0.9.0
1312
github.com/hashicorp/vault/api v1.1.0
14-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.27.0
15-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.27.0
16-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.27.0
17-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.27.0
18-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.27.0
19-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.27.0
20-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.27.0 // indirect
21-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.27.0
22-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.27.0
23-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.27.0
24-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.27.0
25-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.27.0
26-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.27.0
27-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.27.0
28-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.27.0
29-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.27.0
30-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.27.0
31-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.27.0
32-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.27.0
33-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.27.0
34-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.27.0 // indirect
35-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.27.0
36-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.27.0
37-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.27.0
38-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.27.0
39-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.27.0
13+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.28.0
14+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.28.0
15+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.28.0
16+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.28.0
17+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.28.0
18+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.28.0
19+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.28.0 // indirect
20+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.28.0
21+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.28.0
22+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.28.0
23+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.28.0
24+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.28.0
25+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.28.0
26+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.28.0
27+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.28.0
28+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.28.0
29+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.28.0
30+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.28.0
31+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.28.0
32+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.28.0
33+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.28.0 // indirect
34+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.28.0
35+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.28.0
36+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.28.0
37+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.28.0
38+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.28.0
4039
github.com/openzipkin/zipkin-go v0.2.5
4140
github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657
4241
github.com/signalfx/golib/v3 v3.3.33
43-
github.com/signalfx/signalfx-agent v1.0.1-0.20210503202607-8862b3ba9c0d
42+
github.com/signalfx/signalfx-agent v1.0.1-0.20210610210307-b3be6d1b7fa1
4443
github.com/sirupsen/logrus v1.8.1
4544
github.com/spf13/cast v1.3.1
4645
github.com/stretchr/testify v1.7.0
4746
go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
48-
go.opentelemetry.io/collector v0.27.0
49-
go.uber.org/zap v1.16.0
50-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da
47+
go.opentelemetry.io/collector v0.28.0
48+
go.uber.org/zap v1.17.0
49+
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
5150
gopkg.in/yaml.v2 v2.4.0
5251
)
5352

5453
replace (
55-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.27.0
56-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.27.0
57-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.27.0
58-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.27.0
59-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.27.0
60-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.27.0
61-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.27.0
62-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.27.0
63-
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.27.0
64-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.27.0
65-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.27.0
66-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.27.0
54+
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
55+
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
56+
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
57+
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
58+
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
59+
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
60+
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
61+
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
62+
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
63+
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
64+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.28.0
65+
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
66+
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
6767
)
6868

6969
// each of these is required for the smartagentreceiver

0 commit comments

Comments
 (0)