Skip to content

Commit 1773027

Browse files
committed
Merge branch 'dev' into release
2 parents 762b009 + 76d859a commit 1773027

File tree

13 files changed

+767
-6
lines changed

13 files changed

+767
-6
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.classpath
22
.project
3-
./dependency-reduced-pom.xml
4-
target/*
3+
service/dependency-reduced-pom.xml
4+
service/target/*
55
.idea/*
66
.DS_Store
77
*/.DS_Store

service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<dependency>
177177
<groupId>com.appirio.tech.core.api</groupId>
178178
<artifactId>tech.core.api</artifactId>
179-
<version>API-3.0.0.5-SNAPSHOT</version>
179+
<version>API-3.0.0.8-SNAPSHOT</version>
180180
</dependency>
181181
<dependency>
182182
<groupId>com.informix.jdbc</groupId>

service/run-config/dev/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ COPY sumo-sources.json /data/sumo-sources.json
1414

1515
COPY sumo.conf /etc/sumo.conf
1616

17-
CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Dnewrelic.environment=dev -javaagent:$NEWRELIC_JAR -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
17+
CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Dnewrelic.environment=development -javaagent:$NEWRELIC_JAR -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
1818

1919
EXPOSE 8080 8081

service/run-config/dev/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<dependency>
157157
<groupId>com.appirio.tech.core.api</groupId>
158158
<artifactId>tech.core.api</artifactId>
159-
<version>API-3.0.0.3-SNAPSHOT</version>
159+
<version>API-3.0.0.8-SNAPSHOT</version>
160160
</dependency>
161161
<dependency>
162162
<groupId>com.informix.jdbc</groupId>

service/run-config/dev/src/main/resources/supply-server.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ databases:
3636
# the JDBC URL
3737
url: jdbc:informix-sqli://10.15.94.50:2020/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;IFX_LOCK_MODE_WAIT=5;OPTCOMPIND=0;STMT_CACHE=1;
3838

39+
# the minimum number of connections to keep open
40+
minSize: 2
41+
42+
# the maximum number of connections to keep open
43+
maxSize: 10
44+
45+
# the minimum amount of time an connection must sit idle in the pool before it is eligible for eviction
46+
minIdleTime: 5 minutes
47+
3948
- datasourceName: dw
4049

4150
# the name of your JDBC driver
@@ -52,6 +61,16 @@ databases:
5261
# the JDBC URL
5362
url: jdbc:informix-sqli://10.15.94.51:2020/topcoder_dw:INFORMIXSERVER=datawarehouse_tcp;IFX_LOCK_MODE_WAIT=5;OPTCOMPIND=0;STMT_CACHE=1;
5463

64+
# the minimum number of connections to keep open
65+
minSize: 2
66+
67+
# the maximum number of connections to keep open
68+
maxSize: 10
69+
70+
# the minimum amount of time an connection must sit idle in the pool before it is eligible for eviction
71+
minIdleTime: 5 minutes
72+
73+
5574
# use the simple server factory if you only want to run on a single port
5675
#server:
5776
# type: simple
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM appiriodevops/ap-microservice-base:0.0.1
2+
3+
MAINTAINER mdesiderio@appirio.com
4+
5+
WORKDIR /data
6+
7+
COPY supply-server.jar /data/supply-server.jar
8+
9+
COPY supply-server.yaml /data/supply-server.yaml
10+
11+
COPY newrelic.yml /usr/local/share/newrelic/newrelic.yml
12+
13+
COPY sumo-sources.json /data/sumo-sources.json
14+
15+
COPY sumo.conf /etc/sumo.conf
16+
17+
CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Dnewrelic.environment=production -javaagent:$NEWRELIC_JAR -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
18+
19+
EXPOSE 8080 8081
Lines changed: 285 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
# This file configures the New Relic Agent. New Relic monitors
2+
# Java applications with deep visibility and low overhead. For more details and additional
3+
# configuration options visit https://docs.newrelic.com/docs/java/java-agent-configuration.
4+
#
5+
# This configuration file is custom generated for Topcoder Inc. - Pro
6+
#
7+
# This section is for settings common to all environments.
8+
# Do not add anything above this next line.
9+
common: &default_settings
10+
11+
# ============================== LICENSE KEY ===============================
12+
# You must specify the license key associated with your New Relic
13+
# account. For example, if your license key is 12345 use this:
14+
# license_key: '12345'
15+
# The key binds your Agent's data to your account in the New Relic service.
16+
license_key: '12c8fadc3bfc2c3c67d08b397f020e512f0ba3fc'
17+
18+
# Agent Enabled
19+
# Use this setting to disable the agent instead of removing it from the startup command.
20+
# Default is true.
21+
agent_enabled: true
22+
23+
# Set the name of your application as you'd like it show up in New Relic.
24+
# If enable_auto_app_naming is false, the agent reports all data to this application.
25+
# Otherwise, the agent reports only background tasks (transactions for non-web applications)
26+
# to this application. To report data to more than one application
27+
# (useful for rollup reporting), separate the application names with ";".
28+
# For example, to report data to "My Application" and "My Application 2" use this:
29+
# app_name: My Application;My Application 2
30+
# This setting is required. Up to 3 different application names can be specified.
31+
# The first application name must be unique.
32+
app_name: ap-review
33+
34+
# To enable high security, set this property to true. When in high
35+
# security mode, the agent will use SSL and obfuscated SQL. Additionally,
36+
# request parameters and message parameters will not be sent to New Relic.
37+
high_security: false
38+
39+
# Set to true to enable support for auto app naming.
40+
# The name of each web app is detected automatically
41+
# and the agent reports data separately for each one.
42+
# This provides a finer-grained performance breakdown for
43+
# web apps in New Relic.
44+
# Default is false.
45+
enable_auto_app_naming: false
46+
47+
# Set to true to enable component-based transaction naming.
48+
# Set to false to use the URI of a web request as the name of the transaction.
49+
# Default is true.
50+
enable_auto_transaction_naming: true
51+
52+
# The agent uses its own log file to keep its logging
53+
# separate from that of your application. Specify the log level here.
54+
# This setting is dynamic, so changes do not require restarting your application.
55+
# The levels in increasing order of verboseness are:
56+
# off, severe, warning, info, fine, finer, finest
57+
# Default is info.
58+
log_level: info
59+
60+
# Log all data sent to and from New Relic in plain text.
61+
# This setting is dynamic, so changes do not require restarting your application.
62+
# Default is false.
63+
audit_mode: false
64+
65+
# The number of backup log files to save.
66+
# Default is 1.
67+
log_file_count: 1
68+
69+
# The maximum number of kbytes to write to any one log file.
70+
# The log_file_count must be set greater than 1.
71+
# Default is 0 (no limit).
72+
log_limit_in_kbytes: 0
73+
74+
# Override other log rolling configuration and roll the logs daily.
75+
# Default is false.
76+
log_daily: false
77+
78+
# The name of the log file.
79+
# Default is newrelic_agent.log.
80+
log_file_name: newrelic_agent.log
81+
82+
# The log file directory.
83+
# Default is the logs directory in the newrelic.jar parent directory.
84+
#log_file_path:
85+
86+
# The agent communicates with New Relic via https by
87+
# default. If you want to communicate with newrelic via http,
88+
# then turn off SSL by setting this value to false.
89+
# This work is done asynchronously to the threads that process your
90+
# application code, so response times will not be directly affected
91+
# by this change.
92+
# Default is true.
93+
ssl: true
94+
95+
# Proxy settings for connecting to the New Relic server:
96+
# If a proxy is used, the host setting is required. Other settings
97+
# are optional. Default port is 8080. The username and password
98+
# settings will be used to authenticate to Basic Auth challenges
99+
# from a proxy server.
100+
#proxy_host: hostname
101+
#proxy_port: 8080
102+
#proxy_user: username
103+
#proxy_password: password
104+
105+
# Limits the number of lines to capture for each stack trace.
106+
# Default is 30
107+
max_stack_trace_lines: 30
108+
109+
# Provides the ability to configure the attributes sent to New Relic. These
110+
# attributes can be found in transaction traces, traced errors, Insight's
111+
# transaction events, and Insight's page views.
112+
attributes:
113+
114+
# When true, attributes will be sent to New Relic. The default is true.
115+
enabled: true
116+
117+
#A comma separated list of attribute keys whose values should
118+
# be sent to New Relic.
119+
#include:
120+
121+
# A comma separated list of attribute keys whose values should
122+
# not be sent to New Relic.
123+
#exclude:
124+
125+
126+
# Transaction tracer captures deep information about slow
127+
# transactions and sends this to the New Relic service once a
128+
# minute. Included in the transaction is the exact call sequence of
129+
# the transactions including any SQL statements issued.
130+
transaction_tracer:
131+
132+
# Transaction tracer is enabled by default. Set this to false to turn it off.
133+
# This feature is not available to Lite accounts and is automatically disabled.
134+
# Default is true.
135+
enabled: true
136+
137+
# Threshold in seconds for when to collect a transaction
138+
# trace. When the response time of a controller action exceeds
139+
# this threshold, a transaction trace will be recorded and sent to
140+
# New Relic. Valid values are any float value, or (default) "apdex_f",
141+
# which will use the threshold for the "Frustrated" Apdex level
142+
# (greater than four times the apdex_t value).
143+
# Default is apdex_f.
144+
transaction_threshold: apdex_f
145+
146+
# When transaction tracer is on, SQL statements can optionally be
147+
# recorded. The recorder has three modes, "off" which sends no
148+
# SQL, "raw" which sends the SQL statement in its original form,
149+
# and "obfuscated", which strips out numeric and string literals.
150+
# Default is obfuscated.
151+
record_sql: obfuscated
152+
153+
# Set this to true to log SQL statements instead of recording them.
154+
# SQL is logged using the record_sql mode.
155+
# Default is false.
156+
log_sql: false
157+
158+
# Threshold in seconds for when to collect stack trace for a SQL
159+
# call. In other words, when SQL statements exceed this threshold,
160+
# then capture and send to New Relic the current stack trace. This is
161+
# helpful for pinpointing where long SQL calls originate from.
162+
# Default is 0.5 seconds.
163+
stack_trace_threshold: 0.5
164+
165+
# Determines whether the agent will capture query plans for slow
166+
# SQL queries. Only supported for MySQL and PostgreSQL.
167+
# Default is true.
168+
explain_enabled: true
169+
170+
# Threshold for query execution time below which query plans will not
171+
# not be captured. Relevant only when `explain_enabled` is true.
172+
# Default is 0.5 seconds.
173+
explain_threshold: 0.5
174+
175+
# Use this setting to control the variety of transaction traces.
176+
# The higher the setting, the greater the variety.
177+
# Set this to 0 to always report the slowest transaction trace.
178+
# Default is 20.
179+
top_n: 20
180+
181+
# Error collector captures information about uncaught exceptions and
182+
# sends them to New Relic for viewing.
183+
error_collector:
184+
185+
# This property enables the collection of errors. If the property is not
186+
# set or the property is set to false, then errors will not be collected.
187+
# Default is true.
188+
enabled: true
189+
190+
# Use this property to exclude specific exceptions from being reported as errors
191+
# by providing a comma separated list of full class names.
192+
# The default is to exclude akka.actor.ActorKilledException. If you want to override
193+
# this, you must provide any new value as an empty list is ignored.
194+
ignore_errors: akka.actor.ActorKilledException
195+
196+
# Use this property to exclude specific http status codes from being reported as errors
197+
# by providing a comma separated list of status codes.
198+
# The default is to exclude 404s. If you want to override
199+
# this, you must provide any new value as an empty list is ignored.
200+
ignore_status_codes: 404
201+
202+
# Transaction Events are used for Histograms and Percentiles. Unaggregated data is collected
203+
# for each web transaction and sent to the server on harvest.
204+
transaction_events:
205+
206+
# Set to false to disable transaction events.
207+
# Default is true.
208+
enabled: true
209+
210+
# Events are collected up to the configured amount. Afterwards, events are sampled to
211+
# maintain an even distribution across the harvest cycle.
212+
# Default is 2000. Setting to 0 will disable.
213+
max_samples_stored: 2000
214+
215+
# Cross Application Tracing adds request and response headers to
216+
# external calls using supported HTTP libraries to provide better
217+
# performance data when calling applications monitored by other New Relic Agents.
218+
cross_application_tracer:
219+
220+
# Set to false to disable cross application tracing.
221+
# Default is true.
222+
enabled: true
223+
224+
# Thread profiler measures wall clock time, CPU time, and method call counts
225+
# in your application's threads as they run.
226+
# This feature is not available to Lite accounts and is automatically disabled.
227+
thread_profiler:
228+
229+
# Set to false to disable the thread profiler.
230+
# Default is true.
231+
enabled: true
232+
233+
# New Relic Real User Monitoring gives you insight into the performance real users are
234+
# experiencing with your website. This is accomplished by measuring the time it takes for
235+
# your users' browsers to download and render your web pages by injecting a small amount
236+
# of JavaScript code into the header and footer of each page.
237+
browser_monitoring:
238+
239+
# By default the agent automatically inserts API calls in compiled JSPs to
240+
# inject the monitoring JavaScript into web pages. Not all rendering engines are supported.
241+
# See https://docs.newrelic.com/docs/java/real-user-monitoring-in-java#manual_instrumentation
242+
# for instructions to add these manually to your pages.
243+
# Set this attribute to false to turn off this behavior.
244+
auto_instrument: true
245+
246+
class_transformer:
247+
# This instrumentation reports the name of the user principal returned from
248+
# HttpServletRequest.getUserPrincipal() when servlets and filters are invoked.
249+
com.newrelic.instrumentation.servlet-user:
250+
enabled: false
251+
252+
com.newrelic.instrumentation.spring-aop-2:
253+
enabled: false
254+
255+
# User-configurable custom labels for this agent. Labels are name-value pairs.
256+
# There is a maximum of 64 labels per agent. Names and values are limited to 255 characters.
257+
# Names and values may not contain colons (:) or semicolons (;).
258+
labels:
259+
260+
# An example label
261+
#label_name: label_value
262+
263+
264+
# Application Environments
265+
# ------------------------------------------
266+
# Environment specific settings are in this section.
267+
# You can use the environment to override the default settings.
268+
# For example, to change the app_name setting.
269+
# Use -Dnewrelic.environment=<environment> on the Java startup command line
270+
# to set the environment.
271+
# The default environment is production.
272+
273+
# NOTE if your application has other named environments, you should
274+
# provide configuration settings for these environments here.
275+
276+
development:
277+
<<: *default_settings
278+
app_name: ap-review (Development)
279+
280+
test:
281+
<<: *default_settings
282+
app_name: ap-review (Test)
283+
284+
production:
285+
<<: *default_settings
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"api.version": "v1",
3+
"sources": [
4+
{
5+
"name": "ap-review-prod",
6+
"sourceType": "LocalFile",
7+
"multilineProcessingEnabled": false,
8+
"pathExpression": "/var/log/ap-review.log",
9+
"category": "prod",
10+
"hostName": "ap-review"
11+
}
12+
]
13+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
name=ap-review-prod
2+
accessid=suMochTM9jsUmo
3+
accesskey=i9Jo6vJ8TiGH4NLJ6JOrhR2Z34eKZQcDNCiGz5ePkujZWwzzZhcAZNufty6viT63
4+
clobber=true
5+
sources=/data/sumo-sources.json

0 commit comments

Comments
 (0)