Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Instana exporter #13747

Merged
merged 1 commit into from
Sep 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ updates:
directory: "/exporter/influxdbexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/instanaexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/jaegerexporter"
schedule:
Expand Down
3 changes: 3 additions & 0 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.59.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.59.0 // indirect
Expand Down Expand Up @@ -664,6 +665,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humio

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => ../../exporter/influxdbexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter => ../../exporter/instanaexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter => ../../exporter/jaegerexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter => ../../exporter/jaegerthrifthttpexporter
Expand Down
4 changes: 2 additions & 2 deletions exporter/instanaexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| Status | |
| ------------------------ |------------------|
| Stability | [in-development] |
| Stability | [alpha] |
| Supported pipeline types | traces |
| Distributions | [contrib] |

Expand Down Expand Up @@ -69,5 +69,5 @@ service:
exporters: [instana]
```

[in-development]:https://github.com/open-telemetry/opentelemetry-collector#in-development
[alpha]:https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
2 changes: 1 addition & 1 deletion exporter/instanaexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const (
// The value of "type" key in configuration.
typeStr = "instana"
// The stability level of the exporter.
stability = component.StabilityLevelInDevelopment
stability = component.StabilityLevelAlpha
)

// NewFactory creates an Instana exporter factory
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.59.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.59.0
Expand Down Expand Up @@ -663,6 +664,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humio

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => ./exporter/influxdbexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter => ./exporter/instanaexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter => ./exporter/jaegerexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter => ./exporter/jaegerthrifthttpexporter
Expand Down
2 changes: 2 additions & 0 deletions internal/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter"
Expand Down Expand Up @@ -299,6 +300,7 @@ func Components() (component.Factories, error) {
googlecloudpubsubexporter.NewFactory(),
humioexporter.NewFactory(),
influxdbexporter.NewFactory(),
instanaexporter.NewFactory(),
jaegerexporter.NewFactory(),
jaegerthrifthttpexporter.NewFactory(),
kafkaexporter.NewFactory(),
Expand Down
10 changes: 10 additions & 0 deletions internal/components/exporters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/humioexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter"
Expand Down Expand Up @@ -354,6 +355,15 @@ func TestDefaultExporters(t *testing.T) {
return cfg
},
},
{
exporter: "instana",
getConfigFn: func() config.Exporter {
cfg := expFactories["instana"].CreateDefaultConfig().(*instanaexporter.Config)
cfg.Endpoint = "http://" + endpoint
cfg.AgentKey = "Key1"
return cfg
},
},
{
exporter: "loadbalancing",
getConfigFn: func() config.Exporter {
Expand Down
16 changes: 16 additions & 0 deletions unreleased/enable-instana-exporter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: new_component

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: instanaexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Enable Instana exporter

# One or more tracking issues related to the change
issues: [13395]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: