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

Change census-instrumentation to open-telemetry and update authors #20

Merged
merged 7 commits into from
Jun 18, 2019
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# OpenTelemetry Service

*IMPORTANT:* This is a pre-released version of the OpenTelemetry Service.
For now, please use the [OpenCensus Service](https://github.com/census-instrumentation/opencensus-service).
For now, please use the [OpenCensus Service](https://github.com/open-telemetry/opentelemetry-service).

[![Build Status][travis-image]][travis-url]
[![GoDoc][godoc-image]][godoc-url]
Expand Down
30 changes: 15 additions & 15 deletions cmd/ocagent/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,20 +30,20 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/internal/config"
"github.com/census-instrumentation/opencensus-service/internal/config/viperutils"
"github.com/census-instrumentation/opencensus-service/internal/pprofserver"
"github.com/census-instrumentation/opencensus-service/internal/version"
"github.com/census-instrumentation/opencensus-service/internal/zpagesserver"
"github.com/census-instrumentation/opencensus-service/observability"
"github.com/census-instrumentation/opencensus-service/processor/multiconsumer"
"github.com/census-instrumentation/opencensus-service/receiver/jaegerreceiver"
"github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver"
"github.com/census-instrumentation/opencensus-service/receiver/prometheusreceiver"
"github.com/census-instrumentation/opencensus-service/receiver/vmmetricsreceiver"
"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver"
"github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver/zipkinscribereceiver"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/internal/config"
"github.com/open-telemetry/opentelemetry-service/internal/config/viperutils"
"github.com/open-telemetry/opentelemetry-service/internal/pprofserver"
"github.com/open-telemetry/opentelemetry-service/internal/version"
"github.com/open-telemetry/opentelemetry-service/internal/zpagesserver"
"github.com/open-telemetry/opentelemetry-service/observability"
"github.com/open-telemetry/opentelemetry-service/processor/multiconsumer"
"github.com/open-telemetry/opentelemetry-service/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/vmmetricsreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver/zipkinscribereceiver"
)

var rootCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions cmd/occollector/app/builder/builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ import (
"strings"
"time"

"github.com/census-instrumentation/opencensus-service/internal/config"
"github.com/open-telemetry/opentelemetry-service/internal/config"
"github.com/spf13/viper"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/builder/builder_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/builder/doc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions cmd/occollector/app/builder/exporters_builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -19,10 +19,10 @@ import (

"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/internal"
"github.com/census-instrumentation/opencensus-service/internal/configmodels"
"github.com/census-instrumentation/opencensus-service/internal/factories"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/internal"
"github.com/open-telemetry/opentelemetry-service/internal/configmodels"
"github.com/open-telemetry/opentelemetry-service/internal/factories"
)

// builtExporter is an exporter that is built based on a config. It can have
Expand Down
6 changes: 3 additions & 3 deletions cmd/occollector/app/builder/exporters_builder_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/census-instrumentation/opencensus-service/exporter/opencensusexporter"
"github.com/census-instrumentation/opencensus-service/internal/configmodels"
"github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-service/internal/configmodels"
)

func TestExportersBuilder_Build(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/occollector/app/builder/pipelines_builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -19,10 +19,10 @@ import (

"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/internal/configmodels"
"github.com/census-instrumentation/opencensus-service/internal/factories"
"github.com/census-instrumentation/opencensus-service/processor/multiconsumer"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/internal/configmodels"
"github.com/open-telemetry/opentelemetry-service/internal/factories"
"github.com/open-telemetry/opentelemetry-service/processor/multiconsumer"
)

// builtProcessor is a processor that is built based on a config.
Expand Down
10 changes: 5 additions & 5 deletions cmd/occollector/app/builder/pipelines_builder_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -25,10 +25,10 @@ import (

tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"

"github.com/census-instrumentation/opencensus-service/data"
"github.com/census-instrumentation/opencensus-service/internal/configmodels"
"github.com/census-instrumentation/opencensus-service/internal/configv2"
"github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor"
"github.com/open-telemetry/opentelemetry-service/data"
"github.com/open-telemetry/opentelemetry-service/internal/configmodels"
"github.com/open-telemetry/opentelemetry-service/internal/configv2"
"github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor"
)

// Ensure attributes processor is registered.
Expand Down
4 changes: 2 additions & 2 deletions cmd/occollector/app/builder/processor_builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@ import (

"github.com/spf13/viper"

"github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor"
)

// SenderType indicates the type of sender
Expand Down
4 changes: 2 additions & 2 deletions cmd/occollector/app/builder/processor_builder_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@ import (

"github.com/google/go-cmp/cmp"

"github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor"
)

func TestGlobalProcessorCfg_InitFromViper(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/builder/sampling_builder.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
16 changes: 8 additions & 8 deletions cmd/occollector/app/collector/collector.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,13 +28,13 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/internal/config/viperutils"
"github.com/census-instrumentation/opencensus-service/internal/configv2"
"github.com/census-instrumentation/opencensus-service/internal/pprofserver"
"github.com/census-instrumentation/opencensus-service/internal/zpagesserver"
"github.com/census-instrumentation/opencensus-service/receiver"
"github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/internal/config/viperutils"
"github.com/open-telemetry/opentelemetry-service/internal/configv2"
"github.com/open-telemetry/opentelemetry-service/internal/pprofserver"
"github.com/open-telemetry/opentelemetry-service/internal/zpagesserver"
"github.com/open-telemetry/opentelemetry-service/receiver"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/occollector/app/collector/collector_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -20,9 +20,9 @@ import (
"net/http"
"testing"

"github.com/census-instrumentation/opencensus-service/internal/testutils"
"github.com/open-telemetry/opentelemetry-service/internal/testutils"

"github.com/census-instrumentation/opencensus-service/internal/zpagesserver"
"github.com/open-telemetry/opentelemetry-service/internal/zpagesserver"
)

func TestApplication_Start(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/collector/healthcheck.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/collector/logger.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
26 changes: 13 additions & 13 deletions cmd/occollector/app/collector/processors.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -23,18 +23,18 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/sender"
"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/exporter/loggingexporter"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/queued"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/tailsampling"
"github.com/census-instrumentation/opencensus-service/internal/collector/sampling"
"github.com/census-instrumentation/opencensus-service/internal/config"
"github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor"
"github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor"
"github.com/census-instrumentation/opencensus-service/processor/multiconsumer"
"github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder"
"github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/sender"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/queued"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/tailsampling"
"github.com/open-telemetry/opentelemetry-service/internal/collector/sampling"
"github.com/open-telemetry/opentelemetry-service/internal/config"
"github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/multiconsumer"
)

func createExporters(v *viper.Viper, logger *zap.Logger) ([]func(), []consumer.TraceConsumer, []consumer.MetricsConsumer) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/occollector/app/collector/processors_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -21,10 +21,10 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor"
"github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor"
"github.com/census-instrumentation/opencensus-service/processor/multiconsumer"
"github.com/census-instrumentation/opencensus-service/processor/processortest"
"github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/multiconsumer"
"github.com/open-telemetry/opentelemetry-service/processor/processortest"
)

func Test_startProcessor(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions cmd/occollector/app/collector/receivers.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -21,13 +21,13 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder"
"github.com/census-instrumentation/opencensus-service/consumer"
jaegerreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/jaeger"
ocreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/opencensus"
zipkinreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin"
zipkinscribereceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin/scribe"
"github.com/census-instrumentation/opencensus-service/receiver"
"github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder"
"github.com/open-telemetry/opentelemetry-service/consumer"
jaegerreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/jaeger"
ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opencensus"
zipkinreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin"
zipkinscribereceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin/scribe"
"github.com/open-telemetry/opentelemetry-service/receiver"
)

func createReceivers(v *viper.Viper, logger *zap.Logger, traceConsumers consumer.TraceConsumer, asyncErrorChan chan<- error) []receiver.TraceReceiver {
Expand Down
14 changes: 7 additions & 7 deletions cmd/occollector/app/collector/telemetry.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -25,12 +25,12 @@ import (
"go.opencensus.io/stats/view"
"go.uber.org/zap"

"github.com/census-instrumentation/opencensus-service/internal/collector/processor"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/queued"
"github.com/census-instrumentation/opencensus-service/internal/collector/processor/tailsampling"
"github.com/census-instrumentation/opencensus-service/internal/collector/telemetry"
"github.com/census-instrumentation/opencensus-service/observability"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/queued"
"github.com/open-telemetry/opentelemetry-service/internal/collector/processor/tailsampling"
"github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry"
"github.com/open-telemetry/opentelemetry-service/observability"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/sender/doc.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018, OpenCensus Authors
// Copyright 2018, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmd/occollector/app/sender/empty_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions cmd/occollector/app/sender/jaeger_proto_grpc_sender.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019, OpenCensus Authors
// Copyright 2019, OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -22,9 +22,9 @@ import (

jaegerproto "github.com/jaegertracing/jaeger/proto-gen/api_v2"

"github.com/census-instrumentation/opencensus-service/consumer"
"github.com/census-instrumentation/opencensus-service/data"
jaegertranslator "github.com/census-instrumentation/opencensus-service/translator/trace/jaeger"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/data"
jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger"
)

// JaegerProtoGRPCSender forwards spans encoded in the jaeger proto
Expand Down
Loading