Skip to content

Commit

Permalink
Merge branch 'master' into authorization-params
Browse files Browse the repository at this point in the history
  • Loading branch information
axw authored Jun 10, 2021
2 parents ed5cde6 + e18957c commit 360813d
Show file tree
Hide file tree
Showing 946 changed files with 20,573 additions and 75,260 deletions.
2 changes: 1 addition & 1 deletion beater/jaeger/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (m monitoringMap) add(id request.ResultID, n int64) {
func consumeBatch(
ctx context.Context,
batch model.Batch,
consumer consumer.TracesConsumer,
consumer consumer.Traces,
requestMetrics monitoringMap,
) error {
spanCount := int64(len(batch.Spans))
Expand Down
2 changes: 1 addition & 1 deletion beater/jaeger/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const (
// grpcCollector implements Jaeger api_v2 protocol for receiving tracing data
type grpcCollector struct {
auth authFunc
consumer consumer.TracesConsumer
consumer consumer.Traces
}

// PostSpans implements the api_v2/collector.proto. It converts spans received via Jaeger Proto batch to open-telemetry
Expand Down
5 changes: 5 additions & 0 deletions beater/jaeger/grpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/jaegertracing/jaeger/proto-gen/api_v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/translator/trace/jaeger"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -134,6 +135,10 @@ func (tc *testGRPCCollector) setup(t *testing.T) {

type tracesConsumerFunc func(ctx context.Context, td pdata.Traces) error

func (f tracesConsumerFunc) Capabilities() consumer.Capabilities {
return consumer.Capabilities{}
}

func (f tracesConsumerFunc) ConsumeTraces(ctx context.Context, td pdata.Traces) error {
return f(ctx, td)
}
Expand Down
10 changes: 5 additions & 5 deletions beater/jaeger/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var (
)

// newHTTPMux returns a new http.ServeMux which accepts Thrift-encoded spans.
func newHTTPMux(consumer consumer.TracesConsumer) (*http.ServeMux, error) {
func newHTTPMux(consumer consumer.Traces) (*http.ServeMux, error) {
handler, err := middleware.Wrap(
newHTTPHandler(consumer),
middleware.LogMiddleware(),
Expand All @@ -66,10 +66,10 @@ func newHTTPMux(consumer consumer.TracesConsumer) (*http.ServeMux, error) {
}

type httpHandler struct {
consumer consumer.TracesConsumer
consumer consumer.Traces
}

func newHTTPHandler(consumer consumer.TracesConsumer) request.Handler {
func newHTTPHandler(consumer consumer.Traces) request.Handler {
h := &httpHandler{consumer}
return h.handle
}
Expand Down Expand Up @@ -110,8 +110,8 @@ func (h *httpHandler) handleTraces(c *request.Context) {

var batch jaeger.Batch
transport := thrift.NewStreamTransport(c.Request.Body, ioutil.Discard)
protocol := thrift.NewTBinaryProtocolFactoryDefault().GetProtocol(transport)
if err := batch.Read(protocol); err != nil {
protocol := thrift.NewTBinaryProtocolFactoryConf(nil).GetProtocol(transport)
if err := batch.Read(c.Request.Context(), protocol); err != nil {
c.Result.SetWithError(request.IDResponseErrorsDecode, err)
return
}
Expand Down
6 changes: 3 additions & 3 deletions beater/jaeger/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ func encodeThriftSpans(spans ...*jaegerthrift.Span) io.Reader {
}

func encodeThriftBatch(batch *jaegerthrift.Batch) io.Reader {
transport := thrift.NewTMemoryBuffer()
if err := batch.Write(thrift.NewTBinaryProtocolTransport(transport)); err != nil {
buffer := thrift.NewTMemoryBuffer()
if err := batch.Write(context.Background(), thrift.NewTBinaryProtocolConf(buffer, nil)); err != nil {
panic(err)
}
return bytes.NewReader(transport.Buffer.Bytes())
return bytes.NewReader(buffer.Bytes())
}
8 changes: 2 additions & 6 deletions beater/otlp/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (

"github.com/pkg/errors"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver/metrics"
"go.opentelemetry.io/collector/receiver/otlpreceiver/trace"
"google.golang.org/grpc"

"github.com/elastic/apm-server/beater/request"
Expand Down Expand Up @@ -69,12 +67,10 @@ func RegisterGRPCServices(grpcServer *grpc.Server, processor model.BatchProcesso
// dynamically registered and unregistered.
setCurrentMonitoredConsumer(consumer)

traceReceiver := trace.New("otlp", consumer)
metricsReceiver := metrics.New("otlp", consumer)
if err := otlpreceiver.RegisterTraceReceiver(context.Background(), traceReceiver, grpcServer, nil); err != nil {
if err := otlpreceiver.RegisterTraceReceiver(context.Background(), consumer, grpcServer, nil); err != nil {
return errors.Wrap(err, "failed to register OTLP trace receiver")
}
if err := otlpreceiver.RegisterMetricsReceiver(context.Background(), metricsReceiver, grpcServer, nil); err != nil {
if err := otlpreceiver.RegisterMetricsReceiver(context.Background(), consumer, grpcServer, nil); err != nil {
return errors.Wrap(err, "failed to register OTLP metrics receiver")
}
return nil
Expand Down
6 changes: 6 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,18 @@ services:
FLEET_SERVER_ELASTICSEARCH_HOST: http://elasticsearch:9200
FLEET_SERVER_ELASTICSEARCH_USERNAME: "${ES_SUPERUSER_USER:-admin}"
FLEET_SERVER_ELASTICSEARCH_PASSWORD: "${ES_SUPERUSER_PASS:-changeme}"
FLEET_SERVER_CERT: /etc/pki/tls/certs/fleet-server.pem
FLEET_SERVER_CERT_KEY: /etc/pki/tls/private/fleet-server-key.pem
FLEET_URL: https://fleet-server:8220
KIBANA_FLEET_SETUP: "true"
KIBANA_HOST: "http://kibana:5601"
KIBANA_USERNAME: "${ES_SUPERUSER_USER:-admin}"
KIBANA_PASSWORD: "${ES_SUPERUSER_PASS:-changeme}"
depends_on:
elasticsearch: { condition: service_healthy }
volumes:
- "./testing/docker/fleet-server/certificate.pem:/etc/pki/tls/certs/fleet-server.pem"
- "./testing/docker/fleet-server/key.pem:/etc/pki/tls/private/fleet-server-key.pem"

package-registry:
image: docker.elastic.co/package-registry/distribution:snapshot
Expand Down
19 changes: 9 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module github.com/elastic/apm-server
go 1.13

require (
github.com/DataDog/zstd v1.4.4 // indirect
github.com/akavel/rsrc v0.10.2 // indirect
github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f
github.com/apache/thrift v0.14.1
github.com/cespare/xxhash/v2 v2.1.1
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
Expand All @@ -26,13 +27,12 @@ require (
github.com/fatih/color v1.12.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
github.com/gofrs/uuid v4.0.0+incompatible
github.com/gogo/googleapis v1.3.1-0.20190914144012-b8d18e97a9a1 // indirect
github.com/gogo/protobuf v1.3.2
github.com/google/pprof v0.0.0-20210208152844-1612e9be7af6
github.com/google/pprof v0.0.0-20210323184331-8eee2492667d
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru v0.5.4
github.com/jaegertracing/jaeger v1.22.0
github.com/jaegertracing/jaeger v1.23.0
github.com/josephspurrier/goversioninfo v1.2.0 // indirect
github.com/json-iterator/go v1.1.10
github.com/jstemmer/go-junit-report v0.9.1
Expand All @@ -43,7 +43,6 @@ require (
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/reviewdog/reviewdog v0.9.17
github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
Expand All @@ -62,22 +61,22 @@ require (
go.elastic.co/ecszap v1.0.0 // indirect
go.elastic.co/fastjson v1.1.0
go.elastic.co/go-licence-detector v0.5.0
go.opentelemetry.io/collector v0.22.0
go.opentelemetry.io/collector v0.28.0
go.uber.org/atomic v1.7.0
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.17.0
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210531225629-47163c9f4e4f // indirect
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/tools v0.1.2
google.golang.org/genproto v0.0.0-20210524171403-669157292da3 // indirect
google.golang.org/grpc v1.38.0
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v0.6.0
honnef.co/go/tools v0.1.1
honnef.co/go/tools v0.2.0
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
k8s.io/client-go v12.0.0+incompatible // indirect
)
Expand All @@ -94,7 +93,7 @@ replace (
github.com/fsnotify/fsevents => github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270
github.com/fsnotify/fsnotify => github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d
github.com/tonistiigi/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
golang.org/x/tools => golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0 // release 1.14
golang.org/x/tools => golang.org/x/tools v0.1.2
k8s.io/api => k8s.io/api v0.19.4
k8s.io/api/auditregistration/v1alpha1 => k8s.io/api/auditregistration/v1alpha1 v0.19.4
k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
Expand Down
Loading

0 comments on commit 360813d

Please sign in to comment.