Skip to content

Commit 66e2796

Browse files
author
Bogdan Drutu
authored
Update to v0.15.0, enable correlation, add config (#47)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent ba49aab commit 66e2796

File tree

7 files changed

+257
-201
lines changed

7 files changed

+257
-201
lines changed

cmd/otelcol/config/collector/agent_config_linux.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ exporters:
7272
sapm:
7373
access_token: "${SPLUNK_ACCESS_TOKEN}"
7474
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
75+
signalfx_correlation:
76+
access_token: "${SPLUNK_ACCESS_TOKEN}"
77+
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
7578
# Metrics + Events
7679
signalfx:
7780
access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -82,7 +85,7 @@ service:
8285
traces:
8386
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
8487
processors: [memory_limiter, batch]
85-
exporters: [sapm]
88+
exporters: [sapm, signalfx_correlation]
8689
metrics:
8790
receivers: [opencensus, otlp, signalfx, prometheus, hostmetrics]
8891
processors: [memory_limiter, batch]

cmd/otelcol/config/collector/splunk_config_linux.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ exporters:
5454
sapm:
5555
access_token: "${SPLUNK_ACCESS_TOKEN}"
5656
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
57+
signalfx_correlation:
58+
access_token: "${SPLUNK_ACCESS_TOKEN}"
59+
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
5760
# Metrics + Events
5861
signalfx:
5962
access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -74,7 +77,7 @@ service:
7477
traces:
7578
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
7679
processors: [memory_limiter, batch]
77-
exporters: [sapm]
80+
exporters: [sapm, signalfx_correlation]
7881
metrics:
7982
receivers: [opencensus, otlp, signalfx, prometheus]
8083
processors: [memory_limiter, batch]

cmd/otelcol/config/collector/splunk_config_non_linux.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ exporters:
5454
sapm:
5555
access_token: "${SPLUNK_ACCESS_TOKEN}"
5656
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
57+
signalfx_correlation:
58+
access_token: "${SPLUNK_ACCESS_TOKEN}"
59+
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
5760
# Metrics + Events
5861
signalfx:
5962
access_token: "${SPLUNK_ACCESS_TOKEN}"
@@ -74,7 +77,7 @@ service:
7477
traces:
7578
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
7679
processors: [memory_limiter, batch]
77-
exporters: [sapm]
80+
exporters: [sapm, signalfx_correlation]
7881
metrics:
7982
receivers: [opencensus, otlp, signalfx, prometheus]
8083
processors: [memory_limiter, batch]

go.mod

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,45 @@ require (
77
github.com/golangci/golangci-lint v1.31.0
88
github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76
99
github.com/jstemmer/go-junit-report v0.9.1
10-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.14.0
11-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.14.0
12-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.14.0
13-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.14.0
14-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.14.0
15-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.14.0
16-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.14.0
17-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.14.0
18-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.14.0
19-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.14.0
20-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.14.0
21-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.14.0
22-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.14.0
23-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.14.0
24-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.14.0
25-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.14.0
26-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.14.0
27-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.14.0
28-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.14.0
29-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.14.0
30-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.14.0
31-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.14.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.15.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxcorrelationexporter v0.15.0
12+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.15.0
13+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.15.0
14+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.15.0
15+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.15.0
16+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.15.0
17+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.15.0
18+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.15.0
19+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.15.0
20+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.15.0
21+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.15.0
22+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.15.0
23+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.15.0
24+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.15.0
25+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.15.0
26+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.15.0
27+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.15.0
28+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.15.0
29+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.15.0
30+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.15.0
31+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.15.0
32+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.15.0
3233
github.com/ory/go-acc v0.2.6
3334
github.com/pavius/impi v0.0.3
34-
github.com/securego/gosec/v2 v2.4.0
35+
github.com/securego/gosec/v2 v2.5.0
3536
github.com/stretchr/testify v1.6.1
36-
go.opentelemetry.io/collector v0.14.0
37-
golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c
37+
go.opentelemetry.io/collector v0.15.0
38+
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211
3839
honnef.co/go/tools v0.0.1-2020.1.6
3940
)
4041

4142
replace (
42-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.14.0
43-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.14.0
44-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.14.0
45-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.14.0
46-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.14.0
47-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.14.0
48-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.14.0
43+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.15.0
44+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.15.0
45+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.15.0
46+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.15.0
47+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.15.0
48+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.15.0
49+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.15.0
50+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.15.0
4951
)

0 commit comments

Comments
 (0)