fix chat estracture

This commit is contained in:
Peter Maquiran
2024-07-25 08:51:04 +01:00
parent f4589aa96e
commit 9e6d7c2b4a
17 changed files with 132 additions and 65 deletions
@@ -1,6 +1,8 @@
import { metrics } from '@opentelemetry/api';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
import { MeterProvider, PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
import { Subject } from 'rxjs';
import { throttleTime } from 'rxjs/operators';
import { environment } from 'src/environments/environment';
// Initialize OpenTelemetry metrics
@@ -10,15 +12,28 @@ metrics.setGlobalMeterProvider(meterProvider);
if (window.location.protocol !== 'https:' && environment.apiURL != 'https://gdqas-api.oapr.gov.ao/api/') {
const metricReader = new PeriodicExportingMetricReader({
exporter: new OTLPMetricExporter({
url: 'http://5-180-182-151.cloud-xip.com:4318/v1/metrics',
url: 'https://5-180-182-151.cloud-xip.com:85/collector2/v1/metrics',
// headers: {
// 'Authorization': 'Basic ' + btoa('tabteste@006:tabteste@006'),
// }
}),
exportIntervalMillis: 3000,
exportIntervalMillis: 30000,
});
meterProvider.addMetricReader(metricReader);
const subject = new Subject()
subject
.pipe(
throttleTime(5000) // 5000 milliseconds = 5 seconds
)
.subscribe(() => {
metricReader.forceFlush().then(() => {
console.log('Metrics exported');
});
});
}
export const meter = meterProvider.getMeter('example-exporter-collector');
export const RequestCounter = meter.createCounter('post_requests', {
@@ -3,6 +3,7 @@ import { WebTracerProvider } from '@opentelemetry/sdk-trace-web';
import { ZipkinExporter } from '@opentelemetry/exporter-zipkin';
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
import { Resource } from '@opentelemetry/resources';
import { OTLPTraceExporter } from '@opentelemetry/exporter-otlp-http';
import { context, trace, propagation } from '@opentelemetry/api';
function createProvider(serviceName) {
@@ -35,7 +36,6 @@ export const OpentelemetryInterceptorProvider = createProvider('FO-interceptor')
export const OpentelemetryPublicationProvider = createProvider('FO-publication-service');
export const OpentelemetryLogging = createProvider('logging');
const tracerInstance = OpentelemetryAgendaProvider.getTracer('example-tracer-hole', '111', {})
@@ -84,4 +84,4 @@ function childSpanExample(parentContext) {
}, 500);
}
parentSpanExample()
// parentSpanExample()
@@ -8,7 +8,9 @@ import { environment } from 'src/environments/environment';
import { UseCaseCounter } from './matrix';
import { openTelemetryLogging } from './logging';
// import { context, propagation } from '@opentelemetry/api';
import {
SpanStatus, SpanStatusCode
} from '@opentelemetry/api';
const tracerInstance = OpentelemetryAgendaProvider.getTracer('example-tracer-hole', '111', {})
const tracerNotificationInstance = OpentelemetryNotificationProvider.getTracer('example-tracer-hole', '111', {})
// const logger: ILoggerAdapter = new ColoredLoggerService()
@@ -53,15 +55,16 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
const data = {
event: {},
tags: {}
tags: {},
status: {} as any,
}
return {
const returnObject = {
span: span as any,
tracer: tracerInstance,
tracerId: requestId,
attributes: SemanticAttributes,
setStatus: (status: any) => {
setStatus: (status: SpanStatus) => {
span.setStatus(status);
},
addEvent: (context: string, message?: any, obj?: any) => {
@@ -79,7 +82,7 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
span.setAttribute(key, value);
if(key =='outcome' && value == 'failed') {
span.setAttribute('error', 'true')
returnObject.hasError('error')
}
},
log(message: string, data: Object) {
@@ -110,18 +113,25 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
finish: () => {
if(environment.apiURL != 'https://gdqas-api.oapr.gov.ao/api/') {
span.end();
UseCaseCounter.add(1, {user: SessionStore?.user?.FullName, outcome:data.tags['outcome'], usecase: name})
UseCaseCounter.add(1, {user: SessionStore?.user?.FullName, outcome:data.tags['outcome'] || data.status?.code , usecase: name})
}
if(bugPrint && data.tags['outcome'] == 'failed') {
if(bugPrint && (data.tags['outcome'] == 'failed' || data.status?.code == SpanStatusCode.ERROR)) {
console.error(name, data)
}
},
bugFlag:() => {},
hasError:(message: string) => {
if(data.status?.code != SpanStatusCode.ERROR) {
data.status = {code: SpanStatusCode.ERROR, message}
span.setStatus({code: SpanStatusCode.ERROR, message})
span.setAttribute('outcome','failed')
}
},
createSpan: (name, parent?: any) => {
return tracerInstance.startSpan(name, { root: false }, parent) as Span;
}
}
return returnObject
}
export function XTracerAsync({ name, bugPrint, module = null, autoFinish = true, daley =0 }) {
@@ -221,7 +231,7 @@ export type TracingType = {
getAttribute: (key: string) => string;
LocalLogEvent: (name: string, attributesOrStartTime: any, obj?:any) => void;
finish: () => void;
bugFlag:() => void;
hasError:(message: string) => void;
createSpan:(name, parent?: any) => Span;
};