Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Use main server o11y package #205

Merged
merged 1 commit into from
Aug 8, 2020
Merged

Use main server o11y package #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions cmd/adminapi/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/controller/middleware"
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/logging"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/render"

"github.com/google/exposure-notifications-server/pkg/cache"
"github.com/google/exposure-notifications-server/pkg/observability"
"github.com/google/exposure-notifications-server/pkg/server"

"github.com/gorilla/handlers"
Expand Down Expand Up @@ -71,9 +71,10 @@ func realMain(ctx context.Context) error {
if err != nil {
return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
}
if err := oe.InitExportOnce(); err != nil {
if err := oe.StartExporter(); err != nil {
return fmt.Errorf("error initializing observability exporter: %w", err)
}
defer oe.Close()
logger.Infow("observability exporter", "config", oeConfig)

// Setup database
Expand Down
5 changes: 3 additions & 2 deletions cmd/apiserver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/gcpkms"
"github.com/google/exposure-notifications-verification-server/pkg/logging"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"
"github.com/google/exposure-notifications-verification-server/pkg/render"
"github.com/mikehelmick/go-chaff"
"github.com/sethvargo/go-limiter/httplimit"
"github.com/sethvargo/go-signalcontext"

"github.com/google/exposure-notifications-server/pkg/cache"
"github.com/google/exposure-notifications-server/pkg/observability"
"github.com/google/exposure-notifications-server/pkg/server"

"github.com/gorilla/handlers"
Expand Down Expand Up @@ -73,9 +73,10 @@ func realMain(ctx context.Context) error {
if err != nil {
return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
}
if err := oe.InitExportOnce(); err != nil {
if err := oe.StartExporter(); err != nil {
return fmt.Errorf("error initializing observability exporter: %w", err)
}
defer oe.Close()
logger.Infow("observability exporter", "config", oeConfig)

// Setup database
Expand Down
5 changes: 3 additions & 2 deletions cmd/cleanup/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/controller"
"github.com/google/exposure-notifications-verification-server/pkg/controller/cleanup"
"github.com/google/exposure-notifications-verification-server/pkg/logging"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/render"
"github.com/sethvargo/go-signalcontext"

"github.com/google/exposure-notifications-server/pkg/cache"
"github.com/google/exposure-notifications-server/pkg/observability"
"github.com/google/exposure-notifications-server/pkg/server"

"github.com/gorilla/mux"
Expand Down Expand Up @@ -63,9 +63,10 @@ func realMain(ctx context.Context) error {
if err != nil {
return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
}
if err := oe.InitExportOnce(); err != nil {
if err := oe.StartExporter(); err != nil {
return fmt.Errorf("error initializing observability exporter: %w", err)
}
defer oe.Close()
logger.Infow("observability exporter", "config", oeConfig)

// Setup database
Expand Down
5 changes: 3 additions & 2 deletions cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/google/exposure-notifications-verification-server/pkg/controller/session"
"github.com/google/exposure-notifications-verification-server/pkg/controller/user"
"github.com/google/exposure-notifications-verification-server/pkg/logging"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"
"github.com/google/exposure-notifications-verification-server/pkg/render"

"github.com/google/exposure-notifications-server/pkg/observability"
"github.com/google/exposure-notifications-server/pkg/server"

firebase "firebase.google.com/go"
Expand Down Expand Up @@ -75,9 +75,10 @@ func realMain(ctx context.Context) error {
if err != nil {
return fmt.Errorf("unable to create ObservabilityExporter provider: %w", err)
}
if err := oe.InitExportOnce(); err != nil {
if err := oe.StartExporter(); err != nil {
return fmt.Errorf("error initializing observability exporter: %w", err)
}
defer oe.Close()
logger.Infow("observability exporter", "config", oeConfig)

// Setup sessions
Expand Down
3 changes: 0 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ go 1.14
require (
cloud.google.com/go v0.63.0
cloud.google.com/go/firestore v1.2.0 // indirect
contrib.go.opencensus.io/exporter/ocagent v0.7.0
contrib.go.opencensus.io/exporter/stackdriver v0.13.1
firebase.google.com/go v3.13.0+incompatible
github.com/Azure/azure-sdk-for-go v45.1.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.3 // indirect
Expand Down Expand Up @@ -47,7 +45,6 @@ require (
github.com/sethvargo/go-signalcontext v0.1.0
github.com/stretchr/objx v0.3.0 // indirect
github.com/stretchr/testify v1.6.1 // indirect
go.opencensus.io v0.22.4
go.uber.org/zap v1.15.0
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
golang.org/x/sys v0.0.0-20200806125547-5acd03effb82 // indirect
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
Expand Down
4 changes: 3 additions & 1 deletion pkg/config/admin_server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import (
"time"

"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/observability"

"github.com/google/exposure-notifications-server/pkg/observability"

"github.com/sethvargo/go-envconfig"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/config/api_server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import (
"time"

"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"

"github.com/google/exposure-notifications-server/pkg/observability"

"github.com/sethvargo/go-envconfig"
)

Expand Down
3 changes: 2 additions & 1 deletion pkg/config/cleanup_server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import (
"time"

"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/observability"

"github.com/google/exposure-notifications-server/pkg/observability"

"github.com/sethvargo/go-envconfig"
)
Expand Down
5 changes: 3 additions & 2 deletions pkg/config/server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ import (
"strings"
"time"

"github.com/google/exposure-notifications-server/pkg/base64util"
"github.com/google/exposure-notifications-verification-server/pkg/database"
"github.com/google/exposure-notifications-verification-server/pkg/observability"
"github.com/google/exposure-notifications-verification-server/pkg/ratelimit"

"github.com/google/exposure-notifications-server/pkg/base64util"
"github.com/google/exposure-notifications-server/pkg/observability"

firebase "firebase.google.com/go"
"github.com/sethvargo/go-envconfig"
)
Expand Down
53 changes: 0 additions & 53 deletions pkg/observability/config.go
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions pkg/observability/generic.go
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions pkg/observability/noop.go
View file
Open in desktop

This file was deleted.

Loading