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

Override insecure when endpoint URL is set #5944

Merged
merged 10 commits into from
Nov 7, 2024
Merged

Override insecure when endpoint URL is set #5944

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c1dedc
Override insecure when endpoint is set
sevaorlov Nov 6, 2024
0b4db91
Merge branch 'main' into otelpmetrichttp/override-default-insecure
sevaorlov Nov 6, 2024
ac70359
generate file, fix also for otlptrace
sevaorlov Nov 6, 2024
17c6d28
add changelog entry
sevaorlov Nov 6, 2024
f95ba84
change cfg.Metrics to cfg.Traces
sevaorlov Nov 6, 2024
8fefcec
fix otlptrace test using config Metrics
sevaorlov Nov 6, 2024
9bae445
adjust changelog
sevaorlov Nov 6, 2024
8d2258b
add test for otlplog
sevaorlov Nov 6, 2024
e132b9f
add a test case for insecure true
sevaorlov Nov 6, 2024
6dbacfe
Merge branch 'main' into otelpmetrichttp/override-default-insecure
pellared Nov 7, 2024
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: 1 addition & 3 deletions exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,7 @@ func WithEndpointURL(v string) GenericOption {

cfg.Metrics.Endpoint = u.Host
cfg.Metrics.URLPath = u.Path
if u.Scheme != "https" {
cfg.Metrics.Insecure = true
}
cfg.Metrics.Insecure = u.Scheme != "https"
pellared marked this conversation as resolved.
Show resolved Hide resolved

return cfg
})
Expand Down
14 changes: 14 additions & 0 deletions exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,20 @@ func TestConfigs(t *testing.T) {
assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
},
},
{
name: "Test With WithEndpointURL secure when Environment Endpoint is set insecure",
env: map[string]string{
"OTEL_EXPORTER_OTLP_ENDPOINT": "http://env.endpoint/prefix",
},
opts: []GenericOption{
WithEndpointURL("https://someendpoint/somepath"),
},
asserts: func(t *testing.T, c *Config, grpcOption bool) {
assert.Equal(t, "someendpoint", c.Metrics.Endpoint)
assert.Equal(t, "/somepath", c.Metrics.URLPath)
assert.False(t, c.Metrics.Insecure)
},
},
{
name: "Test Environment Endpoint",
env: map[string]string{
Expand Down
Loading