Skip to content

Commit 7d108cd

Browse files
DebajitDasDebajitDas
authored
Nomenclature changes from Appd/Appdynamics to Otel/OpenTelemetry for header and cpp files (#243)
* Initial chnages * More changes * More Changes * More changes * More changes * Removed unwanted file
1 parent 26324a9 commit 7d108cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1788
-1788
lines changed

‎instrumentation/otel-webserver-module/include/apache/ApacheConfig.h‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef APPD_APACHECONFIG_H
18-
#define APPD_APACHECONFIG_H
17+
#ifndef APACHECONFIG_H
18+
#define APACHECONFIG_H
1919
#define SIZE 5 //Fixed SIZE (intermediate value chosen as 5) for masking private data if any before logging into Apache logs
2020

2121
#include <memory>
@@ -24,14 +24,14 @@
2424
#include "httpd.h" // request_rec
2525
#include "http_config.h" // cmd_parms
2626

27-
class appd_cfg
27+
class otel_cfg
2828
{
2929
public:
3030
void init();
3131
bool validate(const request_rec *r);
3232

33-
int getAppdEnabled() { return appdEnabled; }
34-
int getAppdEnabledInitialized() { return appdEnabled_initialized; }
33+
int getOtelEnabled() { return otelEnabled; }
34+
int getOtelEnabledInitialized() { return otelEnabled_initialized; }
3535

3636
const char* getOtelExporterType() { return otelExporterType; }
3737
int getOtelExporterTypeInitialized() { return otelExporterType_initialized; }
@@ -114,13 +114,13 @@ class appd_cfg
114114

115115
private:
116116
// Agent to Controller Connection Configuration
117-
int appdEnabled; // OPTIONAL: 0 for false, 1 for true (defaults to true)
118-
int appdEnabled_initialized;
117+
int otelEnabled; // OPTIONAL: 0 for false, 1 for true (defaults to true)
118+
int otelEnabled_initialized;
119119

120120
const char *otelExporterType; // OPTIONAL: Type of exporter to be configured in TracerProvider of OTel SDK embedded into Agent
121121
int otelExporterType_initialized;
122122

123-
const char *otelExporterEndpoint; // REQUIRED: AppDynamics endpoint where the OpenTelemetry Exporter inside OTel SDK sends traces
123+
const char *otelExporterEndpoint; // REQUIRED: Collector endpoint where the OpenTelemetry Exporter inside OTel SDK sends traces
124124
int otelExporterEndpoint_initialized;
125125

126126
int otelSslEnabled; // OPTIONAL: Decision whether connection to the Exporter endpoint is secured
@@ -135,10 +135,10 @@ class appd_cfg
135135
const char *otelSamplerType; // OPTIONAL: Type of Otel Sampler
136136
int otelSamplerType_initialized;
137137

138-
const char *serviceNamespace; // REQUIRED: A namespace for the AppdServiceName; equivalent to your AppDynamics application name
138+
const char *serviceNamespace; // REQUIRED: A namespace for the ServiceName;
139139
int serviceNamespace_initialized;
140140

141-
const char *serviceName; // REQUIRED: Logical name of the service; equivalent to your AppDynamics tier name
141+
const char *serviceName; // REQUIRED: Logical name of the service;
142142
int serviceName_initialized;
143143

144144
const char *serviceInstanceId; // REQUIRED: The string ID of the service instance. Distinguish between instances of a service
@@ -221,69 +221,69 @@ class ApacheConfigHandlers
221221
public:
222222
static std::unordered_map<std::string, std::shared_ptr<WebserverContext> > m_webServerContexts;
223223

224-
static const char* appd_set_enabled(cmd_parms *cmd, void *conf, const char *arg);
225-
static const char* appd_set_otelExporterType(cmd_parms *cmd, void *conf, const char *arg);
226-
static const char* appd_set_otelExporterEndpoint(cmd_parms *cmd, void *conf, const char *arg);
227-
static const char* appd_set_otelSslEnabled(cmd_parms *cmd, void *conf, const char *arg);
228-
static const char* appd_set_otelSslCertificatePath(cmd_parms *cmd, void *conf, const char *arg);
229-
static const char* appd_set_otelProcessorType(cmd_parms *cmd, void *conf, const char *arg);
230-
static const char* appd_set_otelSamplerType(cmd_parms *cmd, void *conf, const char *arg);
231-
static const char* appd_set_serviceNamespace(cmd_parms *cmd, void *conf, const char *arg);
232-
static const char* appd_set_serviceName(cmd_parms *cmd, void *conf, const char *arg);
233-
static const char* appd_set_serviceInstanceId(cmd_parms *cmd, void *conf, const char *arg);
234-
static const char* appd_set_otelMaxQueueSize(cmd_parms *cmd, void *conf, const char *arg);
235-
static const char* appd_set_otelScheduledDelay(cmd_parms *cmd, void *conf, const char *arg);
236-
static const char* appd_set_otelExportTimeout(cmd_parms *cmd, void *conf, const char *arg);
237-
static const char* appd_set_otelMaxExportBatchSize(cmd_parms *cmd, void *conf, const char *arg);
238-
static const char* appd_set_resolveBackends(cmd_parms *cmd, void *conf, const char *arg);
239-
static const char* appd_set_traceAsError(cmd_parms *cmd, void *conf, const char *arg);
240-
static const char* appd_set_reportAllInstrumentedModules(cmd_parms *cmd, void *conf, const char *arg);
241-
static const char* appd_set_maskCookie(cmd_parms *cmd, void *conf, const char *arg);
242-
static const char* appd_set_cookiePattern(cmd_parms *cmd, void *conf, const char *arg);
243-
static const char* appd_set_maskSmUser(cmd_parms *cmd, void *conf, const char *arg);
244-
static const char* appd_set_delimiter(cmd_parms *cmd, void *conf, const char *arg);
245-
static const char* appd_set_segment(cmd_parms *cmd, void *conf, const char *arg);
246-
static const char* appd_set_matchFilter(cmd_parms *cmd, void *conf, const char *arg);
247-
static const char* appd_set_matchPattern(cmd_parms *cmd, void *conf, const char *arg);
248-
static const char* appd_set_segmentType(cmd_parms *cmd, void *conf, const char *arg);
249-
static const char* appd_set_segmentParameter(cmd_parms *cmd, void *conf, const char *arg);
250-
static const char* appd_add_webserver_context(
224+
static const char* otel_set_enabled(cmd_parms *cmd, void *conf, const char *arg);
225+
static const char* otel_set_otelExporterType(cmd_parms *cmd, void *conf, const char *arg);
226+
static const char* otel_set_otelExporterEndpoint(cmd_parms *cmd, void *conf, const char *arg);
227+
static const char* otel_set_otelSslEnabled(cmd_parms *cmd, void *conf, const char *arg);
228+
static const char* otel_set_otelSslCertificatePath(cmd_parms *cmd, void *conf, const char *arg);
229+
static const char* otel_set_otelProcessorType(cmd_parms *cmd, void *conf, const char *arg);
230+
static const char* otel_set_otelSamplerType(cmd_parms *cmd, void *conf, const char *arg);
231+
static const char* otel_set_serviceNamespace(cmd_parms *cmd, void *conf, const char *arg);
232+
static const char* otel_set_serviceName(cmd_parms *cmd, void *conf, const char *arg);
233+
static const char* otel_set_serviceInstanceId(cmd_parms *cmd, void *conf, const char *arg);
234+
static const char* otel_set_otelMaxQueueSize(cmd_parms *cmd, void *conf, const char *arg);
235+
static const char* otel_set_otelScheduledDelay(cmd_parms *cmd, void *conf, const char *arg);
236+
static const char* otel_set_otelExportTimeout(cmd_parms *cmd, void *conf, const char *arg);
237+
static const char* otel_set_otelMaxExportBatchSize(cmd_parms *cmd, void *conf, const char *arg);
238+
static const char* otel_set_resolveBackends(cmd_parms *cmd, void *conf, const char *arg);
239+
static const char* otel_set_traceAsError(cmd_parms *cmd, void *conf, const char *arg);
240+
static const char* otel_set_reportAllInstrumentedModules(cmd_parms *cmd, void *conf, const char *arg);
241+
static const char* otel_set_maskCookie(cmd_parms *cmd, void *conf, const char *arg);
242+
static const char* otel_set_cookiePattern(cmd_parms *cmd, void *conf, const char *arg);
243+
static const char* otel_set_maskSmUser(cmd_parms *cmd, void *conf, const char *arg);
244+
static const char* otel_set_delimiter(cmd_parms *cmd, void *conf, const char *arg);
245+
static const char* otel_set_segment(cmd_parms *cmd, void *conf, const char *arg);
246+
static const char* otel_set_matchFilter(cmd_parms *cmd, void *conf, const char *arg);
247+
static const char* otel_set_matchPattern(cmd_parms *cmd, void *conf, const char *arg);
248+
static const char* otel_set_segmentType(cmd_parms *cmd, void *conf, const char *arg);
249+
static const char* otel_set_segmentParameter(cmd_parms *cmd, void *conf, const char *arg);
250+
static const char* otel_add_webserver_context(
251251
cmd_parms* cmd,
252252
void* conf,
253253
const char* serviceNamespace,
254254
const char* serviceName,
255255
const char* serviceInstanceId);
256256

257-
static void* appd_create_dir_config(apr_pool_t *p, char *dirspec);
258-
static void* appd_merge_dir_config(apr_pool_t *p, void *parent_conf, void *newloc_conf);
257+
static void* otel_create_dir_config(apr_pool_t *p, char *dirspec);
258+
static void* otel_merge_dir_config(apr_pool_t *p, void *parent_conf, void *newloc_conf);
259259

260-
static appd_cfg* getConfig(const request_rec* r);
261-
static appd_cfg* getProcessConfig(const request_rec* r);
260+
static otel_cfg* getConfig(const request_rec* r);
261+
static otel_cfg* getProcessConfig(const request_rec* r);
262262

263-
static std::string computeContextName(const appd_cfg* cfg);
263+
static std::string computeContextName(const otel_cfg* cfg);
264264

265265
static std::string hashPassword(const char* arg);
266266

267-
static void traceConfig(const request_rec* r, const appd_cfg* cfg);
267+
static void traceConfig(const request_rec* r, const otel_cfg* cfg);
268268

269269
private:
270-
static appd_cfg* our_dconfig(const request_rec *r);
270+
static otel_cfg* our_dconfig(const request_rec *r);
271271

272272
static const char* helperChar(
273273
cmd_parms* cmd,
274-
appd_cfg* cfg,
274+
otel_cfg* cfg,
275275
const char* arg,
276276
const char*& var,
277277
int& inherit,
278278
const char* varName);
279279
static const char* helperInt(
280280
cmd_parms* cmd,
281-
appd_cfg* cfg,
281+
otel_cfg* cfg,
282282
const char* arg,
283283
int& var,
284284
int& inherit,
285285
const char* varName);
286-
static void insertWebserverContext(cmd_parms* cmd, const appd_cfg* cfg);
286+
static void insertWebserverContext(cmd_parms* cmd, const otel_cfg* cfg);
287287
};
288288

289289
#endif

0 commit comments

Comments
 (0)