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

Provide an implementation of the Header* filters that does not depend on go1.14 #565

Merged
merged 1 commit into from
Mar 17, 2020
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
26 changes: 0 additions & 26 deletions plugin/othttp/filters/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,29 +126,3 @@ func Method(m string) othttp.Filter {
return m == r.Method
}
}

// Header returns a Filter that returns true if the request
// includes a header k with a value equal to v.
func Header(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header.Values(k) {
if v == hv {
return true
}
}
return false
}
}

// HeaderContains returns a Filter that returns true if the request
// includes a header k with a value that contains v.
func HeaderContains(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header.Values(k) {
if strings.Contains(hv, v) {
return true
}
}
return false
}
}
50 changes: 50 additions & 0 deletions plugin/othttp/filters/header_go14.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright 2020, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// +build go1.14

package filters

import (
"net/http"
"strings"

"go.opentelemetry.io/otel/plugin/othttp"
)

// Header returns a Filter that returns true if the request
// includes a header k with a value equal to v.
func Header(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header.Values(k) {
if v == hv {
return true
}
}
return false
}
}

// HeaderContains returns a Filter that returns true if the request
// includes a header k with a value that contains v.
func HeaderContains(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header.Values(k) {
if strings.Contains(hv, v) {
return true
}
}
return false
}
}
51 changes: 51 additions & 0 deletions plugin/othttp/filters/header_nongo14.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright 2020, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !go1.14

package filters

import (
"net/http"
"net/textproto"
"strings"

"go.opentelemetry.io/otel/plugin/othttp"
)

// Header returns a Filter that returns true if the request
// includes a header k with a value equal to v.
func Header(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header[textproto.CanonicalMIMEHeaderKey(k)] {
if v == hv {
return true
}
}
return false
}
}

// HeaderContains returns a Filter that returns true if the request
// includes a header k with a value that contains v.
func HeaderContains(k, v string) othttp.Filter {
return func(r *http.Request) bool {
for _, hv := range r.Header[textproto.CanonicalMIMEHeaderKey(k)] {
if strings.Contains(hv, v) {
return true
}
}
return false
}
}