Switch Jaeger receiver to internal data model

open-telemetry · Apr 18, 2020 · 1ccb464 · 1ccb464
1 parent 5e3b4e2
commit 1ccb464
Show file tree

Hide file tree

Showing 15 changed files with 668 additions and 323 deletions.
diff --git a/consumer/pdata/generated_common.go b/consumer/pdata/generated_common.go
diff --git a/consumer/pdata/generated_metrics.go b/consumer/pdata/generated_metrics.go
diff --git a/consumer/pdata/generated_resource.go b/consumer/pdata/generated_resource.go
diff --git a/consumer/pdata/generated_trace.go b/consumer/pdata/generated_trace.go
diff --git a/internal/data_generator/internal/base_structs.go b/internal/data_generator/internal/base_structs.go
@@ -21,7 +21,7 @@ import (
 
 const sliceTemplate = `// ${structName} logically represents a slice of ${elementName}.
 //
-// This is a reference type, if passsed by value and callee modifies it the
+// This is a reference type, if passed by value and callee modifies it the
 // caller will see the modification.
 //
 // Must use New${structName} function to create new instances.
@@ -210,7 +210,7 @@ func fillTest${structName}(tv ${structName}) {
 
 const messageTemplate = `${description}
 //
-// This is a reference type, if passsed by value and callee modifies it the
+// This is a reference type, if passed by value and callee modifies it the
 // caller will see the modification.
 //
 // Must use New${structName} function to create new instances.

diff --git a/internal/data_generator/internal/files.go b/internal/data_generator/internal/files.go
diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go
@@ -111,9 +111,9 @@ func (f *Factory) CreateDefaultConfig() configmodels.Receiver {
 // CreateTraceReceiver creates a trace receiver based on provided config.
 func (f *Factory) CreateTraceReceiver(
  ctx context.Context,
- logger *zap.Logger,
+ params component.ReceiverCreateParams,
  cfg configmodels.Receiver,
- nextConsumer consumer.TraceConsumerOld,
+ nextConsumer consumer.TraceConsumer,
 ) (component.TraceReceiver, error) {
 
  // Convert settings in the source config to Configuration struct
@@ -130,6 +130,7 @@ func (f *Factory) CreateTraceReceiver(
 
  config := Configuration{}
  var grpcServerOptions []grpc.ServerOption
+ logger := params.Logger
 
  // Set ports
  if protoGRPC != nil && protoGRPC.IsEnabled() {
@@ -213,14 +214,15 @@ func (f *Factory) CreateTraceReceiver(
  }
 
  // Create the receiver.
- return New(rCfg.Name(), &config, nextConsumer, logger)
+ return New(rCfg.Name(), &config, nextConsumer, params)
 }
 
 // CreateMetricsReceiver creates a metrics receiver based on provided config.
 func (f *Factory) CreateMetricsReceiver(
- logger *zap.Logger,
+ ctx context.Context,
+ params component.ReceiverCreateParams,
  cfg configmodels.Receiver,
- consumer consumer.MetricsConsumerOld,
+ consumer consumer.MetricsConsumer,
 ) (component.MetricsReceiver, error) {
  return nil, configerror.ErrDataTypeIsNotSupported
 }