Refacto: telemetry (#91)

go.mod

@@ -5,6 +5,7 @@ go 1.22.3
 toolchain go1.22.4
 
 require (
+	github.com/agoda-com/opentelemetry-logs-go v0.5.1
 	github.com/caarlos0/env/v10 v10.0.0
 	github.com/cucumber/godog v0.14.1
 	github.com/docker/distribution v2.8.3+incompatible
@@ -18,6 +19,7 @@ require (
 	github.com/google/wire v0.6.0
 	github.com/gorilla/mux v1.8.1
 	github.com/jmoiron/sqlx v1.4.0
+	github.com/rs/zerolog v1.33.0
 	github.com/tdewolff/minify/v2 v2.20.20
 	go.opentelemetry.io/contrib/bridges/otelslog v0.3.0
 	go.opentelemetry.io/otel v1.28.0
@@ -30,7 +32,6 @@ require (
 	go.opentelemetry.io/otel/sdk/log v0.4.0
 	go.opentelemetry.io/otel/sdk/metric v1.28.0
 	go.opentelemetry.io/otel/trace v1.28.0
-	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.65.0
 	gotest.tools v2.2.0+incompatible
 )
@@ -54,13 +55,14 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tdewolff/parse/v2 v2.7.13 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect

go.sum

@@ -4,10 +4,13 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
+github.com/agoda-com/opentelemetry-logs-go v0.5.1 h1:6iQrLaY4M0glBZb/xVN559qQutK4V+HJ/mB1cbwaX3c=
+github.com/agoda-com/opentelemetry-logs-go v0.5.1/go.mod h1:35B5ypjX5pkVCPJR01i6owJSYWe8cnbWLpEyHgAGD/E=
 github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdzXA=
 github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cucumber/gherkin/go/v26 v26.2.0 h1:EgIjePLWiPeslwIWmNQ3XHcypPsWAHoMCz/YEBKP4GI=
 github.com/cucumber/gherkin/go/v26 v26.2.0/go.mod h1:t2GAPnB8maCT4lkHL99BDCVNzCh1d7dBhCLt150Nr/0=
@@ -50,6 +53,7 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx
 github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.3.1+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
@@ -100,6 +104,11 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
@@ -114,6 +123,9 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -166,10 +178,6 @@ go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
-go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -211,7 +219,9 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

godog_test.go

@@ -27,11 +27,13 @@ func init() {
 func TestFeatures(t *testing.T) {
 	mocked := mocks.New(t)
 	mocked.ContactRepository.EXPECT().Save(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mocked.HttpTracer.EXPECT().StartRoot(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
-	mocked.HttpTracer.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
-	mocked.HttpTracer.EXPECT().ShutdownTracer(gomock.Any()).Return(nil).AnyTimes()
-	mocked.HttpTracer.EXPECT().ShutdownMeter(gomock.Any()).Return(nil).AnyTimes()
-	mocked.HttpTracer.EXPECT().ShutdownLogger(gomock.Any()).Return(nil).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().StartRoot(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().ShutdownTracer(gomock.Any()).Return(nil).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().ShutdownMeter(gomock.Any()).Return(nil).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().ShutdownLogger(gomock.Any()).Return(nil).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().Error(gomock.Any(), gomock.Any()).AnyTimes()
+	mocked.HttpTelemetry.EXPECT().Log(gomock.Any(), gomock.Any()).AnyTimes()
 	mocked.Mailer.EXPECT().Send(gomock.Any(), gomock.Any()).Return(true, nil).AnyTimes()
 	mocked.TechnoRepository.EXPECT().FetchStack(context.Background()).Return(map[string]interface{}{}, nil).AnyTimes()
 

k6/test.js

@@ -17,7 +17,7 @@ export const options = {
 
 // Simulated user behavior
 export default function () {
-    let res = http.get("http://192.168.1.54:8002/");
+    let res = http.get("https://www.medzoner.com/");
     // Validate response status
     check(res, { "status was 200": (r) => r.status === 200 });
     sleep(1);

package.json

@@ -0,0 +1,18 @@
+{
+  "name": "medzoner-go",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "gateling": "docker run --rm -i grafana/k6 run  --vus 10 --duration 30s  - <k6/test.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Medzoner/medzoner-go.git"
+  },
+  "private": true,
+  "dependencies": {
+    "k6": "^0.0.0"
+  }
+}

pkg/application/command/create_contact_command_handler.go

@@ -9,8 +9,7 @@ import (
 	"github.com/Medzoner/medzoner-go/pkg/domain/customtype"
 	"github.com/Medzoner/medzoner-go/pkg/domain/repository"
 	"github.com/Medzoner/medzoner-go/pkg/infra/entity"
-	"github.com/Medzoner/medzoner-go/pkg/infra/logger"
-	"github.com/Medzoner/medzoner-go/pkg/infra/tracer"
+	"github.com/Medzoner/medzoner-go/pkg/infra/telemetry"
 
 	"github.com/docker/distribution/uuid"
 )
@@ -19,28 +18,25 @@ import (
 type CreateContactCommandHandler struct {
 	ContactRepository          repository.ContactRepository
 	ContactCreatedEventHandler event.IEventHandler
-	Logger                     logger.ILogger
-	Tracer                     tracer.Tracer
+	Telemetry                  telemetry.Telemeter
 }
 
 // NewCreateContactCommandHandler is a function that returns a new CreateContactCommandHandler
 func NewCreateContactCommandHandler(
 	contactRepository repository.ContactRepository,
 	contactCreatedEventHandler event.IEventHandler,
-	logger logger.ILogger,
-	tracer tracer.Tracer,
+	tm telemetry.Telemeter,
 ) CreateContactCommandHandler {
 	return CreateContactCommandHandler{
 		ContactRepository:          contactRepository,
 		ContactCreatedEventHandler: contactCreatedEventHandler,
-		Logger:                     logger,
-		Tracer:                     tracer,
+		Telemetry:                  tm,
 	}
 }
 
 // Handle handles command CreateContactCommand and create contact in database and send mail to admin with event ContactCreatedEvent
 func (c *CreateContactCommandHandler) Handle(ctx context.Context, command CreateContactCommand) error {
-	ctx, iSpan := c.Tracer.Start(ctx, "CreateContactCommandHandler.Publish")
+	ctx, iSpan := c.Telemetry.Start(ctx, "CreateContactCommandHandler.Publish")
 	defer iSpan.End()
 
 	contact := entity.Contact{
@@ -51,12 +47,12 @@ func (c *CreateContactCommandHandler) Handle(ctx context.Context, command Create
 		UUID:    uuid.UUID{}.String(),
 	}
 	if err := c.ContactRepository.Save(ctx, contact); err != nil {
-		return c.Tracer.Error(iSpan, fmt.Errorf("error during save contact: %w", err))
+		return c.Telemetry.ErrorSpan(iSpan, fmt.Errorf("error during save contact: %w", err))
 	}
-	c.Logger.Log("Contact was created.")
+	c.Telemetry.Log(ctx, "Contact was created.")
 
 	if err := c.ContactCreatedEventHandler.Publish(ctx, event.ContactCreatedEvent{Contact: contact}); err != nil {
-		return c.Tracer.Error(iSpan, fmt.Errorf("error during handle event: %w", err))
+		return c.Telemetry.ErrorSpan(iSpan, fmt.Errorf("error during handle event: %w", err))
 	}
 
 	return nil

pkg/application/command/create_contact_command_handler_test.go

@@ -27,17 +27,17 @@ func TestCreateContactCommandHandler(t *testing.T) {
 		}
 
 		mocked := mocks.New(t)
-		mocked.HttpTracer.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Error(gomock.Any(), gomock.Any()).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Log(gomock.Any(), gomock.Any()).AnyTimes()
 		mocked.Mailer.EXPECT().Send(gomock.Any(), gomock.Any()).Return(true, nil).AnyTimes()
-		loggerTest := &LoggerTest{}
 		handler := command.NewCreateContactCommandHandler(
-			&ContactRepositoryTest{}, event.ContactCreatedEventHandler{Mailer: mocked.Mailer, Tracer: mocked.HttpTracer, Logger: loggerTest}, loggerTest, mocked.HttpTracer,
+			&ContactRepositoryTest{}, event.ContactCreatedEventHandler{Mailer: mocked.Mailer, Telemetry: mocked.HttpTelemetry}, mocked.HttpTelemetry,
 		)
 
 		err := handler.Handle(context.Background(), createContactCommand)
 
 		assert.Equal(t, err, nil)
-		assert.Equal(t, loggerTest.LogMessages[0], "Contact was created.")
 	})
 	t.Run("Unit: test CreateContactCommandHandler error save db", func(t *testing.T) {
 		date := time.Time{}
@@ -49,17 +49,15 @@ func TestCreateContactCommandHandler(t *testing.T) {
 		}
 
 		mocked := mocks.New(t)
-		mocked.HttpTracer.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
-		mocked.HttpTracer.EXPECT().Error(gomock.Any(), gomock.Any()).Return(errors.New("error")).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().ErrorSpan(gomock.Any(), gomock.Any()).Return(errors.New("error")).AnyTimes()
 		mocked.ContactRepository.EXPECT().Save(gomock.Any(), gomock.Any()).Return(errors.New("error")).Times(1)
-		loggerTest := &LoggerTest{}
 
 		handler := command.NewCreateContactCommandHandler(
 			mocked.ContactRepository, event.ContactCreatedEventHandler{
-				Mailer: mocked.Mailer, Tracer: mocked.HttpTracer, Logger: loggerTest,
+				Mailer: mocked.Mailer, Telemetry: mocked.HttpTelemetry,
 			},
-			loggerTest,
-			mocked.HttpTracer,
+			mocked.HttpTelemetry,
 		)
 		err := handler.Handle(context.Background(), createContactCommand)
 
@@ -75,13 +73,14 @@ func TestCreateContactCommandHandler(t *testing.T) {
 		}
 
 		mocked := mocks.New(t)
-		mocked.HttpTracer.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
-		mocked.HttpTracer.EXPECT().Error(gomock.Any(), gomock.Any()).Return(errors.New("error")).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Start(gomock.Any(), gomock.Any(), gomock.Any()).Return(context.Background(), noop.Span{}).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().ErrorSpan(gomock.Any(), gomock.Any()).Return(errors.New("error")).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Error(gomock.Any(), gomock.Any()).AnyTimes()
+		mocked.HttpTelemetry.EXPECT().Log(gomock.Any(), gomock.Any()).AnyTimes()
 		mocked.Mailer.EXPECT().Send(gomock.Any(), gomock.Any()).Return(false, errors.New("error")).Times(1)
-		loggerTest := &LoggerTest{}
 
 		handler := command.NewCreateContactCommandHandler(
-			&ContactRepositoryTest{}, event.ContactCreatedEventHandler{Mailer: mocked.Mailer, Tracer: mocked.HttpTracer, Logger: loggerTest}, loggerTest, mocked.HttpTracer,
+			&ContactRepositoryTest{}, event.ContactCreatedEventHandler{Mailer: mocked.Mailer, Telemetry: mocked.HttpTelemetry}, mocked.HttpTelemetry,
 		)
 		err := handler.Handle(context.Background(), createContactCommand)
 

pkg/application/event/contact_created_event_handler.go

@@ -3,43 +3,41 @@ package event
 import (
 	"context"
 	"fmt"
+
 	"github.com/Medzoner/medzoner-go/pkg/application/service/mailer"
 	"github.com/Medzoner/medzoner-go/pkg/infra/entity"
-	"github.com/Medzoner/medzoner-go/pkg/infra/logger"
-	"github.com/Medzoner/medzoner-go/pkg/infra/tracer"
+	"github.com/Medzoner/medzoner-go/pkg/infra/telemetry"
 )
 
 // ContactCreatedEventHandler is a struct that implements EventHandler interface and handle ContactCreatedEvent
 type ContactCreatedEventHandler struct {
-	Mailer mailer.Mailer
-	Logger logger.ILogger
-	Tracer tracer.Tracer
+	Mailer    mailer.Mailer
+	Telemetry telemetry.Telemeter
 }
 
 // NewContactCreatedEventHandler is a function that returns a new ContactCreatedEventHandler
-func NewContactCreatedEventHandler(mailer mailer.Mailer, logger logger.ILogger, tracer tracer.Tracer) *ContactCreatedEventHandler {
+func NewContactCreatedEventHandler(mailer mailer.Mailer, tm telemetry.Telemeter) *ContactCreatedEventHandler {
 	return &ContactCreatedEventHandler{
-		Mailer: mailer,
-		Logger: logger,
-		Tracer: tracer,
+		Mailer:    mailer,
+		Telemetry: tm,
 	}
 }
 
 // Publish handles event ContactCreatedEvent and send mail to admin
 func (c ContactCreatedEventHandler) Publish(ctx context.Context, event Event) error {
-	ctx, iSpan := c.Tracer.Start(ctx, "ContactCreatedEventHandler.Publish")
+	ctx, iSpan := c.Telemetry.Start(ctx, "ContactCreatedEventHandler.Publish")
 	defer iSpan.End()
 
 	switch event.(type) {
 	case ContactCreatedEvent:
 		contactCreated := event.GetModel().(entity.Contact)
 		_, err := c.Mailer.Send(ctx, contactCreated)
 		if err != nil {
-			return c.Tracer.Error(iSpan, fmt.Errorf("error during send mail: %w", err))
+			return c.Telemetry.ErrorSpan(iSpan, fmt.Errorf("error during send mail: %w", err))
 		}
-		c.Logger.Log("Mail was send.")
+		c.Telemetry.Log(ctx, "Mail was send.")
 	default:
-		c.Logger.Error("Error bad event type.")
+		c.Telemetry.Error(ctx, "ErrorSpan bad event type.")
 	}
 
 	return nil