Skip to content

Commit

Permalink
Revert "BREAKING CHANGE: Added Support for Camel 4.0 Framework"
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhilpipre
dhilpipre authored Aug 31, 2023
1 parent 69a3fb3 commit 9151ae7
Show file tree
Hide file tree
Showing 49 changed files with 61 additions and 1,568 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
.project
build
bin
/.metadata/
14 changes: 7 additions & 7 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ plugins {
}

project.ext {
group = 'com.newrelic.instrumentation.labs'
group = 'com.newrelic.instrumentation'
javaAgentVersion = '6.4.1'

// Aligned with minimum Java major version supported by latest Java Agent
javaVersion = JavaVersion.VERSION_17
javaVersion = JavaVersion.VERSION_1_8

}

Expand Down Expand Up @@ -76,7 +76,7 @@ task buildIfNeeded {
task createModule {
dependsOn checkForDependencies
description = 'Generate project files for a new instrumentation module'
group = 'New Relic Labs'
group = 'New Relic'
doLast {

def rootProject = projectDir.path
Expand Down Expand Up @@ -119,7 +119,7 @@ task createModule {
// Example:
// implementation 'javax.servlet:servlet-api:2.5'
// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:JAVA_AGENT_VERSION'
implementation 'com.newrelic.agent.java:newrelic-api:JAVA_AGENT_VERSION'
implementation fileTree(include: ['*.jar'], dir: '../libs')
Expand All @@ -128,8 +128,8 @@ task createModule {
jar {
manifest {
attributes 'Implementation-Title': 'PROJECT_GROUP.PROJECT_NAME'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down Expand Up @@ -174,7 +174,7 @@ subprojects {

task install(dependsOn: buildIfNeeded, type: Copy) {
description = 'Copies compiled jar to the NEW_RELIC_EXTENSIONS_DIR.'
group = 'New Relic Labs'
group = 'New Relic'

def extDir = System.getenv("NEW_RELIC_EXTENSIONS_DIR") ?: " "

Expand Down
8 changes: 4 additions & 4 deletions camel-core-2.18/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.18.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.18'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.18'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
8 changes: 4 additions & 4 deletions camel-core-2.20/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:2.20.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-2.20'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-2.20'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
12 changes: 6 additions & 6 deletions camel-core-3.0/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.0.0'

// New Relic Labs Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:7.4.0'
implementation 'com.newrelic.agent.java:newrelic-api:7.4.0'
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.0'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.0'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
8 changes: 4 additions & 4 deletions camel-core-3.1/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.1.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.1'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.1'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
10 changes: 5 additions & 5 deletions camel-core-3.18/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.18.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.18'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.18'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}

verifyInstrumentation {
passes 'org.apache.camel:camel-core:[3.18.0,4.0.0)'
passes 'org.apache.camel:camel-core:[3.18.0,)'
excludeRegex '.*M[1-9]'
excludeRegex '.*RC[1-9]'
}
8 changes: 4 additions & 4 deletions camel-core-3.3/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.3.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.3'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.3'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
8 changes: 4 additions & 4 deletions camel-core-3.7.2/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.7.2'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.7.2'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.7.2'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
8 changes: 4 additions & 4 deletions camel-core-3.7/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.7.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.7'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.7'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
8 changes: 4 additions & 4 deletions camel-core-3.9/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ apply plugin: 'java'
dependencies {
implementation 'org.apache.camel:camel-core:3.9.0'

// New Relic Labs Java Agent dependencies
// New Relic Java Agent dependencies
implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
implementation fileTree(include: ['*.jar'], dir: '../libs')
}

jar {
manifest {
attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.camel-core-3.9'
attributes 'Implementation-Vendor': 'New Relic Labs'
attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
attributes 'Implementation-Title': 'com.newrelic.instrumentation.camel-core-3.9'
attributes 'Implementation-Vendor': 'New Relic'
attributes 'Implementation-Vendor-Id': 'com.newrelic'
attributes 'Implementation-Version': 1.0
}
}
Expand Down
30 changes: 0 additions & 30 deletions camel-core-4.0.0/build.gradle
View file

This file was deleted.

52 changes: 0 additions & 52 deletions ...src/main/java/com/nr/instrumentation/apache/camel/AggregateProcessor_instrumentation.java
View file

This file was deleted.

39 changes: 0 additions & 39 deletions ...main/java/com/nr/instrumentation/apache/camel/CamelInternalProcessor_instrumentation.java
View file

This file was deleted.

Loading

0 comments on commit 9151ae7

Please sign in to comment.