From 77ab12c3ac907a98bdff4365f576ce647247ed8d Mon Sep 17 00:00:00 2001 From: Natalia Goc Date: Mon, 20 May 2024 08:20:13 +0200 Subject: [PATCH] move repository and module imports to new location --- example/main.go | 10 +++++----- go.mod | 8 +++----- go.sum | 4 ---- pkg/attr/attr.go | 2 +- pkg/attr/layer_attr/layer_attr.go | 4 ++-- pkg/console_fmt/fmt.go | 2 +- pkg/event/event.go | 4 ++-- pkg/exporters/console_exporter/console_exporter.go | 4 ++-- pkg/exporters/console_exporter/multiline_formatter.go | 4 ++-- pkg/exporters/exporters.go | 4 ++-- pkg/exporters/gelf_exporter/gelf.go | 2 +- pkg/exporters/gelf_exporter/trace.go | 6 +++--- pkg/fiber_tracing/fiber_tracing.go | 2 +- pkg/level/level.go | 2 +- 14 files changed, 26 insertions(+), 32 deletions(-) diff --git a/example/main.go b/example/main.go index e8a6bff..5522b43 100644 --- a/example/main.go +++ b/example/main.go @@ -8,11 +8,11 @@ import ( "os/signal" "time" - "git.ma-al.com/gora_filip/pkg/attr/layer_attr" - "git.ma-al.com/gora_filip/pkg/event" - "git.ma-al.com/gora_filip/pkg/exporters" - tracing "git.ma-al.com/gora_filip/pkg/fiber_tracing" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/attr/layer_attr" + "git.ma-al.com/maal-libraries/observer/pkg/event" + "git.ma-al.com/maal-libraries/observer/pkg/exporters" + tracing "git.ma-al.com/maal-libraries/observer/pkg/fiber_tracing" + "git.ma-al.com/maal-libraries/observer/pkg/level" "github.com/gofiber/fiber/v2" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" ) diff --git a/go.mod b/go.mod index a2f42ac..bac4b2b 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,12 @@ -module git.ma-al.com/gora_filip +module git.ma-al.com/maal-libraries/observer -go 1.21.0 +go 1.21 require ( - git.ma-al.com/gora_filip/observer v0.0.0-20240430124205-be03e0ce4205 github.com/gofiber/fiber/v2 v2.52.4 github.com/psmarcin/fiber-opentelemetry v1.2.0 go.opentelemetry.io/otel v1.26.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 go.opentelemetry.io/otel/sdk v1.26.0 go.opentelemetry.io/otel/trace v1.26.0 gopkg.in/Graylog2/go-gelf.v2 v2.0.0-20191017102106-1550ee647df0 @@ -30,6 +27,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.52.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect go.opentelemetry.io/otel/metric v1.26.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect golang.org/x/net v0.23.0 // indirect diff --git a/go.sum b/go.sum index 2ab7a31..2124972 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -git.ma-al.com/gora_filip/observer v0.0.0-20240430124205-be03e0ce4205 h1:tuJ7e4EAWx/IbVESEO6l3yNoGiUAoaXWssMc26Ft3Hs= -git.ma-al.com/gora_filip/observer v0.0.0-20240430124205-be03e0ce4205/go.mod h1:NLwhsfm3SE3YwR+3z4DbH82OBjRPcE+M/GPGEc7DPUM= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= @@ -59,8 +57,6 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 h1:1u/AyyOqAWzy+SkPxDp go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0/go.mod h1:z46paqbJ9l7c9fIPCXTqTGwhQZ5XoTIsfeFYWboizjs= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 h1:1wp/gyxsuYtuE/JFxsQRtcCDtMrO2qMvlfXALU5wkzI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0/go.mod h1:gbTHmghkGgqxMomVQQMur1Nba4M0MQ8AYThXDUjsJ38= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 h1:0W5o9SzoR15ocYHEQfvfipzcNog1lBxOLfnex91Hk6s= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0/go.mod h1:zVZ8nz+VSggWmnh6tTsJqXQ7rU4xLwRtna1M4x5jq58= go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8= diff --git a/pkg/attr/attr.go b/pkg/attr/attr.go index 3c244d3..e284b62 100644 --- a/pkg/attr/attr.go +++ b/pkg/attr/attr.go @@ -6,7 +6,7 @@ import ( "runtime" "runtime/debug" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/level" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/semconv/v1.25.0" "go.opentelemetry.io/otel/trace" diff --git a/pkg/attr/layer_attr/layer_attr.go b/pkg/attr/layer_attr/layer_attr.go index 5c90be4..f3fb042 100644 --- a/pkg/attr/layer_attr/layer_attr.go +++ b/pkg/attr/layer_attr/layer_attr.go @@ -1,8 +1,8 @@ package layer_attr import ( - "git.ma-al.com/gora_filip/pkg/attr" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/attr" + "git.ma-al.com/maal-libraries/observer/pkg/level" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/console_fmt/fmt.go b/pkg/console_fmt/fmt.go index 7bbf702..4a3119e 100644 --- a/pkg/console_fmt/fmt.go +++ b/pkg/console_fmt/fmt.go @@ -1,7 +1,7 @@ package console_fmt import ( - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/level" ) const ( diff --git a/pkg/event/event.go b/pkg/event/event.go index aa6a4fa..2d2493e 100644 --- a/pkg/event/event.go +++ b/pkg/event/event.go @@ -1,8 +1,8 @@ package event import ( - "git.ma-al.com/gora_filip/pkg/attr" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/attr" + "git.ma-al.com/maal-libraries/observer/pkg/level" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/exporters/console_exporter/console_exporter.go b/pkg/exporters/console_exporter/console_exporter.go index e18a550..a9e7134 100644 --- a/pkg/exporters/console_exporter/console_exporter.go +++ b/pkg/exporters/console_exporter/console_exporter.go @@ -5,8 +5,8 @@ import ( "fmt" "slices" - "git.ma-al.com/gora_filip/pkg/attr" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/attr" + "git.ma-al.com/maal-libraries/observer/pkg/level" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/pkg/exporters/console_exporter/multiline_formatter.go b/pkg/exporters/console_exporter/multiline_formatter.go index 486275a..cbbe06f 100644 --- a/pkg/exporters/console_exporter/multiline_formatter.go +++ b/pkg/exporters/console_exporter/multiline_formatter.go @@ -4,8 +4,8 @@ import ( "fmt" "slices" - "git.ma-al.com/gora_filip/pkg/console_fmt" - "git.ma-al.com/gora_filip/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/console_fmt" + "git.ma-al.com/maal-libraries/observer/pkg/level" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/pkg/exporters/exporters.go b/pkg/exporters/exporters.go index 4482e77..b04d521 100644 --- a/pkg/exporters/exporters.go +++ b/pkg/exporters/exporters.go @@ -2,8 +2,8 @@ package exporters import ( "context" - "git.ma-al.com/gora_filip/pkg/exporters/console_exporter" - gelf_exporter "git.ma-al.com/gora_filip/pkg/exporters/gelf_exporter" + "git.ma-al.com/maal-libraries/observer/pkg/exporters/console_exporter" + gelf_exporter "git.ma-al.com/maal-libraries/observer/pkg/exporters/gelf_exporter" otlphttp_exporter "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/pkg/exporters/gelf_exporter/gelf.go b/pkg/exporters/gelf_exporter/gelf.go index 47cf51e..11587c1 100644 --- a/pkg/exporters/gelf_exporter/gelf.go +++ b/pkg/exporters/gelf_exporter/gelf.go @@ -6,7 +6,7 @@ import ( "time" - "git.ma-al.com/gora_filip/pkg/syslog" + "git.ma-al.com/maal-libraries/observer/pkg/syslog" "gopkg.in/Graylog2/go-gelf.v2/gelf" ) diff --git a/pkg/exporters/gelf_exporter/trace.go b/pkg/exporters/gelf_exporter/trace.go index 3c4888f..1abcde1 100644 --- a/pkg/exporters/gelf_exporter/trace.go +++ b/pkg/exporters/gelf_exporter/trace.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "git.ma-al.com/gora_filip/pkg/attr" - "git.ma-al.com/gora_filip/pkg/level" - "git.ma-al.com/gora_filip/pkg/syslog" + "git.ma-al.com/maal-libraries/observer/pkg/attr" + "git.ma-al.com/maal-libraries/observer/pkg/level" + "git.ma-al.com/maal-libraries/observer/pkg/syslog" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" diff --git a/pkg/fiber_tracing/fiber_tracing.go b/pkg/fiber_tracing/fiber_tracing.go index 123bb40..fb9535c 100644 --- a/pkg/fiber_tracing/fiber_tracing.go +++ b/pkg/fiber_tracing/fiber_tracing.go @@ -4,7 +4,7 @@ import ( "context" "log" - "git.ma-al.com/gora_filip/pkg/exporters" + "git.ma-al.com/maal-libraries/observer/pkg/exporters" "github.com/gofiber/fiber/v2" fiberOpentelemetry "github.com/psmarcin/fiber-opentelemetry/pkg/fiber-otel" "go.opentelemetry.io/otel" diff --git a/pkg/level/level.go b/pkg/level/level.go index dc9d532..5193d80 100644 --- a/pkg/level/level.go +++ b/pkg/level/level.go @@ -1,7 +1,7 @@ package level import ( - "git.ma-al.com/gora_filip/pkg/syslog" + "git.ma-al.com/maal-libraries/observer/pkg/syslog" "go.opentelemetry.io/otel/attribute" )