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

[7.x] Make list of Access-Control-Allow-Headers configurable. #3307

Merged
merged 1 commit into from
Feb 11, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Feb 11, 2020

Backports the following commits to 7.x:

The configurable list is appended to Content-Type, Content-Encoding and Accept, which are allways included.
Closes elastic#2497
@jalvz jalvz added the backport label Feb 11, 2020
@jalvz jalvz merged commit ef7ea51 into elastic:7.x Feb 11, 2020
axw added a commit to axw/apm-server that referenced this pull request Feb 11, 2020
* Integrate Jaeger gRPC collector (elastic#2976)

Add support for Jaeger gRPC Trace Intake Collector. The gRPC endpoint collects monitoring metrics and supports TLS communication, by reusing the `apm-server.ssl.*` configuration. By default the gRPC endpoint is disabled.

closes elastic#2962

Co-Authored-By: Andrew Wilkins <[email protected]>

* [Jaeger] Add otel consumer converting batches to Elastic APM events (elastic#3066)

Add consumer converting incoming otel batches to Elastic APM format.
Add integration tests covering incoming gRPC requests being transformed to beat events.

partially implements elastic#3307

* Jaeger http thrift (elastic#3081)

Add an HTTP handler, muxer, and server, in beater/jaeger for accepting Thrift-encoded trace data over HTTP. Refactor beater/jaeger.GRPCServer into Server, which now encapsulates both gRPC and HTTP servers.

Move beater/api/jaeger code into beater/jaeger, which is the only user of GRPCCollector. If the beater/jaeger code grows significantly, we might consider having subpackages like beater/jaeger/grpc, beater/jaeger/http, etc.

* [jaeger] Convert Timeevents to errors (elastic#3085)

* [jaeger] Convert Timeevents to errors

Parse Timeevents from Jaeger spans and convert to elastic error events
if they describe an error.

Fixes elastic#3007

* Add experimental flag to Jaeger integration (elastic#3121)

* tests/system: system test for Jaeger Thrift/HTTP (elastic#3114)

* tests/system: system test for Jaeger Thrift/HTTP

* tests/system: system test for Jaeger gRPC

Co-authored-by: Andrew Wilkins <[email protected]>
bmorelli25 pushed a commit to bmorelli25/apm-server that referenced this pull request Feb 11, 2020
…lastic#3066)

Add consumer converting incoming otel batches to Elastic APM format.
Add integration tests covering incoming gRPC requests being transformed to beat events.

partially implements elastic#3307
bmorelli25 pushed a commit to bmorelli25/apm-server that referenced this pull request Feb 11, 2020
* Integrate Jaeger gRPC collector (elastic#2976)

Add support for Jaeger gRPC Trace Intake Collector. The gRPC endpoint collects monitoring metrics and supports TLS communication, by reusing the `apm-server.ssl.*` configuration. By default the gRPC endpoint is disabled.

closes elastic#2962 

Co-Authored-By: Andrew Wilkins <[email protected]>

* [Jaeger] Add otel consumer converting batches to Elastic APM events (elastic#3066)

Add consumer converting incoming otel batches to Elastic APM format.
Add integration tests covering incoming gRPC requests being transformed to beat events.

partially implements elastic#3307

* Jaeger http thrift (elastic#3081)

Add an HTTP handler, muxer, and server, in beater/jaeger for accepting Thrift-encoded trace data over HTTP. Refactor beater/jaeger.GRPCServer into Server, which now encapsulates both gRPC and HTTP servers.

Move beater/api/jaeger code into beater/jaeger, which is the only user of GRPCCollector. If the beater/jaeger code grows significantly, we might consider having subpackages like beater/jaeger/grpc, beater/jaeger/http, etc.

* [jaeger] Convert Timeevents to errors (elastic#3085)

* [jaeger] Convert Timeevents to errors

Parse Timeevents from Jaeger spans and convert to elastic error events
if they describe an error.

Fixes elastic#3007

* Add experimental flag to Jaeger integration (elastic#3121)

* tests/system: system test for Jaeger Thrift/HTTP (elastic#3114)

* tests/system: system test for Jaeger Thrift/HTTP

* tests/system: system test for Jaeger gRPC

* processor/otel: update approvals

Co-authored-by: Silvia Mitter <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants