Change AgentConfigMetrics to extend Metricset

elastic · May 17, 2022 · 29205d6 · 29205d6
1 parent 4757af5
commit 29205d6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config.ts b/packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config.ts
@@ -14,9 +14,6 @@ export class AgentConfig extends Entity<AgentConfigFields> {
   metrics() {
     return new AgentConfigMetrics({
       ...this.fields,
-      'processor.event': 'metric',
-      'processor.name': 'metric',
-      'metricset.name': 'agent_config',
       agent_config_applied: 1,
     });
   }

diff --git a/packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config_metrics.ts b/packages/elastic-apm-synthtrace/src/lib/agent_config/agent_config_metrics.ts
@@ -6,10 +6,17 @@
  * Side Public License, v 1.
  */
 
-import { Serializable } from '../serializable';
+import { Metricset } from '../apm/metricset';
 import { AgentConfigFields } from './agent_config_fields';
 
-export class AgentConfigMetrics extends Serializable<AgentConfigFields> {
+export class AgentConfigMetrics extends Metricset<AgentConfigFields> {
+  constructor(fields: AgentConfigFields) {
+    super({
+      'metricset.name': 'agent_config',
+      ...fields,
+    });
+  }
+
   timestamp(timestamp: number): this {
     super.timestamp(timestamp);
     this.fields['event.ingested'] = new Date(timestamp).getTime();

diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/instance.ts b/packages/elastic-apm-synthtrace/src/lib/apm/instance.ts
@@ -45,7 +45,7 @@ export class Instance extends Entity<ApmFields> {
   }
 
   appMetrics(metrics: ApmApplicationMetricFields) {
-    return new Metricset({
+    return new Metricset<ApmFields>({
       ...this.fields,
       'metricset.name': 'app',
       ...metrics,

diff --git a/packages/elastic-apm-synthtrace/src/lib/apm/metricset.ts b/packages/elastic-apm-synthtrace/src/lib/apm/metricset.ts
@@ -7,10 +7,10 @@
  */
 
 import { Serializable } from '../serializable';
-import { ApmFields } from './apm_fields';
+import { Fields } from '../entity';
 
-export class Metricset extends Serializable<ApmFields> {
-  constructor(fields: ApmFields) {
+export class Metricset<TFields extends Fields> extends Serializable<TFields> {
+  constructor(fields: TFields) {
     super({
       'processor.event': 'metric',
       'processor.name': 'metric',