From ac1f02290b4a2b40c435220ab7452cfb60f26477 Mon Sep 17 00:00:00 2001
From: "agile.zhou" <kklldog@live.cn>
Date: Sun, 2 Jun 2024 12:37:23 +0800
Subject: [PATCH] Add OtlpInstanceId

---
 src/AgileConfig.Server.Apisite/Appsettings.cs    |   1 +
 .../Metrics/MeterService.cs                      |   2 +-
 src/AgileConfig.Server.Apisite/Program.cs        |   4 +++-
 src/AgileConfig.Server.Apisite/Startup.cs        |   3 ++-
 .../agile_config.db-journal                      | Bin 8720 -> 0 bytes
 .../appsettings.Development.json                 |   1 +
 src/AgileConfig.Server.Apisite/appsettings.json  |   1 +
 7 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 src/AgileConfig.Server.Apisite/agile_config.db-journal

diff --git a/src/AgileConfig.Server.Apisite/Appsettings.cs b/src/AgileConfig.Server.Apisite/Appsettings.cs
index bafe33ba..acbd4ef2 100644
--- a/src/AgileConfig.Server.Apisite/Appsettings.cs
+++ b/src/AgileConfig.Server.Apisite/Appsettings.cs
@@ -48,6 +48,7 @@ public class Appsettings
         public static string OtlpMetricsEndpoint => Global.Config["otlp:metrics:endpoint"];
 
         public static string OtlpMetricsProtocol => Global.Config["otlp:metrics:protocol"];
+        public static string OtlpInstanceId => Global.Config["otlp:instanceId"];
 
     }
 }
diff --git a/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs b/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs
index d734660d..706b7133 100644
--- a/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs
+++ b/src/AgileConfig.Server.Apisite/Metrics/MeterService.cs
@@ -68,7 +68,7 @@ public MeterService(IServiceScopeFactory sf)
             {
                 return _serverNodeCount;
             }, "", "The number of nodes");
-            PullAppConfigCounter = AgileConfigMeter.CreateCounter<long>("PullAppConfigCounter", "The number of times the app configuration was pulled");
+            PullAppConfigCounter = AgileConfigMeter.CreateCounter<long>("PullAppConfigCounter", "", "The number of times the app configuration was pulled");
         }
 
         public void Start()
diff --git a/src/AgileConfig.Server.Apisite/Program.cs b/src/AgileConfig.Server.Apisite/Program.cs
index e19cb83b..0193cb1f 100644
--- a/src/AgileConfig.Server.Apisite/Program.cs
+++ b/src/AgileConfig.Server.Apisite/Program.cs
@@ -57,7 +57,9 @@ private static void AddOtlpLogging(ILoggingBuilder builder)
 
             builder.AddOpenTelemetry(options =>
             {
-                options.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(Program.AppName));
+                options.SetResourceBuilder(ResourceBuilder.CreateDefault().AddService(Program.AppName
+                    , null, null, string.IsNullOrEmpty(Appsettings.OtlpInstanceId), Appsettings.OtlpInstanceId)
+                    );
                 options
                        .AddOtlpExporter(expOp =>
                        {
diff --git a/src/AgileConfig.Server.Apisite/Startup.cs b/src/AgileConfig.Server.Apisite/Startup.cs
index 151b058a..3b2ed44a 100644
--- a/src/AgileConfig.Server.Apisite/Startup.cs
+++ b/src/AgileConfig.Server.Apisite/Startup.cs
@@ -95,7 +95,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IMeterService, MeterService>();
 
             services.AddOpenTelemetry()
-                    .ConfigureResource(resource => resource.AddService(Program.AppName))
+                    .ConfigureResource(resource => resource.AddService(Program.AppName,
+                    null, null, string.IsNullOrEmpty(Appsettings.OtlpInstanceId), Appsettings.OtlpInstanceId))
                     .AddOtlpTraces()
                     .AddOtlpMetrics();
         }
diff --git a/src/AgileConfig.Server.Apisite/agile_config.db-journal b/src/AgileConfig.Server.Apisite/agile_config.db-journal
deleted file mode 100644
index 504ed9d058e47df0ebc99704d1e69b05d2918aea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8720
zcmeI0&u`mQ9Kh|gwVSkQ+I3)1RpGf3ZPm4L?6_%z5M*7{MQd6bT2MjAa}zJINbF!c
zWjmp!>V$R}mr2~wB#v-GLc4L|$UiZD2yp~W+J*OQ$95b$Nwu9eCx^WEzF)t*@8|pD
zeG>$6UJuXjuYlRx2oeDw(~ck<z03r#c;W{nGW9f)xH<LoWi~XlEhG>U2nmD)LINRy
zkU&TvBoGn^34{b*B?7;!M7OqTy57w0N3aainIw}bCbLF^cPh)#G|kXVdX?r@nRPO?
zk!3R3G_%Gs?D{6dc8lm#mRVn8SeoTFnOi89vG-3V>q=Ru*Az`Rw*39U_fNk5>B%=g
z{&~OsNBigQZOm_A((F2$$#g_CM>0&7<FXvH#-wR3onZ`D?IY3mOdI+io8ExOPN(RN
zeuoDC`+NqrML*o%k#v!~t*8w_Ct2_h5Q-x2lO%#rRUild3)!zY7>(L9@T_YbFa&$7
zeSBjKNYTVIs56&%HkFwmC)2U3vA?2`=)d@{<Bzcv{_WW8*ncB`kN$@KGx8n!2z?Z=
z;VZek{W?Z`%AtrPSHwHo7j@t;UTEoxG3SM9nQyj^>ylREb*UlNC0XQCeyhY8Gm8@(
zhu*_=;kYhBow6d|ma3f%#EReA<*iaacaSF!a@Th9B;}_<kxL{QkC7xLRVZ@zqg-k0
zMy|BPt}m0jdk5t1;m*!gQ!X@{yjRB(Rb5Y}XnNUN{@j20#I>9T$=gwPv!KZ9;NS;^
zV&2-zGB@A=?ne!b0eUB*s!57Wk%irZ{C2+NwNcXry`@oPF@L>qSOiL51yOdNp6i_b
zgHoZGD;<$H^GD<oB)J@qEpJ~Q<bAIXP49bGUpqaX!HHxNZG+=k-fwB5%0rKUaH>JS
zb}d}$^?R56g*e^VF@SSZR2!0JqPAnIKdsy)j5tj8%atw@OjKP<v!}NbII*~hw!iA;
zq$+007}{_$9l!_5hG)|Yz_ySwcM1%nvMLIo7Qn1`BHa^fzA?2qjS<Dgft29ay9mMQ
zOuHP%iTQc-{LL;po#2`BXA*#e;d%>%!9y0HNw&|So|VB(LDRleRCkqecxggicRdEm
zkM)!;3JsUQd14rZRI6F(<!tRdFxNGurIvv)L0<HAP;v?*w&n*q$SCs=SmLxfffFo?
zo;jr*<aI%=iK?Uva@nlxo~6lNXL&RN{N`WR1F~3h9Re1c05wfff$#h)sxPDbBt{&u
z{TO+SF+<t27(Z=BabjTsJzKN`TDz<9b)^bp+8V}sNm-H$5emBbz?bp*-DaOCp$wI-
zM7ILa5Qul&anCr{p)WZuh7pB@e&j6UOk&n#;xvmJq}uN|q(ohpWRsLR9QPq*N`@zO
zBGg-5>F?a`!{n>K&Eo@YHjio9Y)+!>nK7JLSwYW^TsEtq0pMk&Vsua-`#Mw1&vskt
z*e_Hns;Gem!7gyH-SHG|N);P|>TZ6Vsx`3a)CEoF#d1yYTn<*uT%2O($gm@M7sH7C
zmA>KQFzMj5G2myp5uCVk1-)0ak(#}V(^!u7f;3eehTbaTr3cbHDBE64pIH&LvMM!o
zqY<<n2~w|f=L`e+`K}g4HoDY-(I8eNogb`qfu@ul#fa@I{X)QMKaCs89FMg>L2+Vk
z4n3c+9S^(&y$(Jiy)Fl<!~5IQF*vzWRh1Ul$M%pT(L~@PcinXQh3EF2D8n8bbSc;N
z_IC2QU2k{}sP-^=g-SyLzcK8C+o$ubZ>tfE$j$Zh2;9?f2N;Z)KcwH7e0cugt^Wa-
CPIi0%

diff --git a/src/AgileConfig.Server.Apisite/appsettings.Development.json b/src/AgileConfig.Server.Apisite/appsettings.Development.json
index ec215cae..4c5077e8 100644
--- a/src/AgileConfig.Server.Apisite/appsettings.Development.json
+++ b/src/AgileConfig.Server.Apisite/appsettings.Development.json
@@ -8,6 +8,7 @@
     }
   },
   "otlp": {
+    "instanceId": "agileconfig server -1", // if empty, will generate a new one
     "logs": {
       "protocol": "http", // http grpc
       "endpoint": "http://192.168.0.201:5341/ingest/otlp/v1/logs"
diff --git a/src/AgileConfig.Server.Apisite/appsettings.json b/src/AgileConfig.Server.Apisite/appsettings.json
index 761cbbd1..ba6d242a 100644
--- a/src/AgileConfig.Server.Apisite/appsettings.json
+++ b/src/AgileConfig.Server.Apisite/appsettings.json
@@ -8,6 +8,7 @@
     }
   },
   "otlp": {
+    "instanceId":  "", // if empty, will generate a new one
     "logs": {
       "protocol": "http", // http grpc
       "endpoint": ""