Skip to content

Commit

Permalink
Update to v0.15.0, enable correlation, add config (open-telemetry#47)
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
Bogdan Drutu authored Nov 20, 2020
1 parent ba49aab commit 66e2796
Show file tree
Hide file tree
Showing 7 changed files with 257 additions and 201 deletions.
5 changes: 4 additions & 1 deletion cmd/otelcol/config/collector/agent_config_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ exporters:
sapm:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
signalfx_correlation:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
# Metrics + Events
signalfx:
access_token: "${SPLUNK_ACCESS_TOKEN}"
Expand All @@ -82,7 +85,7 @@ service:
traces:
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
processors: [memory_limiter, batch]
exporters: [sapm]
exporters: [sapm, signalfx_correlation]
metrics:
receivers: [opencensus, otlp, signalfx, prometheus, hostmetrics]
processors: [memory_limiter, batch]
Expand Down
5 changes: 4 additions & 1 deletion cmd/otelcol/config/collector/splunk_config_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ exporters:
sapm:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
signalfx_correlation:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
# Metrics + Events
signalfx:
access_token: "${SPLUNK_ACCESS_TOKEN}"
Expand All @@ -74,7 +77,7 @@ service:
traces:
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
processors: [memory_limiter, batch]
exporters: [sapm]
exporters: [sapm, signalfx_correlation]
metrics:
receivers: [opencensus, otlp, signalfx, prometheus]
processors: [memory_limiter, batch]
Expand Down
5 changes: 4 additions & 1 deletion cmd/otelcol/config/collector/splunk_config_non_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ exporters:
sapm:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://ingest.${SPLUNK_REALM}.signalfx.com/v2/trace"
signalfx_correlation:
access_token: "${SPLUNK_ACCESS_TOKEN}"
endpoint: "https://api.${SPLUNK_REALM}.signalfx.com"
# Metrics + Events
signalfx:
access_token: "${SPLUNK_ACCESS_TOKEN}"
Expand All @@ -74,7 +77,7 @@ service:
traces:
receivers: [jaeger, opencensus, otlp, sapm, zipkin]
processors: [memory_limiter, batch]
exporters: [sapm]
exporters: [sapm, signalfx_correlation]
metrics:
receivers: [opencensus, otlp, signalfx, prometheus]
processors: [memory_limiter, batch]
Expand Down
66 changes: 34 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,45 @@ require (
github.com/golangci/golangci-lint v1.31.0
github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76
github.com/jstemmer/go-junit-report v0.9.1
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.14.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxcorrelationexporter v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.15.0
github.com/ory/go-acc v0.2.6
github.com/pavius/impi v0.0.3
github.com/securego/gosec/v2 v2.4.0
github.com/securego/gosec/v2 v2.5.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.14.0
golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c
go.opentelemetry.io/collector v0.15.0
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211
honnef.co/go/tools v0.0.1-2020.1.6
)

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.14.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.14.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.14.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.14.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.14.0
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
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
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
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
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
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
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
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
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
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
)
Loading

0 comments on commit 66e2796

Please sign in to comment.