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.

Sign up for GitHub

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

Jump to bottom

[chore][exporter/otlphttpexporter] Generalize composeSignalURL #11206

Merged
merged 1 commit into from
Sep 19, 2024
Merged

[chore][exporter/otlphttpexporter] Generalize composeSignalURL #11206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions exporter/otlphttpexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ func createDefaultConfig() component.Config {
}
}

func composeSignalURL(oCfg *Config, signalOverrideURL string, signalName string) (string, error) {
// composeSignalURL composes the final URL for the signal (traces, metrics, logs) based on the configuration.
// oCfg is the configuration of the exporter.
// signalOverrideURL is the URL specified in the signal specific configuration (empty if not specified).
// signalName is the name of the signal, e.g. "traces", "metrics", "logs".
// signalVersion is the version of the signal, e.g. "v1" or "v1development".
func composeSignalURL(oCfg *Config, signalOverrideURL string, signalName string, signalVersion string) (string, error) {
switch {
case signalOverrideURL != "":
_, err := url.Parse(signalOverrideURL)
Expand All @@ -61,9 +66,9 @@ func composeSignalURL(oCfg *Config, signalOverrideURL string, signalName string)
return "", fmt.Errorf("either endpoint or %s_endpoint must be specified", signalName)
default:
if strings.HasSuffix(oCfg.Endpoint, "/") {
return oCfg.Endpoint + "v1/" + signalName, nil
return oCfg.Endpoint + signalVersion + "/" + signalName, nil
}
return oCfg.Endpoint + "/v1/" + signalName, nil
return oCfg.Endpoint + "/" + signalVersion + "/" + signalName, nil
}
}

Expand All @@ -78,7 +83,7 @@ func createTracesExporter(
}
oCfg := cfg.(*Config)

oce.tracesURL, err = composeSignalURL(oCfg, oCfg.TracesEndpoint, "traces")
oce.tracesURL, err = composeSignalURL(oCfg, oCfg.TracesEndpoint, "traces", "v1")
if err != nil {
return nil, err
}
Expand All @@ -104,7 +109,7 @@ func createMetricsExporter(
}
oCfg := cfg.(*Config)

oce.metricsURL, err = composeSignalURL(oCfg, oCfg.MetricsEndpoint, "metrics")
oce.metricsURL, err = composeSignalURL(oCfg, oCfg.MetricsEndpoint, "metrics", "v1")
if err != nil {
return nil, err
}
Expand All @@ -130,7 +135,7 @@ func createLogsExporter(
}
oCfg := cfg.(*Config)

oce.logsURL, err = composeSignalURL(oCfg, oCfg.LogsEndpoint, "logs")
oce.logsURL, err = composeSignalURL(oCfg, oCfg.LogsEndpoint, "logs", "v1")
if err != nil {
return nil, err
}
Expand Down
10 changes: 8 additions & 2 deletions exporter/otlphttpexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,19 @@ func TestComposeSignalURL(t *testing.T) {

// Has slash at end
cfg.ClientConfig.Endpoint = "http://localhost:4318/"
url, err := composeSignalURL(cfg, "", "traces")
url, err := composeSignalURL(cfg, "", "traces", "v1")
require.NoError(t, err)
assert.Equal(t, "http://localhost:4318/v1/traces", url)

// No slash at end
cfg.ClientConfig.Endpoint = "http://localhost:4318"
url, err = composeSignalURL(cfg, "", "traces")
url, err = composeSignalURL(cfg, "", "traces", "v1")
require.NoError(t, err)
assert.Equal(t, "http://localhost:4318/v1/traces", url)

// Different version
cfg.ClientConfig.Endpoint = "http://localhost:4318"
url, err = composeSignalURL(cfg, "", "traces", "v2")
require.NoError(t, err)
assert.Equal(t, "http://localhost:4318/v2/traces", url)
}
Loading