Skip to content

Commit e71fb9f

Browse files
AchoArnoldAchoArnold
committed
Fix heartbeat
1 parent 783e75a commit e71fb9f

File tree

10 files changed

+43
-34
lines changed

10 files changed

+43
-34
lines changed

‎api/.env.production‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
ENV=production
2+
3+
GCP_PROJECT_ID=
4+
5+
APP_HTTP_LOGGER=
6+
7+
EVENTS_QUEUE_USER_API_KEY=
8+
EVENTS_QUEUE_NAME=
9+
EVENTS_QUEUE_USER_ID=
10+
EVENTS_QUEUE_ENDPOINT=
11+
12+
FIREBASE_CREDENTIALS=
13+
14+
SMTP_FROM_NAME=
15+
SMTP_FROM_EMAIL=
16+
SMTP_USERNAME=
17+
SMTP_PASSWORD=
18+
SMTP_HOST=
19+
SMTP_PORT=
20+
21+
APP_URL=
22+
APP_NAME=
23+
APP_LOGO_URL=
24+
25+
DATABASE_URL

‎api/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/thedevsaddam/govalidator v1.9.10
2929
github.com/uptrace/uptrace-go v1.9.0
3030
go.opentelemetry.io/otel v1.9.0
31-
go.opentelemetry.io/otel/exporters/jaeger v1.7.0
3231
go.opentelemetry.io/otel/metric v0.31.0
3332
go.opentelemetry.io/otel/sdk v1.9.0
3433
go.opentelemetry.io/otel/trace v1.9.0

‎api/go.sum‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cma
478478
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
479479
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
480480
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
481-
github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
482481
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
483482
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
484483
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -527,11 +526,8 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
527526
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE=
528527
go.opentelemetry.io/contrib/instrumentation/runtime v0.34.0 h1:zt4RDodWkgiHk8tyUmFOjFoOOfyGH7vwIbUzKP6CCh8=
529528
go.opentelemetry.io/contrib/instrumentation/runtime v0.34.0/go.mod h1:5wIoZE96WbcQVU3D6UF/ukRfFQXbB6OYgeWi9CjHa90=
530-
go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
531529
go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw=
532530
go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
533-
go.opentelemetry.io/otel/exporters/jaeger v1.7.0 h1:wXgjiRldljksZkZrldGVe6XrG9u3kYDyQmkZwmm5dI0=
534-
go.opentelemetry.io/otel/exporters/jaeger v1.7.0/go.mod h1:PwQAOqBgqbLQRKlj466DuD2qyMjbtcPpfPfj+AqbSBs=
535531
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.9.0 h1:ggqApEjDKczicksfvZUCxuvoyDmR6Sbm56LwiK8DVR0=
536532
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.9.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY=
537533
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.31.0 h1:H0+xwv4shKw0gfj/ZqR13qO2N/dBQogB1OcRjJjV39Y=
@@ -546,12 +542,10 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.9.0 h1:0uV0qzHk48i1SF8q
546542
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.9.0/go.mod h1:Fl1iS5ZhWgXXXTdJMuBSVsS5nkL5XluHbg97kjOuYU4=
547543
go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
548544
go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
549-
go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU=
550545
go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo=
551546
go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4=
552547
go.opentelemetry.io/otel/sdk/metric v0.31.0 h1:2sZx4R43ZMhJdteKAlKoHvRgrMp53V1aRxvEf5lCq8Q=
553548
go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk=
554-
go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
555549
go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc=
556550
go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
557551
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
@@ -761,7 +755,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
761755
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
762756
golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
763757
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
764-
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
765758
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
766759
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
767760
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

‎api/pkg/di/container.go‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ import (
1717

1818
"go.opentelemetry.io/otel"
1919
"go.opentelemetry.io/otel/attribute"
20-
"go.opentelemetry.io/otel/propagation"
2120
"go.opentelemetry.io/otel/sdk/resource"
2221
semconv "go.opentelemetry.io/otel/semconv/v1.10.0"
2322

2423
"firebase.google.com/go/messaging"
2524
cloudtrace "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace"
2625
"github.com/hirosassa/zerodriver"
2726
"github.com/rs/zerolog"
28-
"go.opentelemetry.io/otel/exporters/jaeger"
2927
"go.opentelemetry.io/otel/sdk/trace"
3028

3129
firebase "firebase.google.com/go"
@@ -845,28 +843,6 @@ func (container *Container) initializeUptraceProvider(version string, namespace
845843
}
846844
}
847845

848-
func (container *Container) initializeJaegerTraceProvider(version string, namespace string) (flush func()) {
849-
container.logger.Debug("initializing jaeger trace provider")
850-
exp, err := jaeger.New(jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(os.Getenv("JAEGER_COLLECTOR_ENDPOINT"))))
851-
if err != nil {
852-
container.logger.Error(stacktrace.Propagate(err, "could not create jaeger exporter"))
853-
}
854-
tp := trace.NewTracerProvider(
855-
// Always be sure to batch in production.
856-
trace.WithBatcher(exp),
857-
trace.WithSampler(trace.AlwaysSample()),
858-
// Record information about this application in a resource.
859-
trace.WithResource(container.InitializeOtelResources(version, namespace)),
860-
)
861-
862-
otel.SetTracerProvider(tp)
863-
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
864-
865-
return func() {
866-
_ = exp.Shutdown(context.Background())
867-
}
868-
}
869-
870846
// InitializeOtelResources initializes open telemetry resources
871847
func (container *Container) InitializeOtelResources(version string, namespace string) *resource.Resource {
872848
return resource.NewWithAttributes(

‎web/components/MessageThreadHeader.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</v-btn>
5555
</template>
5656
<h4>Last Heartbeat</h4>
57-
{{ $store.getters.getHeartbeat.timestamp | timestamp }}
57+
{{ $store.getters.getHeartbeat.timestamp | humanizeTime }} ago
5858
</v-tooltip>
5959
</div>
6060
</div>

‎web/models/heartbeat.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ export interface Heartbeat {
22
id: string
33
owner: string
44
timestamp: string
5-
quantity: string
65
}

‎web/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"@nuxtjs/firebase": "^8.2.2",
2727
"@nuxtjs/sitemap": "^2.4.0",
2828
"core-js": "^3.19.3",
29+
"date-fns": "^2.29.3",
2930
"dotenv": "^16.0.1",
3031
"firebase": "^9.8.4",
3132
"firebaseui": "^6.0.1",

‎web/plugins/filters.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Vue from 'vue'
2+
import { intervalToDuration, formatDuration } from 'date-fns'
23
import { parsePhoneNumber, isValidPhoneNumber } from 'libphonenumber-js'
34

45
Vue.filter('phoneNumber', (value: string): string => {
@@ -47,3 +48,11 @@ Vue.filter('billingPeriod', (value: string): string => {
4748
// @ts-ignore
4849
return new Date(value).toLocaleDateString('en-US', options)
4950
})
51+
52+
Vue.filter('humanizeTime', (value: string): string => {
53+
const durations = intervalToDuration({
54+
start: new Date(),
55+
end: new Date(value),
56+
})
57+
return formatDuration(durations)
58+
})

‎web/store/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ export const actions = {
300300
is_archived: context.getters.getIsArchived,
301301
},
302302
})
303+
304+
await context.dispatch('getHeartbeat')
303305
await context.commit('setThreads', response.data.data)
304306
},
305307

‎web/yarn.lock‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4487,6 +4487,11 @@ data-urls@^2.0.0:
44874487
whatwg-mimetype "^2.3.0"
44884488
whatwg-url "^8.0.0"
44894489

4490+
date-fns@^2.29.3:
4491+
version "2.29.3"
4492+
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
4493+
integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
4494+
44904495
de-indent@^1.0.2:
44914496
version "1.0.2"
44924497
resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"

0 commit comments

Comments
 (0)